diff --git a/components/core/pom.xml b/components/core/pom.xml
index fc6624e..99778c0 100644
--- a/components/core/pom.xml
+++ b/components/core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.components</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
diff --git a/components/parent/pom.xml b/components/parent/pom.xml
index 1528f18..ee1eb7a 100644
--- a/components/parent/pom.xml
+++ b/components/parent/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>components</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.ccsdk.apps.components</groupId>
     <artifactId>parent</artifactId>
diff --git a/components/pom.xml b/components/pom.xml
index aada3eb..0da83a3 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.apps</groupId>
diff --git a/components/resource-dict/pom.xml b/components/resource-dict/pom.xml
index 7eecb5e..74226e3 100644
--- a/components/resource-dict/pom.xml
+++ b/components/resource-dict/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.components</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml
index c7f15ea..ac30a18 100644
--- a/ms/blueprintsprocessor/application/pom.xml
+++ b/ms/blueprintsprocessor/application/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>application</artifactId>
diff --git a/ms/blueprintsprocessor/modules/commons/adaptors/pom.xml b/ms/blueprintsprocessor/modules/commons/adaptors/pom.xml
index a467051..7421e81 100644
--- a/ms/blueprintsprocessor/modules/commons/adaptors/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/adaptors/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>commons</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>adaptors</artifactId>
diff --git a/ms/blueprintsprocessor/modules/commons/core/pom.xml b/ms/blueprintsprocessor/modules/commons/core/pom.xml
index ad11580..f6c353b 100644
--- a/ms/blueprintsprocessor/modules/commons/core/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/core/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>commons</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>core</artifactId>
diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml
index a8ece15..1b4e0c8 100644
--- a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>commons</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>db-lib</artifactId>
diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml
index 00b7e5f..1c12033 100644
--- a/ms/blueprintsprocessor/modules/commons/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>commons</artifactId>
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
index 27a1a1d..81e590c 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>commons</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rest-lib</artifactId>
diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml
index fd2b9fa..5360b1e 100644
--- a/ms/blueprintsprocessor/modules/inbounds/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>inbounds</artifactId>
diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml
index 32b7217..6b18f02 100644
--- a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>inbounds</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>resource-api</artifactId>
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
index 7791b5d..74acf81 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>inbounds</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>selfservice-api</artifactId>
diff --git a/ms/blueprintsprocessor/modules/outbounds/pom.xml b/ms/blueprintsprocessor/modules/outbounds/pom.xml
index 8a90262..a9dc15b 100644
--- a/ms/blueprintsprocessor/modules/outbounds/pom.xml
+++ b/ms/blueprintsprocessor/modules/outbounds/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>modules</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>outbounds</artifactId>
diff --git a/ms/blueprintsprocessor/modules/pom.xml b/ms/blueprintsprocessor/modules/pom.xml
index 0ae3458..173e4c3 100644
--- a/ms/blueprintsprocessor/modules/pom.xml
+++ b/ms/blueprintsprocessor/modules/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 		<relativePath>../parent</relativePath>
 	</parent>
 
diff --git a/ms/blueprintsprocessor/modules/services/db-service/pom.xml b/ms/blueprintsprocessor/modules/services/db-service/pom.xml
index 3c0d9e7..2991de6 100644
--- a/ms/blueprintsprocessor/modules/services/db-service/pom.xml
+++ b/ms/blueprintsprocessor/modules/services/db-service/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
 		<artifactId>services</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>db-service</artifactId>
diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml
index b1bf823..9cf5144 100644
--- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml
+++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
         <artifactId>services</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>execution-service</artifactId>
diff --git a/ms/blueprintsprocessor/modules/services/pom.xml b/ms/blueprintsprocessor/modules/services/pom.xml
index 90a4446..c698bbc 100644
--- a/ms/blueprintsprocessor/modules/services/pom.xml
+++ b/ms/blueprintsprocessor/modules/services/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>services</artifactId>
diff --git a/ms/blueprintsprocessor/modules/services/resolution-service/pom.xml b/ms/blueprintsprocessor/modules/services/resolution-service/pom.xml
index f25eb71..185b612 100644
--- a/ms/blueprintsprocessor/modules/services/resolution-service/pom.xml
+++ b/ms/blueprintsprocessor/modules/services/resolution-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
         <artifactId>services</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <artifactId>resolution-service</artifactId>
     <packaging>jar</packaging>
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 185ed14..5b27ae8 100644
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>blueprintsprocessor</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.ccsdk.apps.blueprintsprocessor</groupId>
     <artifactId>parent</artifactId>
@@ -29,7 +29,7 @@
     <name>Blueprints Processor Parent</name>
     <description>Blueprints Processor Parent</description>
     <properties>
-        <controllerblueprints.version>0.3.0-SNAPSHOT</controllerblueprints.version>
+        <controllerblueprints.version>0.3.1-SNAPSHOT</controllerblueprints.version>
         <spring.boot.version>2.0.4.RELEASE</spring.boot.version>
         <spring.version>5.0.8.RELEASE</spring.version>
         <kotlin.version>1.2.60</kotlin.version>
diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml
index f35b105..5e03e93 100644
--- a/ms/blueprintsprocessor/pom.xml
+++ b/ms/blueprintsprocessor/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.apps</groupId>
 		<artifactId>ccsdk-apps</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>0.3.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>blueprintsprocessor</artifactId>
 	<packaging>pom</packaging>
diff --git a/ms/controllerblueprints/application/pom.xml b/ms/controllerblueprints/application/pom.xml
index 9834924..ecb8821 100644
--- a/ms/controllerblueprints/application/pom.xml
+++ b/ms/controllerblueprints/application/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>application</artifactId>
diff --git a/ms/controllerblueprints/distribution/pom.xml b/ms/controllerblueprints/distribution/pom.xml
index 7a2c679..b2c5b33 100644
--- a/ms/controllerblueprints/distribution/pom.xml
+++ b/ms/controllerblueprints/distribution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>distribution</artifactId>
diff --git a/ms/controllerblueprints/modules/pom.xml b/ms/controllerblueprints/modules/pom.xml
index 887d023..b38b6e6 100644
--- a/ms/controllerblueprints/modules/pom.xml
+++ b/ms/controllerblueprints/modules/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
         <artifactId>parent</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>modules</artifactId>
diff --git a/ms/controllerblueprints/modules/service/pom.xml b/ms/controllerblueprints/modules/service/pom.xml
index e95c1f7..add4ad1 100644
--- a/ms/controllerblueprints/modules/service/pom.xml
+++ b/ms/controllerblueprints/modules/service/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
         <artifactId>modules</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <artifactId>service</artifactId>
     <name>Controller Blueprints Service</name>
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
index 531d756..d49ab8f 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
@@ -1,925 +1,925 @@
-{
-  "metadata" : {
-    "template_author" : "Brinda Santh",
-    "template_name" : "enhance-template",
-    "template_version" : "1.0.0",
-    "template_tags" : "brinda, VPE",
-    "service-type" : "Sample Service",
-    "release" : "1806",
-    "vnf-type" : "VPE"
-  },
-  "tosca_definitions_version" : "controller_blueprint_1_0_0",
-  "artifact_types" : { },
-  "data_types" : {
-    "dt-v4-aggregate" : {
-      "description" : "This is dt-v4-aggregate Data Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "ipv4-address" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "ipv4-plen" : {
-          "required" : false,
-          "type" : "integer"
-        }
-      },
-      "derived_from" : "tosca.datatypes.Root"
-    },
-    "dt-license-key" : {
-      "description" : "This is dt-plicense-key Data Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "license-key" : {
-          "required" : true,
-          "type" : "string"
-        }
-      },
-      "derived_from" : "tosca.datatypes.Root"
-    },
-    "datatype-resource-assignment" : {
-      "description" : "This is Resource Assignment Data Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "property" : {
-          "required" : true,
-          "type" : "datatype-property"
-        },
-        "input-param" : {
-          "required" : true,
-          "type" : "boolean"
-        },
-        "dictionary-name" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "dictionary-source" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "status" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "message" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "updated-date" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "updated-by" : {
-          "required" : false,
-          "type" : "string"
-        }
-      },
-      "derived_from" : "tosca.datatypes.Root"
-    },
-    "datatype-property" : {
-      "description" : "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "description" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "required" : {
-          "required" : false,
-          "type" : "boolean"
-        },
-        "default" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "entry_schema" : {
-          "required" : false,
-          "type" : "string"
-        }
-      },
-      "derived_from" : "tosca.datatypes.Root"
-    },
-    "dt-resource-assignment-request" : {
-      "description" : "This is Dynamic Data type definition generated from resource mapping for the config template name base-config-template.",
-      "version" : "1.0.0",
-      "properties" : {
-        "hostname" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "licenses" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "dt-license-key"
-          }
-        },
-        "rs-db-source" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "service" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "service-instance-id" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "mdsal-source" : {
-          "description" : "",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "dt-v4-aggregate"
-          }
-        }
-      },
-      "derived_from" : "tosca.datatypes.Dynamic"
-    }
-  },
-  "node_types" : {
-    "dg-resource-assignment" : {
-      "description" : "This is Resource Assignment Directed Graph",
-      "version" : "1.0.0",
-      "properties" : {
-        "mode" : {
-          "required" : false,
-          "type" : "string",
-          "default" : "sync"
-        },
-        "version" : {
-          "required" : false,
-          "type" : "string",
-          "default" : "LATEST"
-        },
-        "is-start-flow" : {
-          "required" : false,
-          "type" : "boolean",
-          "default" : false
-        }
-      },
-      "capabilities" : {
-        "dg-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "requirements" : {
-        "component-dependency" : {
-          "capability" : "component-node",
-          "node" : "component-resource-assignment",
-          "relationship" : "tosca.relationships.DependsOn"
-        }
-      },
-      "interfaces" : {
-        "CONFIG" : {
-          "operations" : {
-            "ResourceAssignment" : {
-              "inputs" : {
-                "params" : {
-                  "required" : false,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "datatype-property"
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.DG"
-    },
-    "tosca.nodes.Component" : {
-      "description" : "This is default Component Node",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "artifact-config-template" : {
-      "description" : "This is Configuration Velocity Template",
-      "version" : "1.0.0",
-      "properties" : {
-        "action-names" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "capabilities" : {
-        "content" : {
-          "type" : "tosca.capabilities.Content",
-          "properties" : {
-            "content" : {
-              "required" : true,
-              "type" : "string"
-            }
-          }
-        },
-        "mapping" : {
-          "type" : "tosca.capabilities.Mapping",
-          "properties" : {
-            "mapping" : {
-              "required" : false,
-              "type" : "list",
-              "entry_schema" : {
-                "type" : "datatype-resource-assignment"
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Artifact"
-    },
-    "tosca.nodes.Vnf" : {
-      "description" : "This is VNF Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "tosca.nodes.Artifact" : {
-      "description" : "This is Deprecated Artifact Node Type.",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "dg-activate-netconf" : {
-      "description" : "This is Download Netconf Directed Graph",
-      "version" : "1.0.0",
-      "properties" : {
-        "mode" : {
-          "required" : false,
-          "type" : "string",
-          "default" : "sync"
-        },
-        "version" : {
-          "required" : false,
-          "type" : "string",
-          "default" : "LATEST"
-        },
-        "is-start-flow" : {
-          "required" : false,
-          "type" : "boolean",
-          "default" : false
-        }
-      },
-      "capabilities" : {
-        "dg-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "requirements" : {
-        "component-dependency" : {
-          "capability" : "component-node",
-          "node" : "component-netconf-executor",
-          "relationship" : "tosca.relationships.DependsOn"
-        }
-      },
-      "interfaces" : {
-        "CONFIG" : {
-          "operations" : {
-            "ActivateNetconf" : {
-              "inputs" : {
-                "params" : {
-                  "required" : false,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "datatype-property"
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.DG"
-    },
-    "source-input" : {
-      "description" : "This is Input Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "tosca.nodes.ResourceSource" : {
-      "description" : "TOSCA base type for Resource Sources",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "component-resource-assignment" : {
-      "description" : "This is Resource Assignment Component API",
-      "version" : "1.0.0",
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "interfaces" : {
-        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "template-name" : {
-                  "description" : "Service Template Name.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "template-version" : {
-                  "description" : "Service Template Version.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "resource-type" : {
-                  "description" : "Request type.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "template-names" : {
-                  "description" : "Name of the artifact Node Templates, to get the template Content.",
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "string"
-                  }
-                },
-                "request-id" : {
-                  "description" : "Request Id, Unique Id for the request.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "resource-id" : {
-                  "description" : "Resource Id.",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "action-name" : {
-                  "description" : "Action Name of the process",
-                  "required" : true,
-                  "type" : "string"
-                }
-              },
-              "outputs" : {
-                "resource-assignment-params" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "status" : {
-                  "required" : true,
-                  "type" : "string"
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Component"
-    },
-    "tosca.nodes.DG" : {
-      "description" : "This is Directed Graph Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "source-db" : {
-      "description" : "This is Database Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "SQL", "PLSQL" ]
-          } ]
-        },
-        "query" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "input-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "output-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "vnf-netconf-device" : {
-      "description" : "This is VNF Device with Netconf  Capability",
-      "version" : "1.0.0",
-      "capabilities" : {
-        "netconf" : {
-          "type" : "tosca.capabilities.Netconf",
-          "properties" : {
-            "login-key" : {
-              "required" : true,
-              "type" : "string",
-              "default" : "sdnc"
-            },
-            "login-account" : {
-              "required" : true,
-              "type" : "string",
-              "default" : "sdnc-tacacs"
-            },
-            "source" : {
-              "required" : true,
-              "type" : "string",
-              "default" : "npm"
-            },
-            "target-ip-address" : {
-              "required" : true,
-              "type" : "string"
-            },
-            "port-number" : {
-              "required" : true,
-              "type" : "integer",
-              "default" : 830
-            },
-            "connection-time-out" : {
-              "required" : false,
-              "type" : "integer",
-              "default" : 30
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Vnf"
-    },
-    "source-rest" : {
-      "description" : "This is Rest Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : false,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON" ]
-          } ],
-          "default" : "JSON"
-        },
-        "url-path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "expression-type" : {
-          "required" : false,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON_PATH", "JSON_POINTER" ]
-          } ],
-          "default" : "JSON_PATH"
-        },
-        "input-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "output-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "component-netconf-executor" : {
-      "description" : "This is Netconf Transaction Configuration Component API",
-      "version" : "1.0.0",
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "requirements" : {
-        "netconf-connection" : {
-          "capability" : "netconf",
-          "node" : "vnf-netconf-device",
-          "relationship" : "tosca.relationships.ConnectsTo"
-        }
-      },
-      "interfaces" : {
-        "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "request-id" : {
-                  "description" : "Request Id used to store the generated configuration, in the database along with the template-name",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "template-name" : {
-                  "description" : "Service Template Name",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "template-version" : {
-                  "description" : "Service Template Version",
-                  "required" : true,
-                  "type" : "string"
-                },
-                "action-name" : {
-                  "description" : "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "resource-type" : {
-                  "description" : "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "resource-id" : {
-                  "description" : "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "reservation-id" : {
-                  "description" : "Reservation Id used to send to NPM",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "execution-script" : {
-                  "description" : "Python Script to Execute for this Component action, It should refer any one of Prython Artifact Definition for this Node Template.",
-                  "required" : true,
-                  "type" : "string"
-                }
-              },
-              "outputs" : {
-                "response-data" : {
-                  "description" : "Execution Response Data in JSON format.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "status" : {
-                  "description" : "Status of the Component Execution ( success or failure )",
-                  "required" : true,
-                  "type" : "string"
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Component"
-    }
-  },
-  "topology_template" : {
-    "inputs" : {
-      "request-id" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "service-instance-id" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "scope-type" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "action-name" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "hostname" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "resource-assignment-request" : {
-        "description" : "This is Dynamic Data type for the receipe resource-assignment-action.",
-        "required" : false,
-        "type" : "dt-resource-assignment-request"
-      }
-    },
-    "node_templates" : {
-      "vpe-netconf-device" : {
-        "type" : "vnf-netconf-device",
-        "capabilities" : {
-          "netconf" : {
-            "properties" : {
-              "login-key" : "sdnc",
-              "login-account" : "sndc-local",
-              "source" : "local",
-              "target-ip-address" : {
-                "get_attribute" : [ "SELF", "lo0-local-ipv4-address" ]
-              },
-              "port-number" : 22,
-              "connection-time-out" : 30
-            }
-          }
-        }
-      },
-      "activate-netconf-component" : {
-        "type" : "component-netconf-executor",
-        "capabilities" : {
-          "component-node" : { }
-        },
-        "requirements" : {
-          "netconf-connection" : {
-            "capability" : "netconf",
-            "node" : "vpe-netconf-device",
-            "relationship" : "tosca.relationships.ConnectsTo"
-          }
-        },
-        "interfaces" : {
-          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode" : {
-            "operations" : {
-              "process" : {
-                "implementation" : {
-                  "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py"
-                },
-                "inputs" : {
-                  "action-name" : {
-                    "get_input" : "action-name"
-                  },
-                  "template-name" : {
-                    "get_input" : "template_name"
-                  },
-                  "template-version" : {
-                    "get_input" : "template_version"
-                  },
-                  "resource-type" : "vnf-type",
-                  "request-id" : {
-                    "get_input" : "request-id"
-                  },
-                  "resource-id" : {
-                    "get_input" : "hostname"
-                  },
-                  "execution-script" : "execution-script"
-                },
-                "outputs" : {
-                  "response-data" : {
-                    "get_attribute" : [ "SELF", "netconf-executor-baseconfig.response-data" ]
-                  },
-                  "status" : {
-                    "get_attribute" : [ "SELF", "netconf-executor-baseconfig.status" ]
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "resource-assignment-ra-component" : {
-        "type" : "component-resource-assignment",
-        "capabilities" : {
-          "component-node" : { }
-        },
-        "interfaces" : {
-          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "template-names" : [ "base-config-template", "licence-template" ],
-                  "action-name" : {
-                    "get_input" : "action-name"
-                  },
-                  "template-name" : {
-                    "get_input" : "template_name"
-                  },
-                  "template-version" : {
-                    "get_input" : "template-version"
-                  },
-                  "resource-type" : "vnf-type",
-                  "request-id" : {
-                    "get_input" : "request-id"
-                  },
-                  "resource-id" : {
-                    "get_input" : "hostname"
-                  }
-                },
-                "outputs" : {
-                  "resource-assignment-params" : "success",
-                  "status" : "status"
-                }
-              }
-            }
-          }
-        }
-      },
-      "resource-assignment-action" : {
-        "type" : "dg-resource-assignment",
-        "properties" : {
-          "mode" : "sync",
-          "version" : "LATEST",
-          "is-start-flow" : false
-        },
-        "capabilities" : {
-          "dg-node" : { }
-        },
-        "requirements" : {
-          "component-dependency" : {
-            "capability" : "component-node",
-            "node" : "resource-assignment-ra-component",
-            "relationship" : "tosca.relationships.DependsOn"
-          }
-        },
-        "interfaces" : {
-          "CONFIG" : {
-            "operations" : {
-              "ResourceAssignment" : {
-                "inputs" : {
-                  "params" : [ ]
-                }
-              }
-            }
-          }
-        }
-      },
-      "activate-action" : {
-        "type" : "dg-activate-netconf",
-        "properties" : {
-          "mode" : "sync",
-          "version" : "LATEST",
-          "is-start-flow" : false
-        },
-        "capabilities" : {
-          "dg-node" : { }
-        },
-        "requirements" : {
-          "component-dependency" : {
-            "capability" : "component-node",
-            "node" : "activate-netconf-component",
-            "relationship" : "tosca.relationships.DependsOn"
-          }
-        },
-        "interfaces" : {
-          "CONFIG" : {
-            "operations" : {
-              "ActivateNetconf" : {
-                "inputs" : {
-                  "params" : [ ]
-                }
-              }
-            }
-          }
-        }
-      },
-      "base-config-template" : {
-        "type" : "artifact-config-template",
-        "properties" : {
-          "action-names" : [ "resource-assignment-action" ]
-        },
-        "capabilities" : {
-          "content" : {
-            "properties" : {
-              "content" : "db://base-config-template"
-            }
-          },
-          "mapping" : {
-            "properties" : {
-              "mapping" : [ {
-                "name" : "rs-db-source",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "input-param" : false,
-                "dictionary-name" : "sample-db-source",
-                "dictionary-source" : "db",
-                "dependencies" : [ "hostname" ],
-                "version" : 0
-              }, {
-                "name" : "mdsal-source",
-                "property" : {
-                  "description" : "",
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "dt-v4-aggregate"
-                  }
-                },
-                "input-param" : false,
-                "dictionary-name" : "sample-mdsal-source",
-                "dictionary-source" : "mdsal",
-                "dependencies" : [ "service-instance-id" ],
-                "version" : 0
-              }, {
-                "name" : "hostname",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "hostname",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              }, {
-                "name" : "service",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "service",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              }, {
-                "name" : "service-instance-id",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "service-instance-id",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              } ]
-            }
-          }
-        }
-      },
-      "licence-template" : {
-        "type" : "artifact-config-template",
-        "properties" : {
-          "action-names" : [ "resource-assignment-action" ]
-        },
-        "capabilities" : {
-          "content" : {
-            "properties" : {
-              "content" : "db://licence-template"
-            }
-          },
-          "mapping" : {
-            "properties" : {
-              "mapping" : [ {
-                "name" : "licenses",
-                "property" : {
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "dt-license-key"
-                  }
-                },
-                "input-param" : false,
-                "dictionary-name" : "sample-licenses",
-                "dictionary-source" : "mdsal",
-                "dependencies" : [ "service-instance-id" ],
-                "version" : 0
-              }, {
-                "name" : "service-instance-id",
-                "property" : {
-                  "required" : true,
-                  "type" : "string"
-                },
-                "dictionary-name" : "service-instance-id",
-                "dictionary-source" : "input",
-                "version" : 0,
-                "input-param" : false
-              } ]
-            }
-          }
-        }
-      }
-    }
-  }
+{
+  "metadata" : {
+    "template_author" : "Brinda Santh",
+    "template_name" : "enhance-template",
+    "template_version" : "1.0.0",
+    "template_tags" : "brinda, VPE",
+    "service-type" : "Sample Service",
+    "release" : "1806",
+    "vnf-type" : "VPE"
+  },
+  "tosca_definitions_version" : "controller_blueprint_1_0_0",
+  "artifact_types" : { },
+  "data_types" : {
+    "dt-v4-aggregate" : {
+      "description" : "This is dt-v4-aggregate Data Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "ipv4-address" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "ipv4-plen" : {
+          "required" : false,
+          "type" : "integer"
+        }
+      },
+      "derived_from" : "tosca.datatypes.Root"
+    },
+    "dt-license-key" : {
+      "description" : "This is dt-plicense-key Data Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "license-key" : {
+          "required" : true,
+          "type" : "string"
+        }
+      },
+      "derived_from" : "tosca.datatypes.Root"
+    },
+    "datatype-resource-assignment" : {
+      "description" : "This is Resource Assignment Data Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "property" : {
+          "required" : true,
+          "type" : "datatype-property"
+        },
+        "input-param" : {
+          "required" : true,
+          "type" : "boolean"
+        },
+        "dictionary-name" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "dictionary-source" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "dependencies" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "status" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "message" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "updated-date" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "updated-by" : {
+          "required" : false,
+          "type" : "string"
+        }
+      },
+      "derived_from" : "tosca.datatypes.Root"
+    },
+    "datatype-property" : {
+      "description" : "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",
+      "version" : "1.0.0",
+      "properties" : {
+        "type" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "description" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "required" : {
+          "required" : false,
+          "type" : "boolean"
+        },
+        "default" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "entry_schema" : {
+          "required" : false,
+          "type" : "string"
+        }
+      },
+      "derived_from" : "tosca.datatypes.Root"
+    },
+    "dt-resource-assignment-request" : {
+      "description" : "This is Dynamic Data type definition generated from resource mapping for the config template name base-config-template.",
+      "version" : "1.0.0",
+      "properties" : {
+        "hostname" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "licenses" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "dt-license-key"
+          }
+        },
+        "rs-db-source" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "service" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "service-instance-id" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "mdsal-source" : {
+          "description" : "",
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "dt-v4-aggregate"
+          }
+        }
+      },
+      "derived_from" : "tosca.datatypes.Dynamic"
+    }
+  },
+  "node_types" : {
+    "dg-resource-assignment" : {
+      "description" : "This is Resource Assignment Directed Graph",
+      "version" : "1.0.0",
+      "properties" : {
+        "mode" : {
+          "required" : false,
+          "type" : "string",
+          "default" : "sync"
+        },
+        "version" : {
+          "required" : false,
+          "type" : "string",
+          "default" : "LATEST"
+        },
+        "is-start-flow" : {
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }
+      },
+      "capabilities" : {
+        "dg-node" : {
+          "type" : "tosca.capabilities.Node"
+        }
+      },
+      "requirements" : {
+        "component-dependency" : {
+          "capability" : "component-node",
+          "node" : "component-resource-assignment",
+          "relationship" : "tosca.relationships.DependsOn"
+        }
+      },
+      "interfaces" : {
+        "CONFIG" : {
+          "operations" : {
+            "ResourceAssignment" : {
+              "inputs" : {
+                "params" : {
+                  "required" : false,
+                  "type" : "list",
+                  "entry_schema" : {
+                    "type" : "datatype-property"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.DG"
+    },
+    "tosca.nodes.Component" : {
+      "description" : "This is default Component Node",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
+    "artifact-config-template" : {
+      "description" : "This is Configuration Velocity Template",
+      "version" : "1.0.0",
+      "properties" : {
+        "action-names" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        }
+      },
+      "capabilities" : {
+        "content" : {
+          "type" : "tosca.capabilities.Content",
+          "properties" : {
+            "content" : {
+              "required" : true,
+              "type" : "string"
+            }
+          }
+        },
+        "mapping" : {
+          "type" : "tosca.capabilities.Mapping",
+          "properties" : {
+            "mapping" : {
+              "required" : false,
+              "type" : "list",
+              "entry_schema" : {
+                "type" : "datatype-resource-assignment"
+              }
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.Artifact"
+    },
+    "tosca.nodes.Vnf" : {
+      "description" : "This is VNF Node Type",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
+    "tosca.nodes.Artifact" : {
+      "description" : "This is Deprecated Artifact Node Type.",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
+    "dg-activate-netconf" : {
+      "description" : "This is Download Netconf Directed Graph",
+      "version" : "1.0.0",
+      "properties" : {
+        "mode" : {
+          "required" : false,
+          "type" : "string",
+          "default" : "sync"
+        },
+        "version" : {
+          "required" : false,
+          "type" : "string",
+          "default" : "LATEST"
+        },
+        "is-start-flow" : {
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }
+      },
+      "capabilities" : {
+        "dg-node" : {
+          "type" : "tosca.capabilities.Node"
+        }
+      },
+      "requirements" : {
+        "component-dependency" : {
+          "capability" : "component-node",
+          "node" : "component-netconf-executor",
+          "relationship" : "tosca.relationships.DependsOn"
+        }
+      },
+      "interfaces" : {
+        "CONFIG" : {
+          "operations" : {
+            "ActivateNetconf" : {
+              "inputs" : {
+                "params" : {
+                  "required" : false,
+                  "type" : "list",
+                  "entry_schema" : {
+                    "type" : "datatype-property"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.DG"
+    },
+    "source-input" : {
+      "description" : "This is Input Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "key" : {
+          "required" : false,
+          "type" : "string"
+        },
+        "key-dependencies" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "tosca.nodes.ResourceSource" : {
+      "description" : "TOSCA base type for Resource Sources",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
+    "component-resource-assignment" : {
+      "description" : "This is Resource Assignment Component API",
+      "version" : "1.0.0",
+      "capabilities" : {
+        "component-node" : {
+          "type" : "tosca.capabilities.Node"
+        }
+      },
+      "interfaces" : {
+        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
+          "operations" : {
+            "process" : {
+              "inputs" : {
+                "template-name" : {
+                  "description" : "Service Template Name.",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "template-version" : {
+                  "description" : "Service Template Version.",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "resource-type" : {
+                  "description" : "Request type.",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "template-names" : {
+                  "description" : "Name of the artifact Node Templates, to get the template Content.",
+                  "required" : true,
+                  "type" : "list",
+                  "entry_schema" : {
+                    "type" : "string"
+                  }
+                },
+                "request-id" : {
+                  "description" : "Request Id, Unique Id for the request.",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "resource-id" : {
+                  "description" : "Resource Id.",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "action-name" : {
+                  "description" : "Action Name of the process",
+                  "required" : true,
+                  "type" : "string"
+                }
+              },
+              "outputs" : {
+                "resource-assignment-params" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "status" : {
+                  "required" : true,
+                  "type" : "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.Component"
+    },
+    "tosca.nodes.DG" : {
+      "description" : "This is Directed Graph Node Type",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
+    },
+    "source-db" : {
+      "description" : "This is Database Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "type" : {
+          "required" : true,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "SQL", "PLSQL" ]
+          } ]
+        },
+        "query" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "input-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "output-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "key-dependencies" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "vnf-netconf-device" : {
+      "description" : "This is VNF Device with Netconf  Capability",
+      "version" : "1.0.0",
+      "capabilities" : {
+        "netconf" : {
+          "type" : "tosca.capabilities.Netconf",
+          "properties" : {
+            "login-key" : {
+              "required" : true,
+              "type" : "string",
+              "default" : "sdnc"
+            },
+            "login-account" : {
+              "required" : true,
+              "type" : "string",
+              "default" : "sdnc-tacacs"
+            },
+            "source" : {
+              "required" : true,
+              "type" : "string",
+              "default" : "npm"
+            },
+            "target-ip-address" : {
+              "required" : true,
+              "type" : "string"
+            },
+            "port-number" : {
+              "required" : true,
+              "type" : "integer",
+              "default" : 830
+            },
+            "connection-time-out" : {
+              "required" : false,
+              "type" : "integer",
+              "default" : 30
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.Vnf"
+    },
+    "source-rest" : {
+      "description" : "This is Rest Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : {
+        "type" : {
+          "required" : false,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "JSON" ]
+          } ],
+          "default" : "JSON"
+        },
+        "url-path" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "path" : {
+          "required" : true,
+          "type" : "string"
+        },
+        "expression-type" : {
+          "required" : false,
+          "type" : "string",
+          "constraints" : [ {
+            "valid_values" : [ "JSON_PATH", "JSON_POINTER" ]
+          } ],
+          "default" : "JSON_PATH"
+        },
+        "input-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "output-key-mapping" : {
+          "required" : false,
+          "type" : "map",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        },
+        "key-dependencies" : {
+          "required" : true,
+          "type" : "list",
+          "entry_schema" : {
+            "type" : "string"
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "component-netconf-executor" : {
+      "description" : "This is Netconf Transaction Configuration Component API",
+      "version" : "1.0.0",
+      "capabilities" : {
+        "component-node" : {
+          "type" : "tosca.capabilities.Node"
+        }
+      },
+      "requirements" : {
+        "netconf-connection" : {
+          "capability" : "netconf",
+          "node" : "vnf-netconf-device",
+          "relationship" : "tosca.relationships.ConnectsTo"
+        }
+      },
+      "interfaces" : {
+        "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode" : {
+          "operations" : {
+            "process" : {
+              "inputs" : {
+                "request-id" : {
+                  "description" : "Request Id used to store the generated configuration, in the database along with the template-name",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "template-name" : {
+                  "description" : "Service Template Name",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "template-version" : {
+                  "description" : "Service Template Version",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "action-name" : {
+                  "description" : "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "resource-type" : {
+                  "description" : "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "resource-id" : {
+                  "description" : "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "reservation-id" : {
+                  "description" : "Reservation Id used to send to NPM",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "execution-script" : {
+                  "description" : "Python Script to Execute for this Component action, It should refer any one of Prython Artifact Definition for this Node Template.",
+                  "required" : true,
+                  "type" : "string"
+                }
+              },
+              "outputs" : {
+                "response-data" : {
+                  "description" : "Execution Response Data in JSON format.",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "status" : {
+                  "description" : "Status of the Component Execution ( success or failure )",
+                  "required" : true,
+                  "type" : "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.Component"
+    }
+  },
+  "topology_template" : {
+    "inputs" : {
+      "request-id" : {
+        "required" : true,
+        "type" : "string"
+      },
+      "service-instance-id" : {
+        "required" : true,
+        "type" : "string"
+      },
+      "scope-type" : {
+        "required" : true,
+        "type" : "string"
+      },
+      "action-name" : {
+        "required" : true,
+        "type" : "string"
+      },
+      "hostname" : {
+        "required" : true,
+        "type" : "string"
+      },
+      "resource-assignment-request" : {
+        "description" : "This is Dynamic Data type for the receipe resource-assignment-action.",
+        "required" : false,
+        "type" : "dt-resource-assignment-request"
+      }
+    },
+    "node_templates" : {
+      "vpe-netconf-device" : {
+        "type" : "vnf-netconf-device",
+        "capabilities" : {
+          "netconf" : {
+            "properties" : {
+              "login-key" : "sdnc",
+              "login-account" : "sndc-local",
+              "source" : "local",
+              "target-ip-address" : {
+                "get_attribute" : [ "SELF", "lo0-local-ipv4-address" ]
+              },
+              "port-number" : 22,
+              "connection-time-out" : 30
+            }
+          }
+        }
+      },
+      "activate-netconf-component" : {
+        "type" : "component-netconf-executor",
+        "capabilities" : {
+          "component-node" : { }
+        },
+        "requirements" : {
+          "netconf-connection" : {
+            "capability" : "netconf",
+            "node" : "vpe-netconf-device",
+            "relationship" : "tosca.relationships.ConnectsTo"
+          }
+        },
+        "interfaces" : {
+          "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode" : {
+            "operations" : {
+              "process" : {
+                "implementation" : {
+                  "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py"
+                },
+                "inputs" : {
+                  "action-name" : {
+                    "get_input" : "action-name"
+                  },
+                  "template-name" : {
+                    "get_input" : "template_name"
+                  },
+                  "template-version" : {
+                    "get_input" : "template_version"
+                  },
+                  "resource-type" : "vnf-type",
+                  "request-id" : {
+                    "get_input" : "request-id"
+                  },
+                  "resource-id" : {
+                    "get_input" : "hostname"
+                  },
+                  "execution-script" : "execution-script"
+                },
+                "outputs" : {
+                  "response-data" : {
+                    "get_attribute" : [ "SELF", "netconf-executor-baseconfig.response-data" ]
+                  },
+                  "status" : {
+                    "get_attribute" : [ "SELF", "netconf-executor-baseconfig.status" ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "resource-assignment-ra-component" : {
+        "type" : "component-resource-assignment",
+        "capabilities" : {
+          "component-node" : { }
+        },
+        "interfaces" : {
+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "template-names" : [ "base-config-template", "licence-template" ],
+                  "action-name" : {
+                    "get_input" : "action-name"
+                  },
+                  "template-name" : {
+                    "get_input" : "template_name"
+                  },
+                  "template-version" : {
+                    "get_input" : "template-version"
+                  },
+                  "resource-type" : "vnf-type",
+                  "request-id" : {
+                    "get_input" : "request-id"
+                  },
+                  "resource-id" : {
+                    "get_input" : "hostname"
+                  }
+                },
+                "outputs" : {
+                  "resource-assignment-params" : "success",
+                  "status" : "status"
+                }
+              }
+            }
+          }
+        }
+      },
+      "resource-assignment-action" : {
+        "type" : "dg-resource-assignment",
+        "properties" : {
+          "mode" : "sync",
+          "version" : "LATEST",
+          "is-start-flow" : false
+        },
+        "capabilities" : {
+          "dg-node" : { }
+        },
+        "requirements" : {
+          "component-dependency" : {
+            "capability" : "component-node",
+            "node" : "resource-assignment-ra-component",
+            "relationship" : "tosca.relationships.DependsOn"
+          }
+        },
+        "interfaces" : {
+          "CONFIG" : {
+            "operations" : {
+              "ResourceAssignment" : {
+                "inputs" : {
+                  "params" : [ ]
+                }
+              }
+            }
+          }
+        }
+      },
+      "activate-action" : {
+        "type" : "dg-activate-netconf",
+        "properties" : {
+          "mode" : "sync",
+          "version" : "LATEST",
+          "is-start-flow" : false
+        },
+        "capabilities" : {
+          "dg-node" : { }
+        },
+        "requirements" : {
+          "component-dependency" : {
+            "capability" : "component-node",
+            "node" : "activate-netconf-component",
+            "relationship" : "tosca.relationships.DependsOn"
+          }
+        },
+        "interfaces" : {
+          "CONFIG" : {
+            "operations" : {
+              "ActivateNetconf" : {
+                "inputs" : {
+                  "params" : [ ]
+                }
+              }
+            }
+          }
+        }
+      },
+      "base-config-template" : {
+        "type" : "artifact-config-template",
+        "properties" : {
+          "action-names" : [ "resource-assignment-action" ]
+        },
+        "capabilities" : {
+          "content" : {
+            "properties" : {
+              "content" : "db://base-config-template"
+            }
+          },
+          "mapping" : {
+            "properties" : {
+              "mapping" : [ {
+                "name" : "rs-db-source",
+                "property" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "input-param" : false,
+                "dictionary-name" : "sample-db-source",
+                "dictionary-source" : "db",
+                "dependencies" : [ "hostname" ],
+                "version" : 0
+              }, {
+                "name" : "mdsal-source",
+                "property" : {
+                  "description" : "",
+                  "required" : true,
+                  "type" : "list",
+                  "entry_schema" : {
+                    "type" : "dt-v4-aggregate"
+                  }
+                },
+                "input-param" : false,
+                "dictionary-name" : "sample-mdsal-source",
+                "dictionary-source" : "mdsal",
+                "dependencies" : [ "service-instance-id" ],
+                "version" : 0
+              }, {
+                "name" : "hostname",
+                "property" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "dictionary-name" : "hostname",
+                "dictionary-source" : "input",
+                "version" : 0,
+                "input-param" : false
+              }, {
+                "name" : "service",
+                "property" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "dictionary-name" : "service",
+                "dictionary-source" : "input",
+                "version" : 0,
+                "input-param" : false
+              }, {
+                "name" : "service-instance-id",
+                "property" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "dictionary-name" : "service-instance-id",
+                "dictionary-source" : "input",
+                "version" : 0,
+                "input-param" : false
+              } ]
+            }
+          }
+        }
+      },
+      "licence-template" : {
+        "type" : "artifact-config-template",
+        "properties" : {
+          "action-names" : [ "resource-assignment-action" ]
+        },
+        "capabilities" : {
+          "content" : {
+            "properties" : {
+              "content" : "db://licence-template"
+            }
+          },
+          "mapping" : {
+            "properties" : {
+              "mapping" : [ {
+                "name" : "licenses",
+                "property" : {
+                  "required" : true,
+                  "type" : "list",
+                  "entry_schema" : {
+                    "type" : "dt-license-key"
+                  }
+                },
+                "input-param" : false,
+                "dictionary-name" : "sample-licenses",
+                "dictionary-source" : "mdsal",
+                "dependencies" : [ "service-instance-id" ],
+                "version" : 0
+              }, {
+                "name" : "service-instance-id",
+                "property" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "dictionary-name" : "service-instance-id",
+                "dictionary-source" : "input",
+                "version" : 0,
+                "input-param" : false
+              } ]
+            }
+          }
+        }
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml
index 86dfdf6..659839c 100644
--- a/ms/controllerblueprints/parent/pom.xml
+++ b/ms/controllerblueprints/parent/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>controllerblueprints</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.ccsdk.apps.controllerblueprints</groupId>
     <artifactId>parent</artifactId>
diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml
index 5c190db..d8acbf2 100644
--- a/ms/controllerblueprints/pom.xml
+++ b/ms/controllerblueprints/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.onap.ccsdk.apps</groupId>
         <artifactId>ccsdk-apps-ms</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.3.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>controllerblueprints</artifactId>
     <name>Controller Blueprints Root</name>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <properties>
         <service.name>ControllerBlueprints</service.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index 780bb07..b31cef0 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-ms-neng</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
 
     <properties>
         <swagger.directory>${basedir}/target/classes/META-INF/resources/swagger</swagger.directory>
@@ -52,7 +52,6 @@
         <sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
         <sonar.language>java</sonar.language>
         <serviceArtifactName>ms-networkelementnamegen</serviceArtifactName>
-        <project.version>0.3.0</project.version>
         <ccsdk.distribution.version>0.2.4</ccsdk.distribution.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.push.phase>deploy</docker.push.phase>
@@ -189,7 +188,7 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.26.1</version>
+                        <version>0.16.5</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -242,7 +241,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/GetConfigRequestTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/GetConfigRequestTest.java
new file mode 100644
index 0000000..20d234a
--- /dev/null
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/GetConfigRequestTest.java
@@ -0,0 +1,60 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.apps.ms.neng.core.resource.model;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class GetConfigRequestTest {
+    private GetConfigRequest getConfigRequest;
+
+    @Before
+    public void setup() {
+        getConfigRequest = new GetConfigRequest();
+    }
+
+    @Test
+    public void TestGetSetConfigName() {
+        getConfigRequest.setConfigName("configName");
+        Assert.assertEquals("configName", getConfigRequest.getConfigName());
+    }
+
+    @Test
+    public void TestGetSetEcompName() {
+        getConfigRequest.setEcompName("ecompName");
+        Assert.assertEquals("ecompName", getConfigRequest.getEcompName());
+    }
+
+    @Test
+    public void TestGetSetPolicyName() {
+        getConfigRequest.setPolicyName("policy");
+        Assert.assertEquals("policy", getConfigRequest.getPolicyName());
+    }
+
+    @Test
+    public void TestIsUniqueFunction() {
+        getConfigRequest.setUnique(true);
+        Assert.assertTrue(getConfigRequest.isUnique());
+    }
+}
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/GetConfigResponseTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/GetConfigResponseTest.java
new file mode 100644
index 0000000..a833834
--- /dev/null
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/GetConfigResponseTest.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.apps.ms.neng.core.resource.model;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class GetConfigResponseTest {
+    private GetConfigResponse getConfigResponse;
+
+    @Before
+    public void setup() {
+        getConfigResponse = new GetConfigResponse();
+    }
+
+    @Test
+    public void TestGetSetConfigName() {
+        String obj = new String();
+        getConfigResponse.setResponse(obj);
+        Assert.assertEquals(obj, getConfigResponse.getResponse());
+    }
+}
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/HelloWorldTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/HelloWorldTest.java
new file mode 100644
index 0000000..b09d6d6
--- /dev/null
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/HelloWorldTest.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 IBM.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.apps.ms.neng.core.resource.model;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class HelloWorldTest {
+    private HelloWorld helloWorld;
+
+    @Test
+    public void TestGetSetMessage() {
+        helloWorld = new HelloWorld();
+        helloWorld.setMessage("new Message");
+        Assert.assertEquals("new Message", helloWorld.getMessage());
+    }
+
+    @Test
+    public void TestToString() {
+        helloWorld = new HelloWorld("new Message");
+        Assert.assertEquals("message = new Message", helloWorld.toString());
+    }
+}
diff --git a/ms/pom.xml b/ms/pom.xml
index b746f24..3d1040b 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.apps</groupId>
     <artifactId>ccsdk-apps-ms</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-apps-ms</name>
diff --git a/ms/vlantag-api/.checkstyle b/ms/vlantag-api/.checkstyle
deleted file mode 100644
index e1faa43..0000000
--- a/ms/vlantag-api/.checkstyle
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false"/>
diff --git a/ms/vlantag-api/pom.xml b/ms/vlantag-api/pom.xml
index 08466dc..79b6e9a 100644
--- a/ms/vlantag-api/pom.xml
+++ b/ms/vlantag-api/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.onap.ccsdk.apps.ms.vlantagapi</groupId>
 	<artifactId>vlantag-api</artifactId>
-	<version>0.3.0-SNAPSHOT</version>
+	<version>0.3.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>vlantag-api</name>
@@ -18,7 +18,7 @@
 		<java.version>1.8</java.version>
 		<springboot.version>2.0.4.RELEASE</springboot.version>
 		<mariadb.connector.version>2.1.1</mariadb.connector.version>
-		<ccsdk.sli.adaptors.version>0.3.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+		<ccsdk.sli.adaptors.version>0.3.1-SNAPSHOT</ccsdk.sli.adaptors.version>
 		<docker.registry>TBD:5100</docker.registry>
 		<serviceArtifactName>vlantagapi</serviceArtifactName>
 
@@ -42,7 +42,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index ebe1de9..a21bfcd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.apps</groupId>
 	<artifactId>ccsdk-apps</artifactId>
-	<version>0.3.0-SNAPSHOT</version>
+	<version>0.3.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-apps</name>
diff --git a/version.properties b/version.properties
index 4c1c6c6..407a30c 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
 
 release_name=0
 sprint_number=3
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}