added ControllerFactory support