diff --git a/docs/index.rst b/docs/index.rst
index 677c32b..03859a9 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -116,11 +116,6 @@
         "spring.datasource.cldsdb.username": "admin",
         "spring.datasource.cldsdb.password": "password",
 
-        "clamp.config.sdc.catalog.url": "https://sdchost:8443/sdc/v1/catalog/",
-        "clamp.config.sdc.hostUrl": "https://sdchost:8443/",
-        "clamp.config.sdc.serviceUrl": "https://sdchost:8443/sdc/v1/catalog/services",
-        "clamp.config.sdc.serviceUsername": "clamp",
-        "clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
         "clamp.config.dcae.inventory.url": "http://dcaegen2.host:8080",
         "clamp.config.dcae.dispatcher.url": "http://dcaegen2.host:8188",
         "clamp.config.policy.pdpUrl1": "https://policy-pdp.host:9091/pdp/ , testpdp, alpha123",
diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index 819d091..85fe2f7 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -1,7 +1,7 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "3.0.3-SNAPSHOT",
+    "version" : "4.0.0-SNAPSHOT",
     "title" : "Clamp Rest API"
   },
   "host" : "0.0.0.0",
@@ -10,7 +10,7 @@
   "paths" : {
     "/clds/action/{action}/{modelName}?test={test}" : {
       "put" : {
-        "operationId" : "route10",
+        "operationId" : "route66",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -34,13 +34,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route10"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route66"
       }
     },
     "/clds/cldsDetails" : {
       "get" : {
-        "operationId" : "route2",
+        "operationId" : "route58",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -53,13 +53,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route2"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route58"
       }
     },
     "/clds/cldsInfo" : {
       "get" : {
-        "operationId" : "route3",
+        "operationId" : "route59",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -72,13 +72,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route3"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route59"
       }
     },
     "/clds/dcae/event?test={test}" : {
       "post" : {
-        "operationId" : "route11",
+        "operationId" : "route67",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -92,13 +92,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route11"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route67"
       }
     },
     "/clds/deploy/{modelName}" : {
       "put" : {
-        "operationId" : "route15",
+        "operationId" : "route69",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -117,13 +117,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route15"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route69"
       }
     },
     "/clds/model-names" : {
       "get" : {
-        "operationId" : "route9",
+        "operationId" : "route65",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -136,13 +136,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route9"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route65"
       }
     },
     "/clds/model/{modelName}" : {
       "get" : {
-        "operationId" : "route7",
+        "operationId" : "route63",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "modelName",
@@ -161,11 +161,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route7"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route63"
       },
       "put" : {
-        "operationId" : "route8",
+        "operationId" : "route64",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -192,13 +192,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route8"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route64"
       }
     },
     "/clds/model/bpmn/{modelName}" : {
       "get" : {
-        "operationId" : "route5",
+        "operationId" : "route61",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "modelName",
@@ -209,13 +209,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route5"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route61"
       }
     },
     "/clds/model/image/{modelName}" : {
       "get" : {
-        "operationId" : "route6",
+        "operationId" : "route62",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "modelName",
@@ -226,52 +226,24 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route6"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route62"
       }
     },
     "/clds/properties" : {
       "get" : {
-        "operationId" : "route13",
+        "operationId" : "route68",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route13"
-      }
-    },
-    "/clds/properties/{serviceInvariantUUID}?refresh={refresh}" : {
-      "get" : {
-        "operationId" : "route14",
-        "produces" : [ "application/json" ],
-        "parameters" : [ {
-          "name" : "serviceInvariantUUID}?refresh={refresh",
-          "in" : "path",
-          "required" : true,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : { }
-        },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route14"
-      }
-    },
-    "/clds/sdc/services" : {
-      "get" : {
-        "operationId" : "route12",
-        "produces" : [ "application/json" ],
-        "responses" : {
-          "200" : { }
-        },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route12"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route68"
       }
     },
     "/clds/undeploy/{modelName}" : {
       "put" : {
-        "operationId" : "route16",
+        "operationId" : "route70",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -290,13 +262,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route16"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route70"
       }
     },
     "/cldsTempate/template-names" : {
       "get" : {
-        "operationId" : "route21",
+        "operationId" : "route75",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -309,13 +281,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route21"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route75"
       }
     },
     "/cldsTempate/template/{templateName}" : {
       "get" : {
-        "operationId" : "route19",
+        "operationId" : "route73",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -334,11 +306,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route19"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route73"
       },
       "put" : {
-        "operationId" : "route20",
+        "operationId" : "route74",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -365,13 +337,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route20"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route74"
       }
     },
     "/cldsTempate/template/bpmn/{templateName}" : {
       "get" : {
-        "operationId" : "route17",
+        "operationId" : "route71",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -382,13 +354,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route17"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route71"
       }
     },
     "/cldsTempate/template/image/{templateName}" : {
       "get" : {
-        "operationId" : "route18",
+        "operationId" : "route72",
         "produces" : [ "text/xml" ],
         "parameters" : [ {
           "name" : "templateName",
@@ -399,13 +371,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route18"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route72"
       }
     },
     "/dictionary" : {
       "get" : {
-        "operationId" : "route27",
+        "operationId" : "route81",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -418,13 +390,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route27"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route81"
       }
     },
     "/dictionary/{dictionaryName}" : {
       "put" : {
-        "operationId" : "route26",
+        "operationId" : "route80",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -451,13 +423,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route26"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route80"
       }
     },
     "/dictionary/{dictionaryName}/items" : {
       "get" : {
-        "operationId" : "route29",
+        "operationId" : "route83",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "dictionaryName",
@@ -476,11 +448,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route29"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route83"
       },
       "put" : {
-        "operationId" : "route28",
+        "operationId" : "route82",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -507,24 +479,24 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route28"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route82"
       }
     },
     "/healthcheck" : {
       "get" : {
-        "operationId" : "route4",
+        "operationId" : "route60",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route4"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route60"
       }
     },
     "/tosca/models" : {
       "get" : {
-        "operationId" : "route24",
+        "operationId" : "route78",
         "produces" : [ "application/json" ],
         "responses" : {
           "200" : {
@@ -537,13 +509,13 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route24"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route78"
       }
     },
     "/tosca/models/{toscaModelName}" : {
       "get" : {
-        "operationId" : "route25",
+        "operationId" : "route79",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "toscaModelName",
@@ -562,11 +534,11 @@
             }
           }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route25"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route79"
       },
       "put" : {
-        "operationId" : "route22",
+        "operationId" : "route76",
         "consumes" : [ "application/json" ],
         "produces" : [ "application/json" ],
         "parameters" : [ {
@@ -585,13 +557,13 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route22"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route76"
       }
     },
     "/tosca/models/policyType/{policyType}" : {
       "get" : {
-        "operationId" : "route23",
+        "operationId" : "route77",
         "produces" : [ "application/json" ],
         "parameters" : [ {
           "name" : "policyType",
@@ -602,19 +574,19 @@
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route23"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route77"
       }
     },
     "/user/getUser" : {
       "get" : {
-        "operationId" : "route30",
+        "operationId" : "route84",
         "produces" : [ "text/plain" ],
         "responses" : {
           "200" : { }
         },
-        "x-camelContextId" : "camel-1",
-        "x-routeId" : "route30"
+        "x-camelContextId" : "camel-3",
+        "x-routeId" : "route84"
       }
     }
   },
@@ -737,6 +709,9 @@
         "closeloopName" : {
           "type" : "string"
         },
+        "modelId" : {
+          "type" : "string"
+        },
         "modelName" : {
           "type" : "string"
         },
diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf
index b5f3ad0..e201bc8 100644
--- a/docs/swagger/swagger.pdf
+++ b/docs/swagger/swagger.pdf
Binary files differ