diff --git a/openecomp-bdd/resources/json/operation/createOperation.json b/openecomp-bdd/resources/json/operation/createOperation.json
index 5d49440..10c34ba 100644
--- a/openecomp-bdd/resources/json/operation/createOperation.json
+++ b/openecomp-bdd/resources/json/operation/createOperation.json
@@ -1,30 +1,14 @@
 {
   "interfaceOperations": {
-    "create": {
+    "operation": {
       "description": "abcd description",
       "inputParams": {
-        "listToscaDataDefinition": [
-          {
-            "paramName": "sd",
-            "paramId": "67c72959-0a05-4436-9339-534aa44c9fd0.nf_naming"
-          },
-          {
-            "paramName": "sdf",
-            "paramId": "67c72959-0a05-4436-9339-534aa44c9fd0.nf_naming_code"
-          }
-        ]
       },
       "outputParams": {
-        "listToscaDataDefinition": [
-          {
-            "paramName": "op1",
-            "paramId": "68443b9d-9405-458e-811f-b62dd4975fcb.nf_naming"
-          }
-        ]
       },
       "operationType": "create",
-      "workflowId" : "w_id1",
-      "workflowVersionId" : "w_version_id11"
+      "workflowId" : null,
+      "workflowVersionId" : null
     }
   }
 }
\ No newline at end of file
diff --git a/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json b/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json
new file mode 100644
index 0000000..013d615
--- /dev/null
+++ b/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json
@@ -0,0 +1,29 @@
+{
+  "interfaceOperations": {
+    "operation": {
+      "description": "abcd description",
+      "inputParams": {
+        "listToscaDataDefinition": [
+          {
+            "name": "inp1",
+            "type": "string",
+            "property": "97477d27-8fe2-45a1-83cb-83368ef2a402.nf_naming_code",
+            "mandatory": true
+          }
+        ]
+      },
+      "outputParams": {
+        "listToscaDataDefinition": [
+          {
+            "name": "op",
+            "mandatory": true,
+            "type": "String"
+          }
+        ]
+      },
+      "operationType": "create",
+      "workflowId" : null,
+      "workflowVersionId" : null
+    }
+  }
+}
\ No newline at end of file
diff --git a/openecomp-bdd/resources/json/operation/createService.json b/openecomp-bdd/resources/json/operation/createService.json
new file mode 100644
index 0000000..e7afe2a
--- /dev/null
+++ b/openecomp-bdd/resources/json/operation/createService.json
@@ -0,0 +1,102 @@
+{
+  "artifacts": {
+
+  },
+  "toscaArtifacts": {
+
+  },
+  "contactId": "cs0008",
+  "categories": [
+    {
+      "name": "Network L4+",
+      "normalizedName": "network l4+",
+      "uniqueId": "serviceNewCategory.network l4+",
+      "icons": [
+        "network_l_4"
+      ],
+      "subcategories": null,
+      "version": null,
+      "ownerId": null,
+      "empty": false,
+      "type": null
+    }
+  ],
+  "description": "service1 for bdd",
+  "icon": "defaulticon",
+  "componentInstancesProperties": {
+
+  },
+  "componentInstancesAttributes": {
+
+  },
+  "name": "service1",
+  "tags": [
+    "service1"
+  ],
+  "capabilities": {
+
+  },
+  "requirements": {
+
+  },
+  "deploymentArtifacts": {
+
+  },
+  "componentType": "SERVICE",
+  "projectCode": "010203",
+  "componentInstances": [
+
+  ],
+  "properties": [
+
+  ],
+
+  "inputs": [
+    {
+      "uniqueId": "03eeb10e-cf2a-41b8-9d8e-d2dbd094f9d4.test1_dasddas",
+      "type": "scalar-unit.size",
+      "required": false,
+      "definition": false,
+      "schema": {
+        "properties": {
+
+        },
+        "property": {
+          "type": "",
+          "required": false,
+          "definition": true,
+          "password": false,
+          "hidden": false,
+          "immutable": false,
+          "getInputProperty": false,
+          "empty": false
+        },
+        "empty": false
+      },
+      "password": false,
+      "name": "test1_dasddas",
+      "hidden": false,
+      "immutable": false,
+      "instanceUniqueId": "03eeb10e-cf2a-41b8-9d8e-d2dbd094f9d4",
+      "propertyId": "03eeb10e-cf2a-41b8-9d8e-d2dbd094f9d4.dasddas",
+      "parentUniqueId": "cs0008",
+      "schemaType": "",
+      "getInputProperty": false,
+      "ownerId": "cs0008",
+      "empty": false
+    }
+  ],
+
+  "attributes": [
+
+  ],
+  "forwardingPaths": {
+
+  },
+  "ecompGeneratedNaming": true,
+  "serviceApiArtifacts": {
+
+  },
+  "instantiationType": "A-la-carte",
+  "environmentContext": "General_Revenue-Bearing"
+}
\ No newline at end of file
diff --git a/openecomp-bdd/resources/json/operation/createVF_From_Catalog.json b/openecomp-bdd/resources/json/operation/createVF.json
similarity index 60%
rename from openecomp-bdd/resources/json/operation/createVF_From_Catalog.json
rename to openecomp-bdd/resources/json/operation/createVF.json
index 7dcafc6..6fe9688 100644
--- a/openecomp-bdd/resources/json/operation/createVF_From_Catalog.json
+++ b/openecomp-bdd/resources/json/operation/createVF.json
@@ -56,7 +56,38 @@
   "componentInstances": [
 
   ],
-  "inputs": [ ],
+  "inputs": [{
+    "uniqueId": "abcdef",
+    "type": "org.openecomp.datatypes.Naming",
+    "required": false,
+    "definition": false,
+    "defaultValue": null,
+    "description": null,
+    "schema": null,
+    "password": false,
+    "name": "abcdef",
+    "value": null,
+    "label": null,
+    "hidden": false,
+    "immutable": false,
+    "inputPath": null,
+    "status": null,
+    "inputId": null,
+    "instanceUniqueId": null,
+    "propertyId": null,
+    "annotations": null,
+    "parentUniqueId": "abcd",
+    "getInputValues": null,
+    "constraints": null,
+    "inputs": null,
+    "properties": null,
+    "getInputProperty": false,
+    "schemaType": null,
+    "schemaProperty": null,
+    "version": null,
+    "ownerId": null,
+    "empty": false
+  } ],
   "properties": [
 
   ],
diff --git a/openecomp-bdd/resources/json/operation/updateOperation.json b/openecomp-bdd/resources/json/operation/updateOperation.json
index b74262f..698d38c 100644
--- a/openecomp-bdd/resources/json/operation/updateOperation.json
+++ b/openecomp-bdd/resources/json/operation/updateOperation.json
@@ -1,12 +1,23 @@
 {
   "interfaceOperations": {
-    "create": {
+    "operation": {
       "description": "create operation_Updated",
       "inputParams": {
         "listToscaDataDefinition": [
           {
-            "paramName": "inp1",
-            "paramId": "REPLACE FROM CONTEXT"
+            "name": "inp1",
+            "type": "string",
+            "property": "97477d27-8fe2-45a1-83cb-83368ef2a402.nf_naming_code",
+            "mandatory": true
+          }
+        ]
+      },
+      "outputParams": {
+        "listToscaDataDefinition": [
+          {
+            "name": "op",
+            "mandatory": true,
+            "type": "String"
           }
         ]
       },