diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/Servlet.java b/src/main/java/fr/geoffrey/medical_training_tracker/Servlet.java
index 718b87b..4b652d3 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/Servlet.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/Servlet.java
@@ -5,6 +5,12 @@ import fr.geoffrey.medical_training_tracker.dao.ICareDao;
 import fr.geoffrey.medical_training_tracker.dao.IConsentBehaviorDao;
 import fr.geoffrey.medical_training_tracker.dao.IProgressionDao;
 import fr.geoffrey.medical_training_tracker.dao.IUserDao;
+import fr.geoffrey.medical_training_tracker.dao.bdd.BddConnectionManager;
+import fr.geoffrey.medical_training_tracker.dao.bdd.postgres.AnimalDao;
+import fr.geoffrey.medical_training_tracker.dao.bdd.postgres.CareDao;
+import fr.geoffrey.medical_training_tracker.dao.bdd.postgres.ConsentBehaviorDao;
+import fr.geoffrey.medical_training_tracker.dao.bdd.postgres.ProgressionDao;
+import fr.geoffrey.medical_training_tracker.dao.bdd.postgres.UserBddDao;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +23,9 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  */
 public class Servlet implements ServletContextListener {
 
+    @Autowired
+    BddConnectionManager bddConnectionManager;
+
     @Autowired
     IUserDao userDao;
 
@@ -36,19 +45,40 @@ public class Servlet implements ServletContextListener {
     public void contextInitialized(ServletContextEvent sce) {
         AutowireCapableBeanFactory autowireCapableBeanFactory = WebApplicationContextUtils.getRequiredWebApplicationContext(sce.getServletContext()).getAutowireCapableBeanFactory();
         autowireCapableBeanFactory.autowireBean(this);
+
+        bddConnectionManager.start();
         
+        if (userDao instanceof UserBddDao) {
+            ((UserBddDao) userDao).setBddConnectionManager(bddConnectionManager);
+        }
         if (!userDao.isStorageExist()) {
             userDao.createStorage();
         }
+
+        if (animalDao instanceof AnimalDao) {
+            ((AnimalDao) animalDao).setBddConnectionManager(bddConnectionManager);
+        }
         if (!animalDao.isStorageExist()) {
             animalDao.createStorage();
         }
+
+        if (careDao instanceof CareDao) {
+            ((CareDao) careDao).setBddConnectionManager(bddConnectionManager);
+        }
         if (!careDao.isStorageExist()) {
             careDao.createStorage();
         }
+
+        if (consentBehaviorDao instanceof ConsentBehaviorDao) {
+            ((ConsentBehaviorDao) consentBehaviorDao).setBddConnectionManager(bddConnectionManager);
+        }
         if (!consentBehaviorDao.isStorageExist()) {
             consentBehaviorDao.createStorage();
         }
+
+        if (progressionDao instanceof ProgressionDao) {
+            ((ProgressionDao) progressionDao).setBddConnectionManager(bddConnectionManager);
+        }
         if (!progressionDao.isStorageExist()) {
             progressionDao.createStorage();
         }
@@ -56,5 +86,8 @@ public class Servlet implements ServletContextListener {
 
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
+        if (bddConnectionManager != null) {
+            bddConnectionManager.close();
+        }
     }
 }
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/config/SecSecurityConfig.java b/src/main/java/fr/geoffrey/medical_training_tracker/config/SecSecurityConfig.java
index 38496ed..3b82a82 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/config/SecSecurityConfig.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/config/SecSecurityConfig.java
@@ -30,8 +30,6 @@ import fr.geoffrey.medical_training_tracker.config.encoder.Encoder;
 import fr.geoffrey.medical_training_tracker.controller.IndexController;
 import fr.geoffrey.medical_training_tracker.dao.bean.User;
 import fr.geoffrey.medical_training_tracker.dao.IUserDao;
-import org.springframework.security.web.authentication.rememberme.InMemoryTokenRepositoryImpl;
-import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
 
 @Configuration
 @EnableWebSecurity
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/BddConnectionManager.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/BddConnectionManager.java
new file mode 100644
index 0000000..c4692b1
--- /dev/null
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/BddConnectionManager.java
@@ -0,0 +1,179 @@
+package fr.geoffrey.medical_training_tracker.dao.bdd;
+
+import fr.geoffrey.medical_training_tracker.controller.IndexController;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Map;
+import javax.sql.DataSource;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ *
+ * @author Geoffrey
+ */
+public abstract class BddConnectionManager extends Thread {
+
+    private boolean run = true;
+    private long tempoCheckDataSourceConnection = 0;
+    private static final long TIMER_CHECK_DATA_SOURCE_CONNECTION_OK_MS = 10 * 60 * 1_000; // 10 min
+    private static final long TIMER_CHECK_DATA_SOURCE_CONNECTION_NOK_MS = 30_000; // 30 sec
+    private final Object sync = new Object();
+    @Autowired
+    private DataSource _dataSource;
+    private Connection _dataSourceConnection;
+
+    public void setDataSource(DataSource mDataSource) {
+        synchronized (sync) {
+            this._dataSource = mDataSource;
+        }
+    }
+
+    @Override
+    public void start() {
+        checkDataSourceConnection();
+        super.start();
+    }
+
+    protected Connection getDataSourceConnection() {
+        Connection ret;
+        synchronized (sync) {
+            try {
+                ret = _dataSource.getConnection();
+            } catch (SQLException ex) {
+                ret = null;
+                System.err.println(IndexController.LOG_TAG + " SQLException -> getDataSourceConnection() - Failed get connection - " + ex.getMessage());
+            }
+        }
+        return ret;
+    }
+
+    @Override
+    public void run() {
+        while (run) {
+            long now = System.currentTimeMillis();
+            if (tempoCheckDataSourceConnection == 0 || (tempoCheckDataSourceConnection - now <= 0)) {
+                checkDataSourceConnection();
+            }
+            try {
+                Thread.sleep(1_000);
+            } catch (InterruptedException ex) {
+            }
+        }
+    }
+
+    public void close() {
+        run = false;
+        synchronized (sync) {
+            if (_dataSourceConnection != null) {
+                try {
+                    _dataSourceConnection.close();
+                } catch (SQLException ex) {
+                    System.err.println(IndexController.LOG_TAG + " SQLException -> close() - Close BDD connection - " + ex.getMessage());
+                }
+            }
+        }
+    }
+
+    private void checkDataSourceConnection() {
+        boolean mDataSourceIsNull;
+        synchronized (sync) {
+            mDataSourceIsNull = _dataSource == null;
+        }
+        if (mDataSourceIsNull) {
+            return;
+        }
+        long now = System.currentTimeMillis();
+        Connection connection;
+        synchronized (sync) {
+            connection = _checkDataSourceConnection(_dataSourceConnection);
+            if (connection == null) {
+                _dataSourceConnection = null;
+            } else if (connection != null && connection != _dataSourceConnection) {
+                _dataSourceConnection = connection;
+            }
+        }
+        if (connection != null) {
+            tempoCheckDataSourceConnection = now + TIMER_CHECK_DATA_SOURCE_CONNECTION_OK_MS;
+        } else {
+            tempoCheckDataSourceConnection = now + TIMER_CHECK_DATA_SOURCE_CONNECTION_NOK_MS;
+        }
+    }
+
+    /**
+     * Check data connection. 
+     * @param connection connection to check.
+     * @return connection if connected, null otherwise.
+     */
+    protected abstract Connection _checkDataSourceConnection(Connection connection);
+
+    public Connection getConnection() {
+        Connection ret;
+        synchronized (sync) {
+            ret = _dataSourceConnection;
+        }
+        return ret;
+    }
+
+    protected PreparedStatement preareStatement(String sql, Map<Integer, Object> params) {
+        PreparedStatement statement;
+        try {
+            synchronized (sync) {
+                statement = _dataSourceConnection.prepareStatement(sql);
+            }
+            if (params != null) {
+                for (Integer index : params.keySet()) {
+                    Object param = params.get(index);
+                    if (param instanceof String) {
+                        statement.setString(index, (String) param);
+                    } else if (param instanceof Integer) {
+                        statement.setInt(index, (int) param);
+                    }
+                }
+            }
+            System.out.println(IndexController.LOG_TAG + " SQL : "+statement.toString());
+        } catch (SQLException ex) {
+            System.err.println(IndexController.LOG_TAG + " SQLException -> preareStatement() - " + ex.getMessage());
+            statement = null;
+            tempoCheckDataSourceConnection = 0;
+        }
+        return statement;
+    }
+
+    public ResultSet executeQuery(String sql, Map<Integer, Object> params) {
+        ResultSet resultSet = null;
+        boolean isDataSourceConnectionNull;
+        synchronized (sync) {
+            isDataSourceConnectionNull = _dataSourceConnection == null;
+        }
+        if (!isDataSourceConnectionNull) {
+            PreparedStatement statement = preareStatement(sql, params);
+            try {
+                resultSet = statement.executeQuery();
+            } catch (SQLException ex) {
+                System.err.println(IndexController.LOG_TAG + " SQLException -> executeQuery() - " + ex.getMessage());
+                tempoCheckDataSourceConnection = 0;
+            }
+        }
+        return resultSet;
+    }
+
+    public int executeUpdate(String sql, Map<Integer, Object> params) {
+        int ret = -1;
+        boolean isDataSourceConnectionNull;
+        synchronized (sync) {
+            isDataSourceConnectionNull = _dataSourceConnection == null;
+        }
+        if (!isDataSourceConnectionNull) {
+            PreparedStatement statement = preareStatement(sql, params);
+            try {
+                ret = statement.executeUpdate();
+            } catch (SQLException ex) {
+                System.err.println(IndexController.LOG_TAG + " SQLException -> executeQuery() - " + ex.getMessage());
+                tempoCheckDataSourceConnection = 0;
+            }
+        }
+        return ret;
+    }
+}
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/SqlDao.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/SqlDao.java
index e1ea2d3..aa13ecc 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/SqlDao.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/SqlDao.java
@@ -1,12 +1,10 @@
 package fr.geoffrey.medical_training_tracker.dao.bdd;
 
-import javax.sql.DataSource;
-
 public class SqlDao {
 
-    protected DataSource mDataSource;
+    protected BddConnectionManager bddConnectionManager;
 
-    public void setDataSource(DataSource mDataSource) {
-        this.mDataSource = mDataSource;
+    public void setBddConnectionManager(BddConnectionManager bddConnectionManager) {
+        this.bddConnectionManager = bddConnectionManager;
     }
 }
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/AnimalDao.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/AnimalDao.java
index 2db08f0..9bd4263 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/AnimalDao.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/AnimalDao.java
@@ -3,12 +3,12 @@ package fr.geoffrey.medical_training_tracker.dao.bdd.postgres;
 import fr.geoffrey.medical_training_tracker.controller.IndexController;
 import fr.geoffrey.medical_training_tracker.dao.IAnimalDao;
 import fr.geoffrey.medical_training_tracker.dao.bean.Animal;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -34,17 +34,15 @@ public class AnimalDao extends PostgresSqlDao implements IAnimalDao {
     public Animal getAnimal(String owner, int animalId) {
         Animal animal = null;
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("SELECT * FROM "+TABLE_NAME+" WHERE owner = ? AND id = ?;");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "SELECT * FROM "+TABLE_NAME+" WHERE owner = ? AND id = ?;";
 
+        params.put(1, owner);
+        params.put(2, animalId);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     animal = new Animal();
@@ -52,7 +50,6 @@ public class AnimalDao extends PostgresSqlDao implements IAnimalDao {
                     animal.setName(resultSet.getString("name"));
                     animal.setOwner(resultSet.getString("owner"));
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getAnimal()");
@@ -64,20 +61,6 @@ public class AnimalDao extends PostgresSqlDao implements IAnimalDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getAnimal()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getAnimal()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getAnimal()");
-                }
-            }
         }
         return animal;
     }
@@ -86,16 +69,13 @@ public class AnimalDao extends PostgresSqlDao implements IAnimalDao {
     public List<Animal> getAnimals(String owner) {
         List<Animal> ret = new ArrayList<>();
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("SELECT * FROM "+TABLE_NAME+" WHERE owner = ? ORDER BY name ASC;");
-            statement.setString(1, owner);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "SELECT * FROM "+TABLE_NAME+" WHERE owner = ? ORDER BY name ASC;";
 
+        params.put(1, owner);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Animal animal = new Animal();
@@ -105,7 +85,6 @@ public class AnimalDao extends PostgresSqlDao implements IAnimalDao {
 
                     ret.add(animal);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getAnimals()");
@@ -117,122 +96,42 @@ public class AnimalDao extends PostgresSqlDao implements IAnimalDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getAnimals()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getAnimals()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getAnimals()");
-                }
-            }
         }
         return ret;
     }
 
     @Override
     public void addAnimal(String name, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("INSERT INTO "+TABLE_NAME+" (id, name, owner) VALUES (nextval(?), ?, ?);");
-            statement.setString(1, SEQUENCE_NAME);
-            statement.setString(2, name);
-            statement.setString(3, owner);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> addAnimal()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> addAnimal()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> addAnimal()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "INSERT INTO "+TABLE_NAME+" (id, name, owner) VALUES (nextval(?), ?, ?);";
+
+        params.put(1, SEQUENCE_NAME);
+        params.put(2, name);
+        params.put(3, owner);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void deleteAnimal(int animalId, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE id = ? AND owner = ?;");
-            statement.setInt(1, animalId);
-            statement.setString(2, owner);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteAnimal()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteAnimal()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteAnimal()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE id = ? AND owner = ?;";
+
+        params.put(1, animalId);
+        params.put(2, owner);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void changeName(int animalId, String owner, String name) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("UPDATE "+TABLE_NAME+" SET name = ? WHERE id = ? AND owner = ?;");
-            statement.setString(1, name);
-            statement.setInt(2, animalId);
-            statement.setString(3, owner);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> changeName()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> changeName()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> changeName()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "UPDATE "+TABLE_NAME+" SET name = ? WHERE id = ? AND owner = ?;";
+
+        params.put(1, name);
+        params.put(2, animalId);
+        params.put(3, owner);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 }
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/CareDao.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/CareDao.java
index d58fea3..6221eb3 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/CareDao.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/CareDao.java
@@ -3,12 +3,12 @@ package fr.geoffrey.medical_training_tracker.dao.bdd.postgres;
 import fr.geoffrey.medical_training_tracker.controller.IndexController;
 import fr.geoffrey.medical_training_tracker.dao.ICareDao;
 import fr.geoffrey.medical_training_tracker.dao.bean.Care;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -34,21 +34,19 @@ public class CareDao extends PostgresSqlDao implements ICareDao {
     public List<Care> getAllAnimalCares(String owner, int animalId) {
         List<Care> ret = new ArrayList<>();
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + TABLE_NAME+".id as care_id, "+TABLE_NAME+".name as care_name, "+TABLE_NAME+".description as care_desc "
                     + "from "+TABLE_NAME+" "
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? ORDER BY "+TABLE_NAME+".name ASC;");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? ORDER BY "+TABLE_NAME+".name ASC;";
 
+        params.put(1, owner);
+        params.put(2, animalId);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Care care = new Care();
@@ -57,7 +55,6 @@ public class CareDao extends PostgresSqlDao implements ICareDao {
                     care.setDescription(resultSet.getString("care_desc"));
                     ret.add(care);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getAllAnialCares() - " + ex.getMessage());
@@ -70,20 +67,6 @@ public class CareDao extends PostgresSqlDao implements ICareDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getAllAnialCares()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getAllAnialCares()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getAllAnialCares()");
-                }
-            }
         }
         return ret;
     }
@@ -92,22 +75,20 @@ public class CareDao extends PostgresSqlDao implements ICareDao {
     public Care getAnimalCare(String owner, int animalId, int careId) {
         Care ret = null;
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + TABLE_NAME+".id as care_id, "+TABLE_NAME+".name as care_name, "+TABLE_NAME+".description as care_desc "
                     + "from "+TABLE_NAME+" "
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".id = ?;");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            statement.setInt(3, careId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".id = ?;";
 
+        params.put(1, owner);
+        params.put(2, animalId);
+        params.put(3, careId);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     ret = new Care();
@@ -115,7 +96,6 @@ public class CareDao extends PostgresSqlDao implements ICareDao {
                     ret.setName(resultSet.getString("care_name"));
                     ret.setDescription(resultSet.getString("care_desc"));
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getAnimalCare() - " + ex.getMessage());
@@ -128,167 +108,66 @@ public class CareDao extends PostgresSqlDao implements ICareDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getAnimalCare()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getAnimalCare()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getAnimalCare()");
-                }
-            }
         }
         return ret;
     }
 
     @Override
     public void addCare(int animalId, String name, String description) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            if (description != null) {
-                statement = conn.prepareStatement("INSERT INTO "+TABLE_NAME+" (id, animal, name, description) VALUES (nextval(?), ?, ?, ?);");
-                statement.setString(4, description);
-            } else {
-                statement = conn.prepareStatement("INSERT INTO "+TABLE_NAME+" (id, animal, name) VALUES (nextval(?), ?, ?);");
-            }
-            statement.setString(1, SEQUENCE_NAME);
-            statement.setInt(2, animalId);
-            statement.setString(3, name);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> addCare()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> addCare()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> addCare()");
-                }
-            }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql;
+        if (description != null) {
+            sql = "INSERT INTO "+TABLE_NAME+" (id, animal, name, description) VALUES (nextval(?), ?, ?, ?);";
+            params.put(4, description);
+        } else {
+            sql = "INSERT INTO "+TABLE_NAME+" (id, animal, name) VALUES (nextval(?), ?, ?);";
         }
+
+        params.put(1, SEQUENCE_NAME);
+        params.put(2, animalId);
+        params.put(3, name);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void deleteCare(int careId, int animalId, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
                     + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?) "
-                    + "AND id = ?");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            statement.setInt(3, careId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteCare()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteCare()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteCare()");
-                }
-            }
-        }
+                    + "AND id = ?";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+        params.put(3, careId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void deleteAllAnimalCares(int animalId, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
-                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteAllAnimalCares()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteAllAnimalCares()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteAllAnimalCares()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void updateCare(int careId, int animalId, String owner, String name, String description) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("UPDATE "+TABLE_NAME+" SET name = ?, description = ? WHERE id = ? AND animal = ("
-                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)");
-            statement.setString(1, name);
-            statement.setString(2, description);
-            statement.setInt(3, careId);
-            statement.setString(4, owner);
-            statement.setInt(5, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> updateCare()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> updateCare()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> updateCare()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "UPDATE "+TABLE_NAME+" SET name = ?, description = ? WHERE id = ? AND animal = ("
+                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)";
+
+        params.put(1, name);
+        params.put(2, description);
+        params.put(3, careId);
+        params.put(4, owner);
+        params.put(5, animalId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 }
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ConsentBehaviorDao.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ConsentBehaviorDao.java
index 638c4cf..c001519 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ConsentBehaviorDao.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ConsentBehaviorDao.java
@@ -3,12 +3,12 @@ package fr.geoffrey.medical_training_tracker.dao.bdd.postgres;
 import fr.geoffrey.medical_training_tracker.controller.IndexController;
 import fr.geoffrey.medical_training_tracker.dao.IConsentBehaviorDao;
 import fr.geoffrey.medical_training_tracker.dao.bean.ConsentBehavior;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -34,21 +34,19 @@ public class ConsentBehaviorDao extends PostgresSqlDao implements IConsentBehavi
     public List<ConsentBehavior> getAllAnialConsentBehavior(String owner, int animalId) {
         List<ConsentBehavior> ret = new ArrayList<>();
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + TABLE_NAME+".id as cb_id, "+TABLE_NAME+".name as cb_name, "+TABLE_NAME+".description as cb_desc "
                     + "from "+TABLE_NAME+" "
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? ORDER BY "+TABLE_NAME+".name ASC;");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? ORDER BY "+TABLE_NAME+".name ASC;";
 
+        params.put(1, owner);
+        params.put(2, animalId);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     ConsentBehavior consentBehavior = new ConsentBehavior();
@@ -57,7 +55,6 @@ public class ConsentBehaviorDao extends PostgresSqlDao implements IConsentBehavi
                     consentBehavior.setDescription(resultSet.getString("cb_desc"));
                     ret.add(consentBehavior);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getAllAnialConsentBehavior() - " + ex.getMessage());
@@ -70,20 +67,6 @@ public class ConsentBehaviorDao extends PostgresSqlDao implements IConsentBehavi
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getAllAnialConsentBehavior()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getAllAnialConsentBehavior()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getAllAnialConsentBehavior()");
-                }
-            }
         }
         return ret;
     }
@@ -92,22 +75,20 @@ public class ConsentBehaviorDao extends PostgresSqlDao implements IConsentBehavi
     public ConsentBehavior getAnimalConsentBehavior(String owner, int animalId, int consentBehaviorId) {
         ConsentBehavior ret = null;
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + TABLE_NAME+".id as cb_id, "+TABLE_NAME+".name as cb_name, "+TABLE_NAME+".description as cb_desc "
                     + "from "+TABLE_NAME+" "
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".id = ?;");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            statement.setInt(3, consentBehaviorId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".id = ?;";
 
+        params.put(1, owner);
+        params.put(2, animalId);
+        params.put(3, consentBehaviorId);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     ret = new ConsentBehavior();
@@ -115,7 +96,6 @@ public class ConsentBehaviorDao extends PostgresSqlDao implements IConsentBehavi
                     ret.setName(resultSet.getString("cb_name"));
                     ret.setDescription(resultSet.getString("cb_desc"));
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getAnimalConsentBehavior() - " + ex.getMessage());
@@ -128,167 +108,66 @@ public class ConsentBehaviorDao extends PostgresSqlDao implements IConsentBehavi
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getAnimalConsentBehavior()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getAnimalConsentBehavior()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getAnimalConsentBehavior()");
-                }
-            }
         }
         return ret;
     }
 
     @Override
     public void addConsentBehavior(int animalId, String name, String description) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            if (description != null) {
-                statement = conn.prepareStatement("INSERT INTO "+TABLE_NAME+" (id, animal, name, description) VALUES (nextval(?), ?, ?, ?);");
-                statement.setString(4, description);
-            } else {
-                statement = conn.prepareStatement("INSERT INTO "+TABLE_NAME+" (id, animal, name) VALUES (nextval(?), ?, ?);");
-            }
-            statement.setString(1, SEQUENCE_NAME);
-            statement.setInt(2, animalId);
-            statement.setString(3, name);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> addConsentBehavior()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> addConsentBehavior()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> addConsentBehavior()");
-                }
-            }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql;
+        if (description != null) {
+            sql = "INSERT INTO "+TABLE_NAME+" (id, animal, name, description) VALUES (nextval(?), ?, ?, ?);";
+            params.put(4, description);
+        } else {
+            sql = "INSERT INTO "+TABLE_NAME+" (id, animal, name) VALUES (nextval(?), ?, ?);";
         }
+
+        params.put(1, SEQUENCE_NAME);
+        params.put(2, animalId);
+        params.put(3, name);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void deleteConsentBehavior(int consentBehaviorId, int animalId, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
                     + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?) "
-                    + "AND id = ?");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            statement.setInt(3, consentBehaviorId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteCare()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteCare()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteCare()");
-                }
-            }
-        }
+                    + "AND id = ?;";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+        params.put(3, consentBehaviorId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void deleteAllAnimalConsentBehavior(int animalId, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
-                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteAllAnimalCares()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteAllAnimalCares()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteAllAnimalCares()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?);";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void updateConsentBehavior(int consentBehaviorId, int animalId, String owner, String name, String description) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("UPDATE "+TABLE_NAME+" SET name = ?, description = ? WHERE id = ? AND animal = ("
-                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)");
-            statement.setString(1, name);
-            statement.setString(2, description);
-            statement.setInt(3, consentBehaviorId);
-            statement.setString(4, owner);
-            statement.setInt(5, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> updateConsentBehavior()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> updateConsentBehavior()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> updateConsentBehavior()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "UPDATE "+TABLE_NAME+" SET name = ?, description = ? WHERE id = ? AND animal = ("
+                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?);";
+
+        params.put(1, name);
+        params.put(2, description);
+        params.put(3, consentBehaviorId);
+        params.put(4, owner);
+        params.put(5, animalId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 }
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/PostgresConnectionManager.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/PostgresConnectionManager.java
new file mode 100644
index 0000000..8904233
--- /dev/null
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/PostgresConnectionManager.java
@@ -0,0 +1,53 @@
+package fr.geoffrey.medical_training_tracker.dao.bdd.postgres;
+
+import fr.geoffrey.medical_training_tracker.controller.IndexController;
+import fr.geoffrey.medical_training_tracker.dao.bdd.BddConnectionManager;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class PostgresConnectionManager extends BddConnectionManager {
+
+    @Override
+    protected Connection _checkDataSourceConnection(Connection connection) {
+        Connection ret = null;
+        Connection _connection = null;
+
+        if (connection == null) {
+            _connection = getDataSourceConnection();
+        } else {
+            _connection = connection;
+        }
+
+        PreparedStatement statement = null;
+        ResultSet resultSet = null;
+        if (_connection != null) {
+            try {
+                statement = _connection.prepareStatement("SELECT version();");
+                resultSet = statement.executeQuery();
+                ret = _connection;
+            } catch (SQLException ex) {
+                ret = null;
+                System.err.println(IndexController.LOG_TAG + " SQLException -> _checkDataSourceConnection() - " + ex.getMessage());
+                ex.printStackTrace();
+            } finally {
+                if (resultSet != null) {
+                    try {
+                        resultSet.close();
+                    } catch (SQLException ex) {
+                        System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> _checkDataSourceConnection()");
+                    }
+                }
+                if (statement != null) {
+                    try {
+                        statement.close();
+                    } catch (SQLException ex) {
+                        System.err.println(IndexController.LOG_TAG + " Failed close statement -> _checkDataSourceConnection()");
+                    }
+                }
+            }
+        }
+        return ret;
+    }
+}
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/PostgresSqlDao.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/PostgresSqlDao.java
index 66e610f..e811643 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/PostgresSqlDao.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/PostgresSqlDao.java
@@ -2,10 +2,10 @@ package fr.geoffrey.medical_training_tracker.dao.bdd.postgres;
 
 import fr.geoffrey.medical_training_tracker.controller.IndexController;
 import fr.geoffrey.medical_training_tracker.dao.bdd.SqlDao;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
@@ -16,20 +16,15 @@ public class PostgresSqlDao extends SqlDao {
     protected boolean _isTableExist(String tableName) {
         boolean ret = false;
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select tableowner from pg_tables where tablename=?;");
-            statement.setString(1, tableName);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select tableowner from pg_tables where tablename = ?;";
 
+        params.put(1, tableName);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             ret = resultSet != null && resultSet.next();
-            if (resultSet != null) {
-                resultSet.close();
-            }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> _isTableExist()");
             System.err.println(ex.getMessage());
@@ -42,86 +37,16 @@ public class PostgresSqlDao extends SqlDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> _isTableExist()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> _isTableExist()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> _isTableExist()");
-                }
-            }
         }
         return ret;
     }
 
     protected void _createTable(String sql) {
-        Connection conn = null;
-        PreparedStatement statementCreateTable = null;
-
-        try {
-            conn = mDataSource.getConnection();
-
-            statementCreateTable = conn.prepareStatement(sql);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statementCreateTable.toString());
-            statementCreateTable.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> _createTable()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statementCreateTable != null) {
-                try {
-                    statementCreateTable.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> _createTable()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> _createTable()");
-                }
-            }
-        }
+        bddConnectionManager.executeUpdate(sql, null);
     }
 
     protected void _createSequence(String sequenceName) {
-        Connection conn = null;
-        PreparedStatement statementCreateSequence = null;
-
-        try {
-            conn = mDataSource.getConnection();
-
-            statementCreateSequence = conn.prepareStatement("CREATE SEQUENCE " + sequenceName + " MINVALUE 0 CACHE 5 START 1;");
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statementCreateSequence.toString());
-            statementCreateSequence.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> _createSequence()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statementCreateSequence != null) {
-                try {
-                    statementCreateSequence.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> _createSequence()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> _createSequence()");
-                }
-            }
-        }
+        bddConnectionManager.executeUpdate("CREATE SEQUENCE " + sequenceName + " MINVALUE 0 CACHE 5 START 1;", null);
     }
 
 }
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ProgressionDao.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ProgressionDao.java
index dd5d2d5..59d5904 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ProgressionDao.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/ProgressionDao.java
@@ -6,10 +6,10 @@ import fr.geoffrey.medical_training_tracker.dao.bean.Animal;
 import fr.geoffrey.medical_training_tracker.dao.bean.Care;
 import fr.geoffrey.medical_training_tracker.dao.bean.ConsentBehavior;
 import fr.geoffrey.medical_training_tracker.dao.bean.Progression;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
@@ -34,23 +34,21 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
     //<editor-fold defaultstate="collapsed" desc="Fill methods">
     @Override
     public void fillAnimalProgression(Animal animal) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + AnimalDao.TABLE_NAME+".id as animal_id, "+AnimalDao.TABLE_NAME+".name as animal_name, "+AnimalDao.TABLE_NAME+".owner as animal_owner, "
                     + TABLE_NAME+".id as progression_id, "+TABLE_NAME+".progression_by_me as prog_by_me, "+TABLE_NAME+".progression_by_someone_else as prog_by_someone_else, "+TABLE_NAME+".progression_by_veterinary as prog_by_vet, "
                     + TABLE_NAME+".care as care_id, "+TABLE_NAME+".consent_behavior as consent_behavior_id "
-                            + "from "+TABLE_NAME+" "
-                                    + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
-                                            + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ?;");
-            statement.setString(1, animal.getOwner());
-            statement.setInt(2, animal.getId());
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
-            
+                    + "from "+TABLE_NAME+" "
+                    + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ?;";
+
+        params.put(1, animal.getOwner());
+        params.put(2, animal.getId());
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Progression progression = new Progression();
@@ -71,7 +69,6 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     
                     animal.addProgression(progression);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getProgression() - " + ex.getMessage());
@@ -84,31 +81,13 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getProgression()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getProgression()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getProgression()");
-                }
-            }
         }
     }
     
     @Override
     public void fillAnimalProgressionByCare(Animal animal, int careId) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + AnimalDao.TABLE_NAME+".id as animal_id, "+AnimalDao.TABLE_NAME+".name as animal_name, "+AnimalDao.TABLE_NAME+".owner as animal_owner, "
                     + TABLE_NAME+".id as progression_id, "+TABLE_NAME+".progression_by_me as prog_by_me, "+TABLE_NAME+".progression_by_someone_else as prog_by_someone_else, "+TABLE_NAME+".progression_by_veterinary as prog_by_vet, "
                     + TABLE_NAME+".care as care_id, "+TABLE_NAME+".consent_behavior as consent_behavior_id, "
@@ -116,13 +95,15 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     + "from "+TABLE_NAME+" "
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
                     + "left join "+ConsentBehaviorDao.TABLE_NAME+" on "+TABLE_NAME+".consent_behavior = "+ConsentBehaviorDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".care = ? ORDER BY "+ConsentBehaviorDao.TABLE_NAME+".name ASC;");
-            statement.setString(1, animal.getOwner());
-            statement.setInt(2, animal.getId());
-            statement.setInt(3, careId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
-            
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".care = ? ORDER BY "+ConsentBehaviorDao.TABLE_NAME+".name ASC;";
+
+        params.put(1, animal.getOwner());
+        params.put(2, animal.getId());
+        params.put(3, careId);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Progression progression = new Progression();
@@ -148,7 +129,6 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     
                     animal.addProgression(progression);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> fillAnimalProgressionByCare() - " + ex.getMessage());
@@ -161,31 +141,13 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> fillAnimalProgressionByCare()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> fillAnimalProgressionByCare()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> fillAnimalProgressionByCare()");
-                }
-            }
         }
     }
     
     @Override
     public void fillAnimalProgressionByConsentBehavior(Animal animal, int consentBehaviorId) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + AnimalDao.TABLE_NAME+".id as animal_id, "+AnimalDao.TABLE_NAME+".name as animal_name, "+AnimalDao.TABLE_NAME+".owner as animal_owner, "
                     + TABLE_NAME+".id as progression_id, "+TABLE_NAME+".progression_by_me as prog_by_me, "+TABLE_NAME+".progression_by_someone_else as prog_by_someone_else, "+TABLE_NAME+".progression_by_veterinary as prog_by_vet, "
                     + TABLE_NAME+".care as care_id, "+TABLE_NAME+".consent_behavior as consent_behavior_id, "
@@ -193,13 +155,15 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     + "from "+TABLE_NAME+" "
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
                     + "left join "+CareDao.TABLE_NAME+" on "+TABLE_NAME+".care = "+CareDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".consent_behavior = ? ORDER BY "+CareDao.TABLE_NAME+".name ASC;");
-            statement.setString(1, animal.getOwner());
-            statement.setInt(2, animal.getId());
-            statement.setInt(3, consentBehaviorId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
-            
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".consent_behavior = ? ORDER BY "+CareDao.TABLE_NAME+".name ASC;";
+
+        params.put(1, animal.getOwner());
+        params.put(2, animal.getId());
+        params.put(3, consentBehaviorId);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Progression progression = new Progression();
@@ -225,7 +189,6 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     
                     animal.addProgression(progression);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> fillAnimalProgressionByConsentBehavior() - " + ex.getMessage());
@@ -238,31 +201,13 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> fillAnimalProgressionByConsentBehavior()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> fillAnimalProgressionByConsentBehavior()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> fillAnimalProgressionByConsentBehavior()");
-                }
-            }
         }
     }
 
     @Override
     public void fillAnimalProgressionByMe(Animal animal, String progressionByMe) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + AnimalDao.TABLE_NAME+".id as animal_id, "+AnimalDao.TABLE_NAME+".name as animal_name, "+AnimalDao.TABLE_NAME+".owner as animal_owner, "
                     + TABLE_NAME+".id as progression_id, "+TABLE_NAME+".progression_by_me as prog_by_me, "+TABLE_NAME+".progression_by_someone_else as prog_by_someone_else, "+TABLE_NAME+".progression_by_veterinary as prog_by_vet, "
                     + TABLE_NAME+".care as care_id, "+TABLE_NAME+".consent_behavior as consent_behavior_id, "
@@ -272,13 +217,15 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
                     + "left join "+CareDao.TABLE_NAME+" on "+TABLE_NAME+".care = "+CareDao.TABLE_NAME+".id "
                     + "left join "+ConsentBehaviorDao.TABLE_NAME+" on "+TABLE_NAME+".consent_behavior = "+ConsentBehaviorDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".progression_by_me = ?;");
-            statement.setString(1, animal.getOwner());
-            statement.setInt(2, animal.getId());
-            statement.setString(3, progressionByMe);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
-            
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".progression_by_me = ?;";
+
+        params.put(1, animal.getOwner());
+        params.put(2, animal.getId());
+        params.put(3, progressionByMe);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Progression progression = new Progression();
@@ -309,7 +256,6 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     
                     animal.addProgression(progression);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> fillAnimalProgressionByMe() - " + ex.getMessage());
@@ -322,31 +268,13 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> fillAnimalProgressionByMe()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> fillAnimalProgressionByMe()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> fillAnimalProgressionByMe()");
-                }
-            }
         }
     }
 
     @Override
     public void fillAnimalProgressionBySomeoneElse(Animal animal, String progressionBySomeoneElse) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + AnimalDao.TABLE_NAME+".id as animal_id, "+AnimalDao.TABLE_NAME+".name as animal_name, "+AnimalDao.TABLE_NAME+".owner as animal_owner, "
                     + TABLE_NAME+".id as progression_id, "+TABLE_NAME+".progression_by_me as prog_by_me, "+TABLE_NAME+".progression_by_someone_else as prog_by_someone_else, "+TABLE_NAME+".progression_by_veterinary as prog_by_vet, "
                     + TABLE_NAME+".care as care_id, "+TABLE_NAME+".consent_behavior as consent_behavior_id, "
@@ -356,13 +284,15 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
                     + "left join "+CareDao.TABLE_NAME+" on "+TABLE_NAME+".care = "+CareDao.TABLE_NAME+".id "
                     + "left join "+ConsentBehaviorDao.TABLE_NAME+" on "+TABLE_NAME+".consent_behavior = "+ConsentBehaviorDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".progression_by_someone_else = ?;");
-            statement.setString(1, animal.getOwner());
-            statement.setInt(2, animal.getId());
-            statement.setString(3, progressionBySomeoneElse);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
-            
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".progression_by_someone_else = ?;";
+
+        params.put(1, animal.getOwner());
+        params.put(2, animal.getId());
+        params.put(3, progressionBySomeoneElse);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Progression progression = new Progression();
@@ -393,7 +323,6 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     
                     animal.addProgression(progression);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> fillAnimalProgressionBySomeoneElse() - " + ex.getMessage());
@@ -406,31 +335,13 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> fillAnimalProgressionBySomeoneElse()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> fillAnimalProgressionBySomeoneElse()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> fillAnimalProgressionBySomeoneElse()");
-                }
-            }
         }
     }
 
     @Override
     public void fillAnimalProgressionByVeterinary(Animal animal, String progressionByVeterinary) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("select "
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "select "
                     + AnimalDao.TABLE_NAME+".id as animal_id, "+AnimalDao.TABLE_NAME+".name as animal_name, "+AnimalDao.TABLE_NAME+".owner as animal_owner, "
                     + TABLE_NAME+".id as progression_id, "+TABLE_NAME+".progression_by_me as prog_by_me, "+TABLE_NAME+".progression_by_someone_else as prog_by_someone_else, "+TABLE_NAME+".progression_by_veterinary as prog_by_vet, "
                     + TABLE_NAME+".care as care_id, "+TABLE_NAME+".consent_behavior as consent_behavior_id, "
@@ -440,13 +351,15 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     + "left join "+AnimalDao.TABLE_NAME+" on "+TABLE_NAME+".animal = "+AnimalDao.TABLE_NAME+".id "
                     + "left join "+CareDao.TABLE_NAME+" on "+TABLE_NAME+".care = "+CareDao.TABLE_NAME+".id "
                     + "left join "+ConsentBehaviorDao.TABLE_NAME+" on "+TABLE_NAME+".consent_behavior = "+ConsentBehaviorDao.TABLE_NAME+".id "
-                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".progression_by_veterinary = ?;");
-            statement.setString(1, animal.getOwner());
-            statement.setInt(2, animal.getId());
-            statement.setString(3, progressionByVeterinary);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            resultSet = statement.executeQuery();
-            
+                    + "where "+AnimalDao.TABLE_NAME+".owner = ? and "+AnimalDao.TABLE_NAME+".id = ? and "+TABLE_NAME+".progression_by_veterinary = ?;";
+
+        params.put(1, animal.getOwner());
+        params.put(2, animal.getId());
+        params.put(3, progressionByVeterinary);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     Progression progression = new Progression();
@@ -477,7 +390,6 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     
                     animal.addProgression(progression);
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> fillAnimalProgressionByVeterinary() - " + ex.getMessage());
@@ -490,20 +402,6 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> fillAnimalProgressionByVeterinary()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> fillAnimalProgressionByVeterinary()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> fillAnimalProgressionByVeterinary()");
-                }
-            }
         }
     }
     //</editor-fold>
@@ -511,222 +409,90 @@ public class ProgressionDao extends PostgresSqlDao implements IProgressionDao {
     //<editor-fold defaultstate="collapsed" desc="Delete methods">
     @Override
     public void deleteProgression(int progressionId, int animalId, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
                     + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?) "
-                            + "AND id = ?");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            statement.setInt(3, progressionId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteProgression()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteProgression()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteProgression()");
-                }
-            }
-        }
+                            + "AND id = ?;";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+        params.put(3, progressionId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
     
     @Override
     public void deleteAllAnimalProgression(int animalId, String owner) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
-                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteAllAnimalProgression()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteAllAnimalProgression()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteAllAnimalProgression()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?);";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
     
     @Override
     public void deleteAllAnimalCareProgression(int animalId, String owner, int careId) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
                     + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?) "
-                            + "AND care = (SELECT id FROM "+CareDao.TABLE_NAME+" WHERE animal = ? AND  id = ?)");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            statement.setInt(3, animalId);
-            statement.setInt(4, careId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteAllAnimalCareProgression()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteAllAnimalCareProgression()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteAllAnimalCareProgression()");
-                }
-            }
-        }
+                            + "AND care = (SELECT id FROM "+CareDao.TABLE_NAME+" WHERE animal = ? AND  id = ?);";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+        params.put(3, animalId);
+        params.put(4, careId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
     
     @Override
     public void deleteAllAnimalConsentBehaviorProgression(int animalId, String owner, int consentBehaviorId) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("DELETE FROM "+TABLE_NAME+" WHERE animal = ("
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "DELETE FROM "+TABLE_NAME+" WHERE animal = ("
                     + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?) "
-                            + "AND consent_behavior = (SELECT id FROM "+ConsentBehaviorDao.TABLE_NAME+" WHERE animal = ? AND  id = ?)");
-            statement.setString(1, owner);
-            statement.setInt(2, animalId);
-            statement.setInt(3, animalId);
-            statement.setInt(4, consentBehaviorId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> deleteAllAnimalConsentBehaviorProgression()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> deleteAllAnimalConsentBehaviorProgression()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> deleteAllAnimalConsentBehaviorProgression()");
-                }
-            }
-        }
+                            + "AND consent_behavior = (SELECT id FROM "+ConsentBehaviorDao.TABLE_NAME+" WHERE animal = ? AND  id = ?);";
+
+        params.put(1, owner);
+        params.put(2, animalId);
+        params.put(3, animalId);
+        params.put(4, consentBehaviorId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
     //</editor-fold>
 
     @Override
     public void addProgression(int animalId, int careId, int consentBehaviorId) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("INSERT INTO "+TABLE_NAME+" (id, animal, care, consent_behavior, progression_by_me, progression_by_someone_else, progression_by_veterinary) VALUES (nextval(?), ?, ?, ?, ?, ?, ?);");
-            statement.setString(1, SEQUENCE_NAME);
-            statement.setInt(2, animalId);
-            statement.setInt(3, careId);
-            statement.setInt(4, consentBehaviorId);
-            statement.setString(5, Progression.PROGRESSION_VALUE_NOT_TRAINED);
-            statement.setString(6, Progression.PROGRESSION_VALUE_NOT_TRAINED);
-            statement.setString(7, Progression.PROGRESSION_VALUE_NOT_TRAINED);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> addProgression()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> addProgression()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> addProgression()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "INSERT INTO "+TABLE_NAME+" (id, animal, care, consent_behavior, progression_by_me, progression_by_someone_else, progression_by_veterinary) VALUES (nextval(?), ?, ?, ?, ?, ?, ?);";
+
+        params.put(1, SEQUENCE_NAME);
+        params.put(2, animalId);
+        params.put(3, careId);
+        params.put(4, consentBehaviorId);
+        params.put(5, Progression.PROGRESSION_VALUE_NOT_TRAINED);
+        params.put(6, Progression.PROGRESSION_VALUE_NOT_TRAINED);
+        params.put(7, Progression.PROGRESSION_VALUE_NOT_TRAINED);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 
     @Override
     public void updateProgression(int animalId, String owner, int progressionId, String progressionByMe, String progressionBySomeoneElse, String progressionByVeterinary) {
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("UPDATE "+TABLE_NAME+" SET progression_by_me = ?, progression_by_someone_else = ?, progression_by_veterinary = ? WHERE id = ? AND animal = ("
-                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?)");
-            statement.setString(1, progressionByMe);
-            statement.setString(2, progressionBySomeoneElse);
-            statement.setString(3, progressionByVeterinary);
-            statement.setInt(4, progressionId);
-            statement.setString(5, owner);
-            statement.setInt(6, animalId);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> updateCare()");
-            System.err.println(ex.getMessage());
-            ex.printStackTrace();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> updateCare()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> updateCare()");
-                }
-            }
-        }
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "UPDATE "+TABLE_NAME+" SET progression_by_me = ?, progression_by_someone_else = ?, progression_by_veterinary = ? WHERE id = ? AND animal = ("
+                    + "SELECT id FROM "+AnimalDao.TABLE_NAME+" WHERE owner = ? AND id = ?);";
+
+        params.put(1, progressionByMe);
+        params.put(2, progressionBySomeoneElse);
+        params.put(3, progressionByVeterinary);
+        params.put(4, progressionId);
+        params.put(5, owner);
+        params.put(6, animalId);
+
+        bddConnectionManager.executeUpdate(sql, params);
     }
 }
diff --git a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/UserBddDao.java b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/UserBddDao.java
index 8edab2f..ecca3a1 100644
--- a/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/UserBddDao.java
+++ b/src/main/java/fr/geoffrey/medical_training_tracker/dao/bdd/postgres/UserBddDao.java
@@ -1,14 +1,14 @@
 package fr.geoffrey.medical_training_tracker.dao.bdd.postgres;
 
 import fr.geoffrey.medical_training_tracker.controller.IndexController;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import fr.geoffrey.medical_training_tracker.dao.bean.User;
 import fr.geoffrey.medical_training_tracker.dao.IUserDao;
 import fr.geoffrey.medical_training_tracker.dao.UserAlreadyExistException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class UserBddDao extends PostgresSqlDao implements IUserDao {
 
@@ -28,16 +28,14 @@ public class UserBddDao extends PostgresSqlDao implements IUserDao {
     public User getUser(String login) {
         User ret = null;
 
-        Connection conn = null;
-        PreparedStatement statement = null;
-        ResultSet resultSet = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("SELECT * FROM "+TABLE_NAME+" WHERE login = ?;");
-            statement.setString(1, login);
-            System.out.println(IndexController.LOG_TAG+" SQL -> "+statement.toString());
-            resultSet = statement.executeQuery();
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "SELECT * FROM "+TABLE_NAME+" WHERE login = ?;";
 
+        params.put(1, login);
+
+        ResultSet resultSet = bddConnectionManager.executeQuery(sql, params);
+
+        try {
             if (resultSet != null) {
                 while (resultSet.next()) {
                     ret = new User();
@@ -45,7 +43,6 @@ public class UserBddDao extends PostgresSqlDao implements IUserDao {
                     ret.setPassword(resultSet.getString("password"));
                     ret.setName(resultSet.getString("name"));
                 }
-                resultSet.close();
             }
         } catch (SQLException ex) {
             System.err.println(IndexController.LOG_TAG + " SQLException -> getUser()");
@@ -57,95 +54,41 @@ public class UserBddDao extends PostgresSqlDao implements IUserDao {
                     System.err.println(IndexController.LOG_TAG + " Failed close ResultSet -> getUser()");
                 }
             }
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> getUser()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> getUser()");
-                }
-            }
         }
         return ret;
     }
 
     @Override
     public boolean addUser(String login, String hashPassword, String name) throws UserAlreadyExistException {
-        boolean ret = false;
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("INSERT INTO "+TABLE_NAME+" (login, password, name) VALUES (?, ?, ?);");
-            statement.setString(1, login);
-            statement.setString(2, hashPassword);
-            if (name != null && !name.equals("")) {
-                statement.setString(3, name);
-            } else {
-                statement.setString(3, login);
-            }
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-            ret = true;
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> addUser()");
-            throw new UserAlreadyExistException();
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> addUser()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> addUser()");
-                }
-            }
+        boolean ret;
+
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "INSERT INTO "+TABLE_NAME+" (login, password, name) VALUES (?, ?, ?);";
+
+        params.put(1, login);
+        params.put(2, hashPassword);
+        if (name != null && !name.equals("")) {
+            params.put(3, name);
+        } else {
+            params.put(3, login);
         }
+
+        ret = bddConnectionManager.executeUpdate(sql, params) != -1;
+
         return ret;
     }
 
     @Override
     public boolean updatePassword(String username, String hashedPassword) {
-        boolean ret = false;
-        Connection conn = null;
-        PreparedStatement statement = null;
-        try {
-            conn = mDataSource.getConnection();
-            statement = conn.prepareStatement("UPDATE "+TABLE_NAME+" SET password = ? WHERE login = ?;");
-            statement.setString(1, hashedPassword);
-            statement.setString(2, username);
-            System.out.println(IndexController.LOG_TAG + " SQL -> " + statement.toString());
-            statement.executeUpdate();
-            ret = true;
-        } catch (SQLException ex) {
-            System.err.println(IndexController.LOG_TAG + " SQLException -> updatePassword()");
-        } finally {
-            if (statement != null) {
-                try {
-                    statement.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close statement -> updatePassword()");
-                }
-            }
-            if (conn != null) {
-                try {
-                    conn.close();
-                } catch (SQLException ex) {
-                    System.err.println(IndexController.LOG_TAG + " Failed close connection -> updatePassword()");
-                }
-            }
-        }
+        boolean ret;
+        Map<Integer, Object> params = new HashMap<>();
+        String sql = "UPDATE "+TABLE_NAME+" SET password = ? WHERE login = ?;";
+
+        params.put(1, hashedPassword);
+        params.put(2, username);
+
+        ret = bddConnectionManager.executeUpdate(sql, params) != -1;
+
         return ret;
     }
 }
diff --git a/src/main/webapp/WEB-INF/applicationContext.xml b/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 0000000..906b5cd
--- /dev/null
+++ b/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,64 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:tx="http://www.springframework.org/schema/tx"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+    http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+    http://www.springframework.org/schema/context
+    http://www.springframework.org/schema/context/spring-context-4.0.xsd
+    http://www.springframework.org/schema/mvc
+    http://www.springframework.org/schema/mvc/spring-mvc.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+
+    <context:component-scan base-package="fr.geoffrey.medical_training_tracker.config" />
+    <mvc:annotation-driven />
+    <bean id="prodDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+        <property name="driverClassName">
+            <value>org.postgresql.Driver</value>
+        </property>
+        <property name="url">
+            <value>jdbc:postgresql://127.0.0.1:5432/medical_training</value>
+        </property>
+        <property name="username">
+            <value>postgres</value>
+        </property>
+        <property name="password">
+            <value>toto</value>
+        </property>
+    </bean>
+	
+    <bean id="bddConnectionManager" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.PostgresConnectionManager">
+        <property name="dataSource">
+            <ref bean="prodDataSource"/>
+        </property>
+    </bean>
+
+
+    <bean id="userDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.UserBddDao"></bean>
+    <bean id="animalDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.AnimalDao"></bean>
+    <bean id="careDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.CareDao"></bean>
+    <bean id="consentBehaviorDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.ConsentBehaviorDao"></bean>
+    <bean id="progressionDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.ProgressionDao"></bean>
+
+    <bean id="serviceAnimal" class="fr.geoffrey.medical_training_tracker.services.ServiceAnimal">
+        <property name="animalDao">
+            <ref bean="animalDao"/>
+        </property>
+        <property name="careDao">
+            <ref bean="careDao"/>
+        </property>
+        <property name="consentBehaviorDao">
+            <ref bean="consentBehaviorDao"/>
+        </property>
+        <property name="progressionDao">
+            <ref bean="progressionDao"/>
+        </property>
+    </bean>
+	
+    <bean id="serviceRegister" class="fr.geoffrey.medical_training_tracker.services.ServiceRegister">
+        <property name="userDao">
+            <ref bean="userDao"/>
+        </property>
+    </bean>
+</beans>
diff --git a/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index 1e67f32..ec1b517 100644
--- a/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -17,7 +17,7 @@
     </bean>
 
     
-    <context:component-scan base-package="fr.geoffrey" />
+    <context:component-scan base-package="fr.geoffrey.medical_training_tracker.controller" />
     <bean
         class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="prefix">
@@ -30,68 +30,4 @@
     
     <mvc:resources mapping="/static/**" location="/resources/static/" cache-period="31556926"/>
     <mvc:annotation-driven />
-    
-    
-    <bean id="prodDataSource" class="org.apache.commons.dbcp.BasicDataSource">
-        <property name="driverClassName">
-            <value>org.postgresql.Driver</value>
-        </property>
-        <property name="url">
-            <value>jdbc:postgresql://127.0.0.1:5432/medical_training</value>
-        </property>
-        <property name="username">
-            <value>postgres</value>
-        </property>
-        <property name="password">
-            <value>toto</value>
-        </property>
-    </bean>
-	
-
-    <bean id="userDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.UserBddDao">
-        <property name="dataSource">
-            <ref bean="prodDataSource"/>
-        </property>
-    </bean>
-    <bean id="animalDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.AnimalDao">
-        <property name="dataSource">
-            <ref bean="prodDataSource"/>
-        </property>
-    </bean>
-    <bean id="careDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.CareDao">
-        <property name="dataSource">
-            <ref bean="prodDataSource"/>
-        </property>
-    </bean>
-    <bean id="consentBehaviorDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.ConsentBehaviorDao">
-        <property name="dataSource">
-            <ref bean="prodDataSource"/>
-        </property>
-    </bean>
-    <bean id="progressionDao" class="fr.geoffrey.medical_training_tracker.dao.bdd.postgres.ProgressionDao">
-        <property name="dataSource">
-            <ref bean="prodDataSource"/>
-        </property>
-    </bean>
-	
-    <bean id="serviceAnimal" class="fr.geoffrey.medical_training_tracker.services.ServiceAnimal">
-        <property name="animalDao">
-            <ref bean="animalDao"/>
-        </property>
-        <property name="careDao">
-            <ref bean="careDao"/>
-        </property>
-        <property name="consentBehaviorDao">
-            <ref bean="consentBehaviorDao"/>
-        </property>
-        <property name="progressionDao">
-            <ref bean="progressionDao"/>
-        </property>
-    </bean>
-	
-    <bean id="serviceRegister" class="fr.geoffrey.medical_training_tracker.services.ServiceRegister">
-        <property name="userDao">
-            <ref bean="userDao"/>
-        </property>
-    </bean>
 </beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 9379259..ca9f144 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -4,10 +4,10 @@
 
 <web-app>
     <display-name>Medical Training Tracker</display-name>
-    <context-param>
+<!--    <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>/WEB-INF/dispatcher-servlet.xml</param-value>
-    </context-param>
+    </context-param>-->
 	
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
diff --git a/src/main/webapp/resources/static/img/logo-white.svg b/src/main/webapp/resources/static/img/logo-white.svg
new file mode 100644
index 0000000..c728244
--- /dev/null
+++ b/src/main/webapp/resources/static/img/logo-white.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="205.92014mm"
+   height="206.12968mm"
+   viewBox="0 0 205.92014 206.12968"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="logo-white.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient2837"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2779"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2777" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="584.71824"
+     inkscape:cy="567.26161"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1540"
+     inkscape:window-height="1009"
+     inkscape:window-x="287"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     units="mm"
+     fit-margin-top="1"
+     fit-margin-left="1"
+     fit-margin-right="1"
+     fit-margin-bottom="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-2.0840301,-44.317477)">
+    <g
+       id="g956"
+       transform="matrix(1.151074,0,0,1.151074,-8.3971153,-17.494504)">
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.76358;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 351.98336,876.11305 C 302.03526,872.13054 262.23645,861.17838 220.11416,839.8242 185.75614,822.40618 150.75895,795.71678 125.13162,767.38904 19.867091,651.03253 8.0030285,481.83015 96.005587,352.00059 c 21.463233,-31.66456 52.788783,-63.26974 84.802483,-85.5595 56.72374,-39.49428 123.01885,-60.35148 191.97372,-60.39712 105.17087,-0.0696 204.07093,49.40872 267.67057,133.91185 30.22555,40.15987 51.66927,87.91387 61.02898,135.90818 4.83807,24.80843 5.94416,37.00411 5.94416,65.5402 0,29.42947 -1.19309,41.93775 -6.45555,67.68022 -27.90823,136.51908 -139.63505,242.63321 -277.59327,263.64812 -22.75083,3.46559 -52.59991,4.87897 -71.39332,3.38051 z m 66.67007,-39.64089 c 33.91678,-5.46105 67.07888,-16.45465 95.45942,-31.64587 75.98574,-40.6728 130.28573,-111.08557 150.56009,-195.2368 5.82996,-24.19792 7.3891,-38.62412 7.42385,-68.69037 0.0337,-29.15746 -0.90157,-38.90615 -6.10176,-63.60019 -9.18355,-43.60971 -30.30135,-88.22874 -58.58547,-123.78311 -8.86228,-11.14025 -35.84839,-38.16177 -46.8297,-46.89114 -53.54768,-42.56661 -118.90968,-65.2553 -187.88837,-65.22047 -20.98654,0.0106 -57.81278,3.87458 -77.14957,8.09489 -50.53153,11.02866 -109.58,47.90882 -147.81144,92.31923 -18.46332,21.44736 -30.41094,39.94164 -42.87362,66.36607 -21.406427,45.38775 -30.326937,84.06377 -30.377268,131.70457 -0.02249,21.28384 1.00858,33.91796 4.328008,53.03301 20.885159,120.26794 115.14475,216.87852 235.03146,240.89353 23.36518,4.68038 33.79039,5.51714 63.90319,5.12907 22.01924,-0.28377 30.50208,-0.79643 40.91118,-2.47242 z"
+         id="path950"
+         transform="scale(0.26458333)" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.202031;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 107.62822,204.50476 c -1.52168,-1.00339 -2.97617,-3.61763 -5.11632,-9.1959 -1.05925,-2.76091 -1.61685,-3.40854 -2.934736,-3.40854 -1.172882,0 -1.684533,-0.64329 -2.420964,-3.04379 -0.869971,-2.83579 -2.682597,-5.87863 -4.92298,-8.26417 -0.992725,-1.05704 -4.741058,-5.22935 -8.329629,-9.2718 -11.515254,-12.97169 -18.441243,-20.31159 -21.462468,-22.74509 -2.188572,-1.76283 -3.098916,-1.40352 -3.116087,1.2299 -0.0038,0.58799 -0.296529,2.1157 -0.650439,3.3949 -1.208066,4.36657 -1.591029,7.26651 -1.581144,11.97309 0.01733,8.24782 1.214125,11.16864 5.247039,12.80548 0.829987,0.33686 1.566259,0.8107 1.636159,1.05296 0.0699,0.24227 0.253939,0.93226 0.408977,1.53332 0.169953,0.65889 0.818838,1.70644 1.634162,2.63815 1.669201,1.90749 1.728444,2.7748 0.223105,3.26615 -1.35233,0.44141 -5.487763,0.87046 -10.306513,1.06929 -4.608637,0.19016 -4.992851,0.0683 -5.322451,-1.68865 -0.09526,-0.50776 -0.330076,-0.89875 -0.539766,-0.89875 -0.810466,0 -1.361731,-1.02297 -1.813121,-3.36457 -0.25252,-1.30995 -0.627795,-2.98308 -0.83394,-3.71807 -0.206145,-0.73499 -0.452194,-2.17825 -0.546772,-3.20724 -0.09458,-1.02899 -0.340069,-2.54974 -0.545531,-3.37944 -0.509405,-2.0571 -0.478935,-2.69488 0.318209,-6.66079 l 0.691777,-3.4417 -0.558144,-0.78384 c -0.783098,-1.09976 -0.696066,-1.92408 0.525532,-4.97763 1.984904,-4.96155 2.692558,-11.88917 2.620944,-25.65788 -0.03009,-5.78435 0.05499,-7.96903 0.374673,-9.6217 0.227479,-1.17599 0.383075,-2.17006 0.345766,-2.20906 -0.03731,-0.039 -0.748358,-0.24816 -1.580116,-0.46481 -2.016522,-0.52523 -4.27996,-1.69419 -6.354172,-3.28161 -0.93639,-0.71663 -4.441791,-3.13098 -7.789783,-5.36523 l -6.087256,-4.06227 0.717796,-1.26204 C 35.644119,92.796321 44.743795,83.0368 54.91476,76.300159 c 6.97227,-4.618016 14.409565,-8.014425 22.262523,-10.166681 4.347765,-1.19159 7.800056,-1.84763 8.622315,-1.638503 0.852842,0.216908 6.482646,4.469693 10.541939,7.963442 3.897853,3.354806 12.125663,11.548568 15.806733,15.74133 10.05948,11.457826 17.88677,23.377513 21.10479,32.139153 0.41842,1.13924 0.85014,2.07134 0.95937,2.07134 0.30883,0 4.54495,-2.53957 8.2331,-4.93576 4.97425,-3.23178 9.13134,-5.68884 9.98916,-5.90414 1.21688,-0.30542 1.03956,0.10848 -3.0225,7.05525 -6.25414,10.69556 -7.55431,14.3094 -6.97303,19.3817 0.41302,3.6041 0.90217,5.50841 2.48129,9.65992 0.72689,1.91098 1.54442,4.34454 1.81674,5.40791 l 0.49513,1.93341 -0.78076,1.67473 c -1.20619,2.58728 -1.67891,4.80899 -1.66428,7.82193 0.0219,4.51309 0.85762,7.51329 4.54131,16.30344 2.02638,4.83541 4.07499,10.55329 4.07499,11.37369 0,0.52647 -2.83882,1.89826 -5.21176,2.51845 -1.92187,0.5023 -5.40209,0.56225 -7.22954,0.12454 -5.25436,-1.25853 -10.34988,-5.64336 -17.23536,-14.83148 -5.02742,-6.7087 -7.89392,-9.6031 -12.83625,-12.96117 -9.32641,-6.33684 -11.799138,-9.54536 -13.875337,-18.00413 -1.195983,-4.87263 -1.764652,-5.91775 -4.983041,-9.158 -4.097554,-4.12539 -8.042319,-4.74136 -10.356865,-1.61721 -0.669333,0.90345 -0.954133,3.37606 -0.651942,5.66012 0.367139,2.77494 1.869911,5.33515 6.517542,11.10368 2.309477,2.86647 4.707062,5.99961 5.327971,6.96253 1.585666,2.45912 4.776006,6.233 8.574382,10.14272 3.23448,3.3293 3.25656,3.36075 6.37418,9.08003 4.32105,7.92695 5.05002,8.96176 9.34787,13.26979 3.50421,3.51251 3.93717,3.85535 6.23557,4.93771 2.58089,1.21538 3.27563,1.96073 3.27563,3.51425 0,1.3585 -0.62175,1.5535 -5.78705,1.81503 -2.62355,0.13283 -6.51403,0.24429 -8.64551,0.24767 -3.31123,0.005 -3.9832,-0.0649 -4.61585,-0.48209 z"
+         id="path952" />
+    </g>
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.76358;stroke-opacity:1"
+       d="M 378.58432,941.94471 C 303.83758,938.11585 232.157,912.84039 171.50305,868.9253 97.158665,815.09795 44.246136,736.32278 22.564455,647.18834 15.222037,617.00329 12.037967,589.77174 12.037967,557.16122 c 0,-25.67417 1.023856,-38.5413 4.953159,-62.24792 C 38.722591,363.80107 126.19358,252.97241 248.38747,201.72641 c 93.7296,-39.30856 198.14128,-40.09957 292.83141,-2.21845 49.98822,19.99796 101.35847,55.44881 137.67995,95.0136 27.73667,30.21341 46.85332,58.31734 64.93269,95.45941 15.20709,31.24129 24.61806,58.77039 31.13702,91.08251 4.86026,24.09053 6.18029,36.45123 6.83214,63.97591 0.98088,41.41793 -1.60782,67.0838 -10.44323,103.54031 -24.13457,99.58369 -89.72442,187.68584 -178.86985,240.2631 -54.73924,32.28475 -117.43331,50.85844 -178.04286,52.7468 -9.16714,0.28562 -18.03122,0.63371 -19.69798,0.77354 -1.66675,0.13984 -8.93985,-0.0485 -16.16244,-0.41843 z m 59.599,-43.40872 c 14.24642,-1.32525 37.60795,-6.00127 55.34256,-11.07728 58.33136,-16.69567 107.91771,-46.27689 150.89602,-90.01849 26.36752,-26.83582 44.00962,-51.57429 61.49492,-86.23074 13.95856,-27.6663 23.65072,-55.12156 30.24841,-85.68556 5.34173,-24.74569 7.56166,-61.65668 5.69114,-94.62667 -3.44324,-60.6908 -26.62772,-124.89258 -63.90715,-176.96984 -23.49526,-32.82156 -61.95935,-68.83872 -96.82931,-90.66942 -24.88815,-15.58149 -60.57551,-31.28601 -88.61931,-38.99766 -30.49159,-8.38475 -52.33367,-11.53175 -85.12693,-12.26503 -26.19262,-0.5857 -63.7008,1.54928 -63.61356,3.6209 0.0143,0.34019 2.37813,2.20952 5.25291,4.15407 7.90375,5.34623 24.05611,18.11154 38.13858,30.14117 15.22231,13.00333 53.97411,51.56347 68.94973,68.60873 41.12912,46.8132 76.92466,100.8282 90.21138,136.12778 1.40652,3.73675 3.24702,8.12789 4.09003,9.75808 l 1.53273,2.96398 6.76354,-3.77429 c 3.71994,-2.07587 13.58206,-8.07835 21.91582,-13.33885 37.70359,-23.79959 51.24136,-31.59461 52.56762,-30.26836 0.82319,0.8232 -2.84661,7.86582 -16.27771,31.23822 -22.14816,38.54155 -28.60524,53.89381 -29.48193,70.09578 -0.87503,16.171 2.0127,31.21245 10.37125,54.02145 2.54498,6.9448 5.95296,17.05701 7.5733,22.47158 l 2.94605,9.84466 -3.06191,6.82285 c -5.57455,12.42184 -7.28762,20.60323 -7.24515,34.60205 0.0631,20.81635 2.42091,29.60085 18.97884,70.71068 11.06664,27.47612 17.6728,45.8646 17.6728,49.19287 0,2.56929 -8.48293,7.23162 -19.19289,10.54868 -10.05591,3.11449 -28.86193,3.34192 -37.37565,0.45201 -22.5647,-7.65944 -41.28961,-24.60045 -73.2311,-66.25448 -21.7313,-28.3392 -31.06904,-37.43025 -58.62232,-57.07362 -25.39563,-18.10512 -37.7153,-30.55984 -45.44113,-45.93923 -3.66352,-7.29278 -5.93995,-13.95253 -10.19377,-29.82221 -4.42628,-16.51302 -7.07642,-22.30162 -14.19202,-30.99899 -11.91574,-14.56458 -25.84876,-23.41527 -36.70013,-23.31305 -6.73179,0.0634 -10.63505,1.82667 -14.96804,6.76168 -3.84925,4.38405 -4.7931,8.56234 -4.5803,20.27624 0.29346,16.15375 4.54774,24.35999 28.53531,55.04291 8.03994,10.28403 18.24185,23.69849 22.67092,29.80991 10.85237,14.97455 15.40906,20.41301 33.32639,39.77533 18.50577,19.99823 19.7298,21.70415 33.43116,46.59271 16.83551,30.58173 21.84837,37.56986 39.89841,55.61993 14.60332,14.60335 16.45721,16.10198 26.1223,21.11662 12.17388,6.3163 14.57014,8.79368 14.1412,14.61995 -0.24196,3.28647 -0.83092,4.34065 -3.00437,5.37748 -6.51566,3.10825 -72.06842,4.6183 -77.54491,1.7863 -6.07717,-3.14262 -13.30503,-15.57759 -22.32955,-38.4162 -4.89537,-12.38889 -8.21984,-16.66752 -12.95055,-16.66752 -4.87326,0 -7.68536,-3.54862 -11.75225,-14.83031 -6.22848,-17.27799 -9.95692,-22.18949 -55.07304,-72.54788 -74.80013,-83.49157 -96.60784,-105.56095 -104.30932,-105.56095 -3.64047,0 -4.531,1.67087 -5.67024,10.63889 -0.56238,4.42691 -2.38993,13.50376 -4.06126,20.17077 -4.04555,16.13799 -5.136,25.92884 -5.136,46.11489 0,36.00996 4.43677,47.40437 21.79881,55.98311 6.91,3.4143 7.56625,4.01477 8.60412,7.87273 1.52008,5.6504 3.44631,9.21879 8.52523,15.79326 7.53464,9.75332 7.05405,11.30166 -4.21884,13.59199 -15.49825,3.14878 -54.70151,4.84577 -58.98508,2.55327 -1.05578,-0.56503 -2.41249,-2.85782 -3.01493,-5.09511 -0.76827,-2.85313 -1.84882,-4.35424 -3.6187,-5.02716 -1.4122,-0.53691 -3.1512,-2.46198 -3.94912,-4.37167 -1.92774,-4.61375 -8.14105,-33.4347 -9.5107,-44.11628 -0.60828,-4.74367 -1.5564,-10.19549 -2.10695,-12.11517 -1.59096,-5.54735 -1.11617,-12.57151 1.88793,-27.93036 l 2.80194,-14.3252 -2.33518,-3.85755 c -1.28436,-2.12165 -2.33753,-4.67524 -2.34038,-5.67464 -0.003,-0.99941 2.23293,-8.49979 4.96837,-16.66752 8.49323,-25.35981 9.9767,-39.27181 11.17015,-104.754 0.48786,-26.7668 1.30354,-48.18008 1.92396,-50.50763 1.82115,-6.83214 1.67042,-7.09356 -5.1882,-8.99763 -9.17242,-2.5464 -17.31789,-6.70546 -28.10669,-14.35125 -17.61873,-12.48599 -58.312114,-39.78565 -59.305229,-39.78565 -1.017328,0 -11.729894,22.65486 -17.434597,36.87057 -12.574625,31.33505 -20.181934,62.71328 -23.143094,95.45941 -1.34801,14.90704 -1.360591,53.29127 -0.0219,66.81558 9.903403,100.05047 61.45934,188.94425 143.74439,247.84694 50.59007,36.21424 116.61594,59.81631 173.41818,61.99126 21.38729,0.81892 51.96191,0.3874 66.16499,-0.93382 z"
+       id="path859"
+       transform="scale(0.26458333)" />
+  </g>
+</svg>
diff --git a/src/main/webapp/resources/static/img/logo_.svg b/src/main/webapp/resources/static/img/logo_.svg
new file mode 100644
index 0000000..d108185
--- /dev/null
+++ b/src/main/webapp/resources/static/img/logo_.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="205.92038mm"
+   height="206.12984mm"
+   viewBox="0 0 205.92038 206.12984"
+   version="1.1"
+   id="svg8"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="logo.svg">
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient3083"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#22beff;stop-opacity:1;"
+         offset="0"
+         id="stop3081" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2872"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#22beff;stop-opacity:1;"
+         offset="0"
+         id="stop2870" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="299.07042"
+     inkscape:cy="543.10202"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1540"
+     inkscape:window-height="1009"
+     inkscape:window-x="287"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     fit-margin-left="1"
+     fit-margin-top="1"
+     fit-margin-bottom="1"
+     fit-margin-right="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-2.0838031,-44.317375)">
+    <path
+       id="path859"
+       clip-path="none"
+       style="opacity:1;mix-blend-mode:normal;fill:#22beff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 105.48837,46.308747 c -8.721139,-0.03984 -17.434966,1.667864 -25.665155,5.119461 -20.808877,8.726882 -35.70468,27.600437 -39.405417,49.928042 -0.669137,4.03709 -0.843488,6.2283 -0.843488,10.60047 0,5.55336 0.542374,10.19045 1.792743,15.33078 3.692259,15.17905 12.703088,28.59421 25.363485,37.76066 10.329,7.47848 22.535565,11.78277 35.264472,12.4348 1.22996,0.063 2.46846,0.095 2.75231,0.0712 0.28384,-0.0237 1.79354,-0.083 3.35466,-0.13172 10.32144,-0.32158 20.99788,-3.48445 30.31964,-8.98235 15.18093,-8.95358 26.35035,-23.95694 30.46033,-40.91544 1.50461,-6.20833 1.94548,-10.57918 1.77844,-17.6324 -0.11102,-4.6873 -0.33579,-6.79235 -1.16346,-10.894814 -1.11014,-5.502593 -2.71272,-10.190551 -5.30239,-15.510745 -3.07881,-6.325074 -6.33442,-11.110932 -11.0578,-16.256091 -6.18532,-6.737644 -14.93333,-12.774721 -23.44601,-16.180252 -7.81063,-3.124665 -16.00978,-4.704193 -24.20236,-4.741622 z m -0.33727,6.85167 c 0.6015,-0.001 1.18895,0.0042 1.74651,0.01664 5.58449,0.124874 9.30407,0.66056 14.49661,2.088432 4.77569,1.313247 10.853,3.987696 15.09131,6.641129 5.93814,3.717635 12.48846,9.851224 16.48956,15.440541 6.34847,8.868441 10.29649,19.801432 10.88285,30.136691 0.31854,5.61458 -0.0592,11.90035 -0.96887,16.11438 -1.12356,5.20488 -2.77433,9.88034 -5.1514,14.59174 -2.97763,5.90178 -5.98184,10.11456 -10.47208,14.68453 -7.31895,7.44892 -15.76328,12.48659 -25.69675,15.32978 -3.0201,0.8644 -6.9983,1.66052 -9.42438,1.8862 -2.4187,0.22499 -7.62554,0.29877 -11.26767,0.15931 -9.673066,-0.37039 -20.916836,-4.38983 -29.532018,-10.5569 -14.012645,-10.03077 -22.792265,-25.16896 -24.478756,-42.20695 -0.227969,-2.30311 -0.225898,-8.83951 0.0037,-11.37809 0.504268,-5.57646 1.799991,-10.919902 3.941373,-16.256074 0.971477,-2.420851 2.795591,-6.278914 2.968836,-6.278914 0.169122,0 7.098866,4.648872 10.09923,6.77516 1.837266,1.302035 3.224515,2.010347 4.786521,2.443985 1.167983,0.324252 1.193532,0.368843 0.883401,1.532315 -0.105652,0.396368 -0.244537,4.042954 -0.327615,8.601168 -0.203239,11.15121 -0.455825,13.52033 -1.902171,17.83893 -0.465829,1.39094 -0.846659,2.66795 -0.846148,2.83814 5.1e-4,0.17019 0.180073,0.60524 0.398792,0.96655 l 0.397466,0.65689 -0.476957,2.43933 c -0.511579,2.61552 -0.592559,3.8119 -0.321628,4.75659 0.09375,0.3269 0.255294,1.25532 0.358881,2.06314 0.233243,1.81902 1.291171,6.72687 1.619453,7.51257 0.135882,0.32521 0.43204,0.65327 0.672529,0.74469 0.3014,0.11461 0.485486,0.36992 0.616318,0.8558 0.102593,0.38099 0.333749,0.77155 0.513542,0.86778 0.729467,0.39039 7.405423,0.10146 10.04468,-0.43473 1.919705,-0.39002 2.001533,-0.65366 0.718428,-2.31459 -0.864908,-1.1196 -1.192961,-1.72723 -1.451821,-2.68944 -0.176743,-0.657 -0.288395,-0.75931 -1.465127,-1.34074 -2.95665,-1.46091 -3.712207,-3.40152 -3.712207,-9.53379 0,-3.43757 0.185818,-5.10463 0.874751,-7.85282 0.284618,-1.13536 0.595716,-2.68128 0.691486,-3.43515 0.194005,-1.52722 0.345604,-1.81171 0.965555,-1.81171 1.311514,0 5.025112,3.75822 17.763119,17.97632 7.682987,8.57573 8.318117,9.4123 9.378787,12.35463 0.69258,1.92119 1.17141,2.52548 2.0013,2.52548 0.80561,0 1.37184,0.7287 2.20549,2.83845 1.53683,3.88928 2.76745,6.00683 3.80236,6.54202 0.93262,0.48226 12.09585,0.22498 13.20543,-0.30434 0.37012,-0.17657 0.47068,-0.35599 0.51188,-0.91566 0.073,-0.99218 -0.33525,-1.41393 -2.40839,-2.48955 -1.64591,-0.85398 -1.96141,-1.10927 -4.44828,-3.59614 -3.0738,-3.07381 -3.92747,-4.26404 -6.79445,-9.47192 -2.33327,-4.23837 -2.54179,-4.52872 -5.69322,-7.93431 -3.0512,-3.29729 -3.82714,-4.22343 -5.67524,-6.77352 -0.75424,-1.04072 -2.491718,-3.32523 -3.86087,-5.07655 -4.084937,-5.2251 -4.809388,-6.62259 -4.859363,-9.37347 -0.03625,-1.99481 0.124454,-2.7062 0.779958,-3.45278 0.737882,-0.84041 1.402703,-1.14069 2.549087,-1.15148 1.847923,-0.0174 4.220471,1.48971 6.249648,3.96997 1.21174,1.48112 1.66327,2.46705 2.41705,5.27912 0.72438,2.7025 1.11199,3.83663 1.73586,5.07855 1.31565,2.61902 3.41367,4.74002 7.73841,7.8232 4.69214,3.34515 6.2821,4.89309 9.9828,9.71907 5.43944,7.09344 8.62841,9.97861 12.47103,11.28297 1.44984,0.49212 4.65229,0.45321 6.36473,-0.0772 1.82386,-0.56488 3.26853,-1.35886 3.26853,-1.7964 0,-0.56679 -1.12516,-3.69832 -3.00975,-8.37733 -2.81971,-7.00075 -3.22118,-8.49641 -3.23192,-12.04131 -0.006,-2.38392 0.28466,-3.7774 1.23395,-5.89277 l 0.52121,-1.16179 -0.50158,-1.67633 c -0.27593,-0.92208 -0.85611,-2.64431 -1.2895,-3.82696 -1.42342,-3.88423 -1.91548,-6.44571 -1.76647,-9.19953 0.14929,-2.7591 1.24897,-5.37348 5.02067,-11.936851 2.28724,-3.980189 2.91212,-5.179511 2.77194,-5.319694 -0.22586,-0.22585 -2.53105,1.101789 -8.95174,5.154715 -1.41919,0.895836 -3.09868,1.917856 -3.73217,2.271363 l -1.1518,0.642593 -0.2611,-0.504567 c -0.14356,-0.277613 -0.45696,-1.025338 -0.69647,-1.661684 -2.26266,-6.011268 -8.35834,-15.209893 -15.36239,-23.181895 -2.55026,-2.902705 -9.14937,-9.469039 -11.74163,-11.683426 -2.39816,-2.048574 -5.148818,-4.222669 -6.494774,-5.1331 -0.489559,-0.331145 -0.892272,-0.64952 -0.894707,-0.707451 -0.013,-0.308685 4.875901,-0.625352 9.086431,-0.632948 z" />
+    <g
+       id="g910"
+       style="opacity:1;mix-blend-mode:normal;fill:#22beff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="translate(0,-1.0583333)">
+      <path
+         d="m 152.0457,249.78659 h -38.92439 v -11.44835 c -1.24201,-26.33402 12.32286,-40.27334 32.23855,-62.48509 l 29.62833,-34.34505 c 1.76294,-2.05392 4.1966,-3.41677 6.86901,-3.84664 V 98.159526 c -0.004,-3.229661 1.33344,-6.159778 3.49606,-8.248922 1.93153,-1.865911 4.52153,-3.060971 7.40277,-3.199427 3.05076,-0.131302 6.02189,0.994252 8.21991,3.113951 2.39522,2.324656 3.74241,5.523207 3.73216,8.861022 v 55.46093 c 0.70388,22.83014 -3.68938,30.2612 -12.25226,40.06922 -12.59319,14.08147 -20.61721,24.91161 -31.90528,36.35996 l -4.96859,4.99148 -3.53627,4.00692 z m -34.34505,-4.57934 h 29.76571 v -8.10543 l 5.32222,-5.22045 4.44196,-4.57934 c 11.24228,-11.44835 19.2205,-22.20979 31.69921,-36.24547 11.24996,-11.68691 11.13321,-23.56454 11.19901,-36.93238 V 98.663253 c 0.0192,-2.07425 -0.8076,-4.066779 -2.28967,-5.518104 -1.28895,-1.252977 -3.03492,-1.923231 -4.8312,-1.854633 -1.79932,0.06602 -3.41598,0.819839 -4.60091,2.002906 -1.24835,1.246389 -2.01752,2.969203 -2.01624,4.866104 v 39.799584 c 1.69191,0.44832 3.25849,1.27861 4.57934,2.42705 v 0 0 c 2.30508,1.96066 3.7244,4.76629 3.93824,7.78488 v 0.87008 c -0.002,2.75025 -0.99316,5.40803 -2.7934,7.48722 l -30.26944,35.3296 c -2.00786,2.17498 -5.32723,-0.70473 -3.4574,-2.99946 l 30.5213,-35.23802 c 1.11165,-1.26286 1.70823,-2.89731 1.67146,-4.57934 v -0.45794 c -0.14458,-1.76447 -0.96484,-3.40499 -2.28967,-4.57934 -1.1335,-1.09083 -2.61962,-1.74049 -4.1901,-1.83173 h -0.45793 c -1.9578,-0.003 -3.82366,0.83041 -5.12886,2.28967 l -29.62833,34.34504 c -16.08412,18.32967 -31.59892,32.23414 -31.1853,59.34825 z"
+         id="path877"
+         style="fill:#22beff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cccccccscccccccccccccccccccsccscsccccccccccccccc" />
+      <path
+         d="M 96.04037,249.78659 H 57.115982 v -10.21193 l -1.188099,-4.32747 -4.57934,-4.57934 C 40.06047,219.2195 29.390609,208.38936 16.728734,194.28499 4.8634715,181.73956 4.3786212,168.58526 4.4535739,154.21577 V 98.75484 c -0.0021,-3.363321 1.379266,-6.572752 3.8008521,-8.906816 2.19537,-2.116024 5.150428,-3.261346 8.197018,-3.136847 2.839526,0.116037 5.524737,1.309251 7.533014,3.320021 2.155051,2.157726 3.365815,5.078734 3.365815,8.128328 v 39.616414 c 2.67241,0.42987 5.106073,1.79272 6.86901,3.84665 l 29.628328,34.34504 c 17.3324,17.07043 33.856354,35.65875 32.215656,62.66827 z M 61.695321,245.20725 H 91.46103 v -6.86901 C 91.665815,211.79773 79.137672,200.03805 60.4589,178.80682 L 30.693191,144.59916 c -1.310508,-1.46523 -3.185985,-2.29878 -5.151757,-2.28967 h -0.412141 c -1.521066,0.0659 -2.974467,0.6473 -4.121406,1.64856 -1.324834,1.17435 -2.145094,2.81487 -2.28967,4.57934 v 0.52662 c -0.04145,1.66779 0.537885,3.29155 1.625666,4.55645 l 30.5213,35.23802 c 1.869874,2.29473 -1.449548,5.17449 -3.457402,2.99946 L 16.955172,156.59703 c -1.848938,-2.08374 -2.874659,-4.77015 -2.884984,-7.55591 v -0.87008 c 0.22788,-3.02118 1.644058,-5.82883 3.938232,-7.80777 1.350747,-1.18641 2.969345,-2.02714 4.71672,-2.44995 V 98.159526 c 0,-1.8291 -0.719206,-3.585968 -2.01491,-4.876997 -1.220947,-1.216542 -2.857069,-1.92518 -4.57934,-1.992013 -1.801046,-0.06989 -3.54762,0.612198 -4.831203,1.87753 -1.47686,1.455861 -2.28967,3.444304 -2.28967,5.518104 v 55.46093 c 0.662179,21.17779 2.888323,27.63044 11.107429,37.00107 12.593184,14.03567 23.217252,24.82002 34.459532,36.24547 l 4.441959,4.57934 2.653488,5.22045 z"
+         id="path879"
+         style="fill:#22beff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccccccccsssscccccccccccccccccccccccssssscccccc" />
+    </g>
+  </g>
+</svg>