Modified files to support controllers.