BaseController refactor