Started refactorning the map