More work on MapController