Added SearchViewController and MapViewController