CLI and MapController update