Add connexion and fixe errors