GenerateModelCommand fixes