Update for modified CommandControllerFactory API