Renamed controller to base_controller