Update to ControllerGenerator