Handle no conexion
Fragments and maps
Refactoring