Implement Map - missing data classes + scaling problems