Added ControllerGenerator