Refactoring, add areas name on map