Updated to implement new BaseController