Move to use CommandControllerFactory