Added the map's feature
Merge branch 'feature/add-map' into develop