Some updates to MapController