diff --git a/src/main/java/org/onap/clamp/clds/ClampServlet.java b/src/main/java/org/onap/clamp/clds/ClampServlet.java
index 5293134..516325c 100644
--- a/src/main/java/org/onap/clamp/clds/ClampServlet.java
+++ b/src/main/java/org/onap/clamp/clds/ClampServlet.java
@@ -36,6 +36,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
+import org.onap.aaf.cadi.principal.X509Principal;
 import org.onap.clamp.clds.service.SecureServicePermission;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpStatus;
@@ -61,6 +62,33 @@
     public static final String PERM_VF = "clamp.config.security.permission.type.filter.vf";
     public static final String PERM_MANAGE = "clamp.config.security.permission.type.cl.manage";
     public static final String PERM_TOSCA = "clamp.config.security.permission.type.tosca";
+    private static List<SecureServicePermission> permissionList;
+
+    private synchronized List<SecureServicePermission> getPermissionList() {
+        if (permissionList == null) {
+            permissionList=new ArrayList<>();
+            ApplicationContext applicationContext = WebApplicationContextUtils
+                .getWebApplicationContext(getServletContext());
+            String cldsPermissionInstance = applicationContext.getEnvironment().getProperty(PERM_INSTANCE);
+            permissionList.add(SecureServicePermission.create(applicationContext.getEnvironment().getProperty(PERM_CL),
+                cldsPermissionInstance, "read"));
+            permissionList.add(SecureServicePermission.create(applicationContext.getEnvironment().getProperty(PERM_CL),
+                cldsPermissionInstance, "update"));
+            permissionList.add(SecureServicePermission.create(
+                applicationContext.getEnvironment().getProperty(PERM_TEMPLATE), cldsPermissionInstance, "read"));
+            permissionList.add(SecureServicePermission.create(
+                applicationContext.getEnvironment().getProperty(PERM_TEMPLATE), cldsPermissionInstance, "update"));
+            permissionList.add(SecureServicePermission.create(applicationContext.getEnvironment().getProperty(PERM_VF),
+                cldsPermissionInstance, "*"));
+            permissionList.add(SecureServicePermission
+                .create(applicationContext.getEnvironment().getProperty(PERM_MANAGE), cldsPermissionInstance, "*"));
+            permissionList.add(SecureServicePermission
+                .create(applicationContext.getEnvironment().getProperty(PERM_TOSCA), cldsPermissionInstance, "read"));
+            permissionList.add(SecureServicePermission
+                .create(applicationContext.getEnvironment().getProperty(PERM_TOSCA), cldsPermissionInstance, "update"));
+        }
+        return permissionList;
+    }
 
     /**
      * When AAF is enabled, request object will contain a cadi Wrapper, so queries
@@ -69,43 +97,18 @@
     @Override
     protected void doService(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
-        List<SecureServicePermission> permissionList = new ArrayList<>();
 
-        ApplicationContext applicationContext = WebApplicationContextUtils
-            .getWebApplicationContext(this.getServletContext());
-
-        String cldsPersmissionTypeCl = applicationContext.getEnvironment().getProperty(PERM_CL);
-        String cldsPermissionTypeTemplate = applicationContext.getEnvironment().getProperty(PERM_TEMPLATE);
-        String cldsPermissionInstance = applicationContext.getEnvironment().getProperty(PERM_INSTANCE);
-        String cldsPermissionTypeFilterVf = applicationContext.getEnvironment().getProperty(PERM_VF);
-        String cldsPermissionTypeClManage = applicationContext.getEnvironment().getProperty(PERM_MANAGE);
-        String cldsPermissionTypeTosca = applicationContext.getEnvironment().getProperty(PERM_TOSCA);
-
-        // set the stragety to Mode_Global, so that all thread is able to
-        // see the authentication
-        SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_GLOBAL);
         Principal p = request.getUserPrincipal();
-        if (null != p) {
-            permissionList.add(SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "read"));
-            permissionList.add(SecureServicePermission.create(cldsPersmissionTypeCl, cldsPermissionInstance, "update"));
-            permissionList
-            .add(SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance, "read"));
-            permissionList
-            .add(SecureServicePermission.create(cldsPermissionTypeTemplate, cldsPermissionInstance, "update"));
-            permissionList.add(SecureServicePermission.create(cldsPermissionTypeFilterVf, cldsPermissionInstance, "*"));
-            permissionList.add(SecureServicePermission.create(cldsPermissionTypeClManage, cldsPermissionInstance, "*"));
-            permissionList.add(SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance, "read"));
-            permissionList
-            .add(SecureServicePermission.create(cldsPermissionTypeTosca, cldsPermissionInstance, "update"));
-
+        if (p instanceof X509Principal) {
+            // When AAF is enabled, there is a need to provision the permissions to Spring
+            // system
             List<GrantedAuthority> grantedAuths = new ArrayList<>();
-            for (SecureServicePermission perm : permissionList) {
+            for (SecureServicePermission perm : getPermissionList()) {
                 String permString = perm.toString();
                 if (request.isUserInRole(permString)) {
                     grantedAuths.add(new SimpleGrantedAuthority(permString));
                 }
             }
-
             Authentication auth = new UsernamePasswordAuthenticationToken(new User(p.getName(), "", grantedAuths), "",
                 grantedAuths);
             SecurityContextHolder.getContext().setAuthentication(auth);
diff --git a/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java b/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java
index 13dccda..8bc6f69 100644
--- a/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java
+++ b/src/main/java/org/onap/clamp/clds/config/AAFConfiguration.java
@@ -29,7 +29,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Component;
 
 @Configuration
 @Profile("clamp-aaf-authentication")
@@ -54,7 +53,11 @@
     public FilterRegistrationBean cadiFilterRegistration() {
         FilterRegistrationBean registration = new FilterRegistrationBean();
         registration.setFilter(cadiFilter());
-        registration.addUrlPatterns("/restservices/*");
+        registration.addUrlPatterns("/restservices/clds/v1/clds/*");
+        registration.addUrlPatterns("/restservices/clds/v1/cldsTempate/*");
+        registration.addUrlPatterns("/restservices/clds/v1/tosca/*");
+        registration.addUrlPatterns("/restservices/clds/v1/dictionary/*");
+        registration.addUrlPatterns("/restservices/clds/v1/user/*");
         //registration.addUrlPatterns("*");
         registration.setName("cadiFilter");
         registration.setOrder(0);
diff --git a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
index cdb2e29..759edb1 100644
--- a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
+++ b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * 
+ *
  */
 
 package org.onap.clamp.clds.util;
@@ -31,21 +31,21 @@
 import java.net.UnknownHostException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.UUID;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import javax.validation.constraints.NotNull;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.UUID;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
+
+import org.onap.clamp.clds.service.DefaultUserNameHandler;
 import org.slf4j.MDC;
 import org.slf4j.event.Level;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import org.onap.clamp.clds.service.DefaultUserNameHandler;
-
 /**
  * This class handles the special info that appear in the log, like RequestID,
  * time context, ...
@@ -66,7 +66,7 @@
      * Constructor
      */
     public LoggingUtils(final EELFLogger loggerP) {
-    	this.mLogger = checkNotNull(loggerP);
+        this.mLogger = checkNotNull(loggerP);
     }
 
     /**
@@ -86,7 +86,7 @@
             MDC.put("ServerIPAddress", InetAddress.getLocalHost().getHostAddress());
         } catch (UnknownHostException e) {
             logger.error("Failed to initiate setRequestContext", e);
-		}
+        }
     }
 
     /**
@@ -149,7 +149,7 @@
      * @return A string with the request ID
      */
     public static String getRequestId() {
-        String requestId = (String) MDC.get(ONAPLogConstants.MDCs.REQUEST_ID);
+        String requestId = MDC.get(ONAPLogConstants.MDCs.REQUEST_ID);
         if (requestId == null || requestId.isEmpty()) {
             requestId = UUID.randomUUID().toString();
             MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestId);
@@ -162,9 +162,9 @@
         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
         return dateFormat;
     }
-    
-    
-    
+
+
+
     /*********************************************************************************************
      * Method for ONAP Application Logging Specification v1.2
      ********************************************************************************************/
@@ -181,7 +181,7 @@
         final String requestID = defaultToUUID(request.getHeader(ONAPLogConstants.Headers.REQUEST_ID));
         final String invocationID = defaultToUUID(request.getHeader(ONAPLogConstants.Headers.INVOCATION_ID));
         final String partnerName = defaultToEmpty(request.getHeader(ONAPLogConstants.Headers.PARTNER_NAME));
-        
+
         // Default the partner name to the user name used to login to clamp
         if (partnerName.equalsIgnoreCase(EMPTY_MESSAGE)) {
             MDC.put(ONAPLogConstants.MDCs.PARTNER_NAME, new DefaultUserNameHandler().retrieveUserName(SecurityContextHolder.getContext()));
@@ -192,8 +192,8 @@
         // depending on where you need them to appear, OR extend the
         // ServiceDescriptor to add them.
         MDC.put(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP,
-                ZonedDateTime.now(ZoneOffset.UTC)
-                        .format(DateTimeFormatter.ISO_INSTANT));
+            ZonedDateTime.now(ZoneOffset.UTC)
+            .format(DateTimeFormatter.ISO_INSTANT));
         MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestID);
         MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, invocationID);
         MDC.put(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS, defaultToEmpty(request.getRemoteAddr()));
@@ -203,7 +203,7 @@
         // Default the service name to the requestURI, in the event that
         // no value has been provided.
         if (serviceName == null ||
-        		serviceName.equalsIgnoreCase(EMPTY_MESSAGE)) {
+            serviceName.equalsIgnoreCase(EMPTY_MESSAGE)) {
             MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, request.getRequestURI());
         }
 
@@ -217,7 +217,7 @@
      */
     public void exiting(String code, String descrption, Level severity, ONAPLogConstants.ResponseStatus status) {
         try {
-        	MDC.put(ONAPLogConstants.MDCs.RESPONSE_CODE, defaultToEmpty(code));
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_CODE, defaultToEmpty(code));
             MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, defaultToEmpty(descrption));
             MDC.put(ONAPLogConstants.MDCs.RESPONSE_SEVERITY, defaultToEmpty(severity));
             MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, defaultToEmpty(status));
@@ -241,11 +241,11 @@
 
         // Set standard HTTP headers on (southbound request) builder.
         con.setRequestProperty(ONAPLogConstants.Headers.REQUEST_ID,
-                defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.REQUEST_ID)));
+            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.REQUEST_ID)));
         con.setRequestProperty(ONAPLogConstants.Headers.INVOCATION_ID,
-        		invocationID);
+            invocationID);
         con.setRequestProperty(ONAPLogConstants.Headers.PARTNER_NAME,
-                defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME)));
+            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME)));
 
         invokeContext(targetEntity, targetServiceName, invocationID);
 
@@ -314,8 +314,8 @@
         MDC.put(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME, defaultToEmpty(targetServiceName));
         MDC.put(ONAPLogConstants.MDCs.INVOCATIONID_OUT, invocationID);
         MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP,
-                ZonedDateTime.now(ZoneOffset.UTC)
-                        .format(DateTimeFormatter.ISO_INSTANT));
+            ZonedDateTime.now(ZoneOffset.UTC)
+            .format(DateTimeFormatter.ISO_INSTANT));
     }
 
     /**
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/extra_user_info.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/extra_user_info.html
index bf151d7..c66047c 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/extra_user_info.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/extra_user_info.html
@@ -38,7 +38,10 @@
         	<b style="font-size:14px;">User Permissions:</b>
         	<div ng-if="userInfo['permissionReadTemplate']">Read Template</div>
 	        <div ng-if="userInfo['permissionReadCl']">Read Model</div>
+	        <div ng-if="userInfo['permissionReadTosca']">Read Tosca</div>
 	        <div ng-if="userInfo['permissionUpdateCl']">Edit Model</div>
+	        <div ng-if="userInfo['permissionUpdateTemplate']">Edit Template</div>
+	        <div ng-if="userInfo['permissionUpdateTosca']">Edit Tosca</div>
         </div>
     </div>
     <div attribute-test="extrauserinfof" class="modal-footer">
diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties
index 3589553..fe7eabc 100644
--- a/src/main/resources/application-noaaf.properties
+++ b/src/main/resources/application-noaaf.properties
@@ -102,7 +102,7 @@
 
 #For EELF logback file
 #com.att.eelf.logging.path=
-com.att.eelf.logging.file=logback-default.xml
+clamp.config.logback.filename=logback-default.xml
 #The log folder that will be used in logback.xml file
 clamp.config.log.path=/var/log/ONAP/clamp
 clamp.config.files.systemProperties=classpath:/system.properties
@@ -211,5 +211,6 @@
 clamp.config.security.permission.type.cl.event=org.onap.clds.cl.event
 clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf
 clamp.config.security.permission.type.template=org.onap.clamp.clds.template
+clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 7bfe5d8..9e2e3c9 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -86,7 +86,7 @@
 
 camel.springboot.consumer-template-cache-size=1000
 camel.springboot.producer-template-cache-size=1000
-camel.springboot.jmx-enabled=false
+camel.springboot.jmx-enabled=true
 camel.defaultthreadpool.poolsize=10
 camel.defaultthreadpool.maxpoolsize=20
 camel.defaultthreadpool.maxqueuesize=1000
@@ -228,7 +228,7 @@
 clamp.config.security.permission.type.cl.event=org.onap.clds.cl.event
 clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf
 clamp.config.security.permission.type.template=org.onap.clamp.clds.template
-clamp.config.security.permission.type.tosca=com.att.clamp.clds.tosca
+clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
 #This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
 clamp.config.security.permission.instance=dev
 
@@ -237,7 +237,7 @@
 clamp.config.cadi.cadiLoglevel=DEBUG
 clamp.config.cadi.cadiLatitude=37.78187
 clamp.config.cadi.cadiLongitude=-122.26147
-clamp.config.cadi.aafLocateUrl=https://aaf-onap-beijing-test.osaaf.org
+clamp.config.cadi.aafLocateUrl=https://aaf-onap-test.osaaf.org:8095
 clamp.config.cadi.cadiKeystorePassword=enc:V_kq_EwDNb4itWp_lYfDGXIWJzemHGkhkZOxAQI9IHs
 clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5F1yB1ukf
 #clamp.config.cadi.oauthTokenUrl=https://AAF_LOCATE_URL/AAF_NS.token:2.0/token
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index b63591f..e67fb16 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -1,132 +1,181 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
-		<rest>
-				<get uri="/clds/cldsDetails" outType="org.onap.clamp.clds.model.CldsMonitoringDetails" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getCLDSDetails()" />
-				</get>
-				<get uri="/clds/cldsInfo" outType="org.onap.clamp.clds.model.CldsInfo" produces="application/json">
-					<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getCldsInfo()" />
-				</get>
-				<get uri="/healthcheck" produces="application/json">
-					<to
-								uri="bean:org.onap.clamp.clds.service.CldsHealthcheckService?method=gethealthcheck()" />
-				</get>
-				<get uri="/clds/model/bpmn/{modelName}" produces="text/xml">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getBpmnXml(${header.modelName})" />
-				</get>
-				<get uri="/clds/model/image/{modelName}" produces="text/xml">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getImageXml(${header.modelName})" />
-				</get>
-				<get uri="/clds/model/{modelName}" outType="org.onap.clamp.clds.model.CldsModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getModel(${header.modelName})" />
-				</get>
-				<put uri="/clds/model/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" outType="org.onap.clamp.clds.model.CldsModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=putModel(${header.modelName},${body})" />
-				</put>
-				<get uri="/clds/model-names" outType="org.onap.clamp.clds.model.ValueItem" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getModelNames()" />
-				</get>
-				<put uri="/clds/action/{action}/{modelName}?test={test}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=putModelAndProcessAction(${header.action},${header.modelName},${header.test},${body})" />
-				</put>
-				<post uri="/clds/dcae/event?test={test}" type="org.onap.clamp.clds.model.DcaeEvent" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=postDcaeEvent(${header.test},${body})" />
-				</post>
-				<get uri="/clds/sdc/services" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcServices()" />
-				</get>
-				<get uri="/clds/properties" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcProperties()" />
-				</get>
-				<get uri="/clds/properties/{serviceInvariantUUID}?refresh={refresh}" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcPropertiesByServiceUUIDForRefresh(${header.serviceInvariantUUID},${header.refresh})" />
-				</get>
-				<put uri="/clds/deploy/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=deployModel(${header.modelName},${body})" />
-				</put>
-				<put uri="/clds/undeploy/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=unDeployModel(${header.modelName},${body})" />
-				</put>
-				
-				
-				
-				
-				<get uri="/cldsTempate/template/bpmn/{templateName}" produces="text/xml" >
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getBpmnTemplate(${header.templateName})" />
-				</get>
-				<get uri="/cldsTempate/template/image/{templateName}" produces="text/xml">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getImageXml(${header.templateName})" />
-				</get>
-				<get uri="/cldsTempate/template/{templateName}" outType="org.onap.clamp.clds.model.CldsTemplate" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplate(${header.templateName})" />
-				</get>
-				<put uri="/cldsTempate/template/{templateName}" type="org.onap.clamp.clds.model.CldsTemplate" consumes="application/json" outType="org.onap.clamp.clds.model.CldsTemplate" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=putTemplate(${header.templateName},${body})" />
-				</put>
-				<get uri="/cldsTempate/template-names" outType="org.onap.clamp.clds.model.ValueItem" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplateNames()" />
-				</get>
-				
-				
-				<put uri="/tosca/models/{toscaModelName}" type="org.onap.clamp.clds.model.CldsToscaModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=parseToscaModelAndSave(${header.toscaModelName},${body})" />
-				</put>
-				<get uri="/tosca/models/policyType/{policyType}" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModelsByPolicyType(${header.policyType})" />
-				</get>
-				<get uri="/tosca/models" outType="org.onap.clamp.clds.model.CldsToscaModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getAllToscaModels()" />
-				</get>	
-				<get uri="/tosca/models/{toscaModelName}" outType="org.onap.clamp.clds.model.CldsToscaModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModel(${header.toscaModelName})" />
-				</get>
-				
-				
-				<put uri="/dictionary/{dictionaryName}" type="org.onap.clamp.clds.model.CldsDictionary" outType="org.onap.clamp.clds.model.CldsDictionary" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionary(${header.dictionaryName},${body})" />
-				</put>
-				
-				<get uri="/dictionary" outType="org.onap.clamp.clds.model.CldsDictionary" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getAllDictionaryNames()" />
-				</get>
-				
-				<put uri="/dictionary/{dictionaryName}/items" type="org.onap.clamp.clds.model.CldsDictionaryItem" outType="org.onap.clamp.clds.model.CldsDictionaryItem" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionaryElements(${header.dictionaryName},${body})" />
-				</put>
-				
-				<get uri="/dictionary/{dictionaryName}/items" outType="org.onap.clamp.clds.model.CldsDictionary" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getDictionaryElementsByName(${header.dictionaryName})" />
-				</get>
-				
-				<get uri="/user/getUser" produces="text/plain">
-						<to
-								uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
-				</get>
-		</rest>
+	<rest>
+		<get uri="/clds/cldsDetails"
+			outType="org.onap.clamp.clds.model.CldsMonitoringDetails"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getCLDSDetails()" />
+		</get>
+		<get uri="/clds/cldsInfo"
+			outType="org.onap.clamp.clds.model.CldsInfo"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getCldsInfo()" />
+		</get>
+		<get uri="/healthcheck" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsHealthcheckService?method=gethealthcheck()" />
+		</get>
+		<get uri="/clds/model/bpmn/{modelName}" produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getBpmnXml(${header.modelName})" />
+		</get>
+		<get uri="/clds/model/image/{modelName}" produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getImageXml(${header.modelName})" />
+		</get>
+		<get uri="/clds/model/{modelName}"
+			outType="org.onap.clamp.clds.model.CldsModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getModel(${header.modelName})" />
+		</get>
+		<put uri="/clds/model/{modelName}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json"
+			outType="org.onap.clamp.clds.model.CldsModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=putModel(${header.modelName},${body})" />
+		</put>
+		<get uri="/clds/model-names"
+			outType="org.onap.clamp.clds.model.ValueItem"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getModelNames()" />
+		</get>
+		<put uri="/clds/action/{action}/{modelName}?test={test}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=putModelAndProcessAction(${header.action},${header.modelName},${header.test},${body})" />
+		</put>
+		<post uri="/clds/dcae/event?test={test}"
+			type="org.onap.clamp.clds.model.DcaeEvent"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=postDcaeEvent(${header.test},${body})" />
+		</post>
+		<get uri="/clds/sdc/services" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcServices()" />
+		</get>
+		<get uri="/clds/properties" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcProperties()" />
+		</get>
+		<get
+			uri="/clds/properties/{serviceInvariantUUID}?refresh={refresh}"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcPropertiesByServiceUUIDForRefresh(${header.serviceInvariantUUID},${header.refresh})" />
+		</get>
+		<put uri="/clds/deploy/{modelName}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=deployModel(${header.modelName},${body})" />
+		</put>
+		<put uri="/clds/undeploy/{modelName}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=unDeployModel(${header.modelName},${body})" />
+		</put>
+
+
+
+
+		<get uri="/cldsTempate/template/bpmn/{templateName}"
+			produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getBpmnTemplate(${header.templateName})" />
+		</get>
+		<get uri="/cldsTempate/template/image/{templateName}"
+			produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getImageXml(${header.templateName})" />
+		</get>
+		<get uri="/cldsTempate/template/{templateName}"
+			outType="org.onap.clamp.clds.model.CldsTemplate"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplate(${header.templateName})" />
+		</get>
+		<put uri="/cldsTempate/template/{templateName}"
+			type="org.onap.clamp.clds.model.CldsTemplate"
+			consumes="application/json"
+			outType="org.onap.clamp.clds.model.CldsTemplate"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=putTemplate(${header.templateName},${body})" />
+		</put>
+		<get uri="/cldsTempate/template-names"
+			outType="org.onap.clamp.clds.model.ValueItem"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplateNames()" />
+		</get>
+
+
+		<put uri="/tosca/models/{toscaModelName}"
+			type="org.onap.clamp.clds.model.CldsToscaModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=parseToscaModelAndSave(${header.toscaModelName},${body})" />
+		</put>
+		<get uri="/tosca/models/policyType/{policyType}"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModelsByPolicyType(${header.policyType})" />
+		</get>
+		<get uri="/tosca/models"
+			outType="org.onap.clamp.clds.model.CldsToscaModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getAllToscaModels()" />
+		</get>
+		<get uri="/tosca/models/{toscaModelName}"
+			outType="org.onap.clamp.clds.model.CldsToscaModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModel(${header.toscaModelName})" />
+		</get>
+
+
+		<put uri="/dictionary/{dictionaryName}"
+			type="org.onap.clamp.clds.model.CldsDictionary"
+			outType="org.onap.clamp.clds.model.CldsDictionary"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionary(${header.dictionaryName},${body})" />
+		</put>
+
+		<get uri="/dictionary"
+			outType="org.onap.clamp.clds.model.CldsDictionary"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getAllDictionaryNames()" />
+		</get>
+
+		<put uri="/dictionary/{dictionaryName}/items"
+			type="org.onap.clamp.clds.model.CldsDictionaryItem"
+			outType="org.onap.clamp.clds.model.CldsDictionaryItem"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionaryElements(${header.dictionaryName},${body})" />
+		</put>
+
+		<get uri="/dictionary/{dictionaryName}/items"
+			outType="org.onap.clamp.clds.model.CldsDictionary"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getDictionaryElementsByName(${header.dictionaryName})" />
+		</get>
+
+		<get uri="/user/getUser" produces="text/plain">
+			<to
+				uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
+		</get>
+	</rest>
 </rests>
diff --git a/src/main/resources/clds/clds-users.json b/src/main/resources/clds/clds-users.json
index 18ab7d3..b4d73a2 100644
--- a/src/main/resources/clds/clds-users.json
+++ b/src/main/resources/clds/clds-users.json
@@ -8,7 +8,9 @@
 	               "org.onap.clamp.clds.cl.manage|dev|*",
 	               "org.onap.clamp.clds.filter.vf|dev|*",
 	               "org.onap.clamp.clds.template|dev|read",
-	               "org.onap.clamp.clds.template|dev|update"
+	               "org.onap.clamp.clds.template|dev|update",
+	               "org.onap.clamp.clds.tosca|dev|read",
+	               "org.onap.clamp.clds.tosca|dev|update"
 	            ]
 	},
 	{
@@ -21,7 +23,9 @@
 	               "org.onap.clamp.clds.cl.manage|dev|*",
 	               "org.onap.clamp.clds.filter.vf|dev|*",
 	               "org.onap.clamp.clds.template|dev|read",
-	               "org.onap.clamp.clds.template|dev|update"
+	               "org.onap.clamp.clds.template|dev|update",
+	               "org.onap.clamp.clds.tosca|dev|read",
+	               "org.onap.clamp.clds.tosca|dev|update"
 	            ]
 	}
 ]
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index acf6452..4268ce3 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -110,7 +110,7 @@
 
 #For EELF logback file
 #com.att.eelf.logging.path=
-com.att.eelf.logging.file=logback-default.xml
+clamp.config.logback.filename=logback-default.xml
 #The log folder that will be used in logback.xml file
 clamp.config.log.path=log
 clamp.config.files.systemProperties=classpath:/system.properties