diff --git a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java
index 0795e84e2..13d6398f0 100644
--- a/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java
+++ b/omod-2.0/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java
@@ -114,19 +114,19 @@ public Model getCREATEModel(Representation rep) {
 		ModelImpl model = new ModelImpl();
 		if (rep instanceof DefaultRepresentation) {
 			model
-					.property("concept", new RefProperty("#/definitions/ConceptGetRef"))
-					.property("programWorkflow", new ArrayProperty(new RefProperty("#/definitions/WorkflowCreateRef")))
-					.property("programWorkflowState", new ArrayProperty(new RefProperty("#/definitions/WorkflowStateCreateRef")));
+					.property("concept", new RefProperty("#/definitions/ConceptCreate"))
+					.property("programWorkflow", new ArrayProperty(new RefProperty("#/definitions/WorkflowCreate")))
+					.property("programWorkflowState", new ArrayProperty(new RefProperty("#/definitions/WorkflowStateCreate")));
 		} else if (rep instanceof FullRepresentation) {
 			model
-					.property("concept", new RefProperty("#/definitions/ConceptGetRef"))
-					.property("programWorkflow", new ArrayProperty(new RefProperty("#/definitions/WorkflowGet")))
+					.property("concept", new RefProperty("#/definitions/ConceptCreateFull"))
+					.property("programWorkflow", new ArrayProperty(new RefProperty("#/definitions/WorkflowCreateFull")))
 					.property("programWorkflowState", new ArrayProperty(new RefProperty("#/definitions/WorkflowStateGet")));
 		} else if (rep instanceof RefRepresentation) {
 			model
-					.property("concept", new RefProperty("#/definitions/ConceptGetRef"))
-					.property("programWorkflow", new ArrayProperty(new RefProperty("#/definitions/WorkflowCreateRef")))
-					.property("programWorkflowState", new ArrayProperty(new RefProperty("#/definitions/WorkflowStateCreateRef")));
+					.property("concept", new RefProperty("#/definitions/ConceptCreate"))
+					.property("programWorkflow", new ArrayProperty(new RefProperty("#/definitions/WorkflowCreate")))
+					.property("programWorkflowState", new ArrayProperty(new RefProperty("#/definitions/WorkflowStateCreate")));
 		}
 		return model;
 	}
diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java
index 5d2c54208..3bfeb862b 100644
--- a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java
+++ b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java
@@ -132,7 +132,7 @@ private void BuildJSON() {
 			try {
 				initSwagger();
 				addPaths();
-				addSubclassOperations();
+//				addSubclassOperations();
 			}
 			catch (Exception e) {
 				log.error("Error while creating Swagger specification", e);