Updated controllers to extend BaseController