Updated the base controller