Add Coordinates class. Update Map class.
Fix Map class.