MapViewController added and associated Data classes