Added ControllerFactory.