Modify ControllerFactory