Map and GeoPointType improvements