Added camera controller and Updated MapController