re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

372 files changed, 16974 insertions, 15781 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java
index 1ea8ff9541..eed347f781 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/api/AuditEventFactory.java
@@ -1,10 +1,10 @@
 package org.openecomp.sdc.be.auditing.api;
 
-import java.util.List;
-
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 
+import java.util.List;
+
 public interface AuditEventFactory {
 
     String getLogMessage();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java
index b68ee0db23..63e55f70f2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditAuthRequestEventFactory.java
@@ -7,21 +7,30 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditAuthRequestEventFactory extends AuditBaseEventFactory {
 
-    private final static String LOG_STR =  "ACTION = \"%s\" URL = \"%s\" USER = \"%s\" AUTH_STATUS = \"%s\" REALM = \"%s\"";
-
-    final private AuthEvent event;
+    private static final String LOG_STR =  "ACTION = \"%s\" URL = \"%s\" USER = \"%s\" AUTH_STATUS = \"%s\" REALM = \"%s\"";
+    private final AuthEvent event;
 
     public AuditAuthRequestEventFactory(CommonAuditData commonFields, String authUser, String authUrl, String realm, String authStatus) {
         super(AuditingActionEnum.AUTH_REQUEST);
         event = new AuthEvent(getAction().getName(), commonFields, authUser, authUrl, realm, authStatus);
     }
 
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getUrl(), event.getUser(), event.getAuthStatus(), event.getRealm());
+    public AuditAuthRequestEventFactory(CommonAuditData commonFields, String authUser, String authUrl, String realm,
+                                        String authStatus, String timestamp) {
+       this(commonFields, authUser, authUrl, realm, authStatus);
+       this.event.setTimestamp1(timestamp);
     }
 
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
 
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getUrl(), event.getUser(),
+                event.getAuthStatus(), event.getRealm()};
+    }
 
     @Override
     public AuditingGenericEvent getDbEvent() { return event; }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java
index 2ccc7910fa..b3769f0d68 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditBaseEventFactory.java
@@ -1,8 +1,5 @@
 package org.openecomp.sdc.be.auditing.impl;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.apache.commons.lang.StringUtils;
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
@@ -10,17 +7,20 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.common.api.Constants;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 public abstract class AuditBaseEventFactory implements AuditEventFactory {
 
-    //TODO imanzon: Check if requestId and serviceInstanceId fields are required for all tables.
-    //Currently they are included even if they ahs null value. If they should not appear then
-    //createTable code should be updated so that they need to be removed from the tables
     private AuditingActionEnum action;
 
     public AuditBaseEventFactory(AuditingActionEnum action) {
-        this.action = action;
+        this.action = Objects.requireNonNull(action);
     }
 
+    public AuditBaseEventFactory() {}
+
     public AuditingActionEnum getAction() {
         return action;
     }
@@ -68,8 +68,8 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
     }
 
     protected static String buildUserName(User user) {
-        if (user == null || user.getUserId() == null || user.getUserId().isEmpty()) {
-            return Constants.EMPTY_STRING;
+        if (user == null || StringUtils.isEmpty(user.getUserId())) {
+            return StringUtils.EMPTY;
         }
         StringBuilder sb = new StringBuilder();
         String firstName = replaceNullNameWithEmpty(user.getFirstName());
@@ -85,9 +85,9 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
         return sb.toString();
     }
 
-    public static String buildValue(String value) {
+    private static String buildValue(String value) {
         if (value == null) {
-            return Constants.EMPTY_STRING;
+            return StringUtils.EMPTY;
         }
         return value;
     }
@@ -96,7 +96,7 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
         if (name != null && !name.trim().contains(Constants.NULL_STRING)) {
             return name;
         }
-        return Constants.EMPTY_STRING;
+        return StringUtils.EMPTY;
     }
 
     @Override
@@ -110,5 +110,22 @@ public abstract class AuditBaseEventFactory implements AuditEventFactory {
         return this.action.getAuditingEsType();
     }
 
+    @Override
+    public final String getLogMessage() {
+       return String.format(getLogPattern(), getLogArgs());
+    }
+
+    private Object[] getLogArgs() {
+        return Arrays.stream(getLogMessageParams())
+                .map(AuditBaseEventFactory::buildValue)
+                .toArray(String[]::new);
+    }
+
+    public abstract String getLogPattern();
+
+    public abstract String[] getLogMessageParams();
+
+
+
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java
index 01c82e88da..81a6e7f954 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditConsumerEventFactory.java
@@ -9,18 +9,33 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditConsumerEventFactory extends AuditBaseEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" ECOMP_USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
+    private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" ECOMP_USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final ConsumerEvent event;
 
     public AuditConsumerEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, ConsumerDefinition ecompUser) {
+        this(action, commonFields, buildConsumerName(ecompUser), buildUserName(modifier));
+    }
+
+    public AuditConsumerEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                     String ecompUser, String modifier, String timestamp) {
+        this(action, commonFields, ecompUser, modifier);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditConsumerEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                     String ecompUser, String modifier) {
         super(action);
-        event = new ConsumerEvent(getAction().getName(), commonFields, buildConsumerName(ecompUser), buildUserName(modifier));
+        event = new ConsumerEvent(getAction().getName(), commonFields, ecompUser, modifier);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getEcompUser(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getEcompUser(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -28,8 +43,6 @@ public class AuditConsumerEventFactory extends AuditBaseEventFactory {
         return event;
     }
 
-
-
     static String buildConsumerName(ConsumerDefinition consumer) {
         StringBuilder ecompUser = new StringBuilder();
         if (consumer != null) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java
index 95dddec3ad..4eb346b098 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditEcompOpEnvEventFactory.java
@@ -7,7 +7,6 @@ import org.openecomp.sdc.be.resources.data.auditing.EcompOperationalEnvironmentE
 public class AuditEcompOpEnvEventFactory extends AuditBaseEventFactory {
     private static final String LOG_STR =  "ACTION = \"%s\" OPERATIONAL_ENVIRONMENT_ACTION = \"%s\" OPERATIONAL_ENVIRONMENT_ID = \"%s\"" +
             " OPERATIONAL_ENVIRONMENT_NAME = \"%s\" OPERATIONAL_ENVIRONMENT_TYPE = \"%s\" TENANT_CONTEXT = \"%s\"";
-
     private final EcompOperationalEnvironmentEvent event;
 
     public AuditEcompOpEnvEventFactory(AuditingActionEnum action, String operationalEnvironmentId, String operationalEnvironmentName,
@@ -18,10 +17,15 @@ public class AuditEcompOpEnvEventFactory extends AuditBaseEventFactory {
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getOperationalEnvironmentAction()),
-                buildValue(event.getOperationalEnvironmentId()), buildValue(event.getOperationalEnvironmentName()),
-                buildValue(event.getOperationalEnvironmentType()), buildValue(event.getTenantContext()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getOperationalEnvironmentAction(),
+                event.getOperationalEnvironmentId(), event.getOperationalEnvironmentName(),
+                event.getOperationalEnvironmentType(), event.getTenantContext()};
     }
 
    @Override
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditGetUebClusterEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditGetUebClusterEventFactory.java
new file mode 100644
index 0000000000..792566c8b6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditGetUebClusterEventFactory.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.auditing.impl;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGetUebClusterEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+
+public class AuditGetUebClusterEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" STATUS_TIME = \"%s\" STATUS = \"%s\" STATUS_DESC = \"%s\"";
+    private final AuditingGetUebClusterEvent event;
+
+    public AuditGetUebClusterEventFactory(CommonAuditData commonFields, String consumerId) {
+
+        super(AuditingActionEnum.GET_UEB_CLUSTER);
+        event = new AuditingGetUebClusterEvent(getAction().getName(), commonFields, consumerId);
+    }
+
+    public AuditGetUebClusterEventFactory(CommonAuditData commonFields, String consumerId, String timestamp) {
+        this(commonFields, consumerId);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getTimestamp(), event.getStatus(), event.getDesc()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditResourceEventFactoryMananger.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditResourceEventFactoryMananger.java
deleted file mode 100644
index 25ce6e46a7..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditResourceEventFactoryMananger.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl;
-
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditArtifactResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditCertificationResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditCreateUpdateResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditDistStateChangeRequestResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditDistStateChangeResourceAdminEventFactory;
-import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditImportResourceAdminEventFactory;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditResourceEventFactoryMananger {
-
-
-    public static AuditBaseEventFactory createResourceEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams,
-                                                                   ResourceAuditData currParams, String resourceType, String resourceName, String invariantUuid,
-                                                                   User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        AuditBaseEventFactory factory = null;
-
-        switch (action) {
-            case IMPORT_RESOURCE:
-                factory = new AuditImportResourceAdminEventFactory(commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did, toscaNodeType);
-                break;
-            case CREATE_RESOURCE:
-            case UPDATE_RESOURCE_METADATA:
-                factory = new AuditCreateUpdateResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did, org.openecomp.sdc.common.api.Constants.EMPTY_STRING);
-                break;
-            case CHECKIN_RESOURCE:
-            case CHECKOUT_RESOURCE:
-            case UNDO_CHECKOUT_RESOURCE:
-            case CERTIFICATION_REQUEST_RESOURCE:
-            case START_CERTIFICATION_RESOURCE:
-            case CERTIFICATION_SUCCESS_RESOURCE:
-            case FAIL_CERTIFICATION_RESOURCE:
-            case CANCEL_CERTIFICATION_RESOURCE:
-                factory = new AuditCertificationResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            case ARTIFACT_UPLOAD:
-            case ARTIFACT_DELETE:
-            case ARTIFACT_METADATA_UPDATE:
-            case ARTIFACT_PAYLOAD_UPDATE:
-            case ARTIFACT_DOWNLOAD:
-                factory = new AuditArtifactResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            case DISTRIBUTION_STATE_CHANGE_REQUEST:
-                factory = new AuditDistStateChangeRequestResourceAdminEventFactory(commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            case DISTRIBUTION_STATE_CHANGE_APPROV:
-            case DISTRIBUTION_STATE_CHANGE_REJECT:
-                factory = new AuditDistStateChangeResourceAdminEventFactory(action, commonFields, prevParams, currParams,
-                        resourceType, resourceName, invariantUuid,
-                        modifier, artifactData, comment, did);
-                break;
-            default:
-                throw new UnsupportedOperationException();
-        }
-        return factory;
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatConstants.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatConstants.java
deleted file mode 100644
index 69c4eb82a0..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatConstants.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.openecomp.sdc.be.auditing.impl;
-
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
-
-class AuditingLogFormatConstants {
-
-    private AuditingLogFormatConstants() {}
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_REGISTRATION_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_NOTIFICATION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME};
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_DOWNLOAD_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] GET_UEB_CLUSTER_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_DEPLOY_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_STATUS_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-//        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME, - check if required
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] DISTRIBUTION_NOTIFY_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TENANT,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_VNF_WORKLOAD_CONTEXT,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVIRONMENT_ID
-    };
-
-    static final AuditingFieldsKeysEnum[] ADD_REMOVE_TOPIC_KEY_ACL_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ROLE,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY,
-        AuditingFieldsKeysEnum.AUDIT_STATUS
-    };
-
-    static final AuditingFieldsKeysEnum[] CREATE_TOPIC_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME,
-        AuditingFieldsKeysEnum.AUDIT_STATUS
-    };
-
-    static final AuditingFieldsKeysEnum[] ACTIVATE_DISTRIBUTION_ARRAY ={
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DPREV_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DCURR_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] CHANGE_DISTRIBUTION_STATUS_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DPREV_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_DCURR_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT
-    };
-
-    static final AuditingFieldsKeysEnum[] CREATE_RESOURCE_TEMPLATE_SUFFIX_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE
-
-    };
-
-    static final AuditingFieldsKeysEnum[] USER_ACCESS_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_USER_UID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] USER_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_USER_UID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] AUTH_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_URL,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_USER,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_AUTH_REALM
-    };
-
-    static final  AuditingFieldsKeysEnum[] ECOMP_USER_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_ECOMP_USER,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final  AuditingFieldsKeysEnum[] CATEGORY_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_CATEGORY_NAME,
-        AuditingFieldsKeysEnum.AUDIT_SUB_CATEGORY_NAME,
-        AuditingFieldsKeysEnum.AUDIT_GROUPING_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final  AuditingFieldsKeysEnum[] GET_USERS_LIST_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_USER_DETAILS,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final  AuditingFieldsKeysEnum[] GET_CATEGORY_HIERARCHY_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_DETAILS,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] USER_ADMIN_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_USER_BEFORE,
-        AuditingFieldsKeysEnum.AUDIT_USER_AFTER,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_GET_ASSET_LIST_TEMPLATE_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_GET_ASSET_TEMPLATE_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static AuditingFieldsKeysEnum[] ECOMP_OPERATIONAL_ENVIRONMENT_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_ID,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_NAME,
-            AuditingFieldsKeysEnum.AUDIT_OPERATIONAL_ENVIRONMENT_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_TENANT_CONTEXT
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_DOWNLOAD_ARTIFACT_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-    static final AuditingFieldsKeysEnum[] EXTERNAL_CRUD_API_ARTIFACT_ARRAY = {
-        AuditingFieldsKeysEnum.AUDIT_ACTION,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-        AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-        AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-        AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-        AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID,
-        AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID,
-        AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA,
-        AuditingFieldsKeysEnum.AUDIT_STATUS,
-        AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] EXTERNAL_CRUD_API_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-
-            AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-            AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static AuditingFieldsKeysEnum[] EXTERNAL_ACTIVATE_SERVICE_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-            AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-
-    static final AuditingFieldsKeysEnum[] EXTERNAL_LYFECYCLE_API_ARRAY = {
-            AuditingFieldsKeysEnum.AUDIT_ACTION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID,
-            AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME,
-            AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID,
-
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE,
-            AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,
-
-            AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID,
-            AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID,
-            AuditingFieldsKeysEnum.AUDIT_STATUS,
-            AuditingFieldsKeysEnum.AUDIT_DESC
-    };
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatUtil.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatUtil.java
deleted file mode 100644
index 92baba260c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingLogFormatUtil.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.openecomp.sdc.be.auditing.impl;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Formatter;
-import java.util.Locale;
-import java.util.Map;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
-
-public class AuditingLogFormatUtil {
-
-    // When adding any new fields here, please keep the convention <fieldName>=
-    // <value>, with the space between them.
-    private static final Logger log = LoggerFactory.getLogger(AuditingLogFormatUtil.class);
-
-    // This is the key by which audit marker is recognized in logback.xml
-    private static String AUDIT_MARKER_STR = "AUDIT_MARKER";
-
-    public static final Marker auditMarker = MarkerFactory.getMarker(AUDIT_MARKER_STR);
-
-    protected static String logAuditEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-
-        StringBuilder sb = new StringBuilder();
-        Formatter formatter = new Formatter(sb, Locale.US);
-        log.trace("logAuditEvent - start");
-
-        String formattedString = "";
-
-        try {
-
-            // Common fields
-            String modifier = getModifier((String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME), (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID));
-            Object statusObj = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS);
-            String status = null;
-            if (statusObj != null) {
-                status = String.valueOf(statusObj);
-            }
-            String desc = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_DESC);
-            String action = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION);
-
-            AuditingActionEnum auditEventType = AuditingActionEnum.getActionByName(action);
-            StringBuilder formattedEvent = getFormattedEvent(auditingFields, modifier, status, desc, action, auditEventType);
-            formattedString = formattedEvent.toString();
-
-            // This is the only way to fix DE166225 without major refactoring,
-            // after it was previously agreed with Ella that activity type will
-            // be the method name.
-
-            if (auditEventType.equals(AuditingActionEnum.AUTH_REQUEST)) {
-                HttpRequestAuthentication(formattedString);
-            } else {
-                log.info(auditMarker, formattedString);
-            }
-        } catch (Exception e) {
-            log.debug("unexpected error occurred: {}", e.getMessage(), e);
-
-        } finally {
-            formatter.close();
-            log.trace("logAuditEvent - end");
-        }
-        return formattedString;
-
-    }
-
-    protected static void logAuditEvent(final String formattedString) {
-        log.trace("logAuditEvent - start");
-        log.info(auditMarker, formattedString);
-        log.trace("logAuditEvent - end");
-    }
-
-
-    private static void HttpRequestAuthentication(String formattedString) {
-        log.info(auditMarker, formattedString);
-    }
-
-    private static StringBuilder getFormattedEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields, String modifier, String status, String desc, String action, AuditingActionEnum auditEventType) {
-
-        StringBuilder formattedString = new StringBuilder();
-
-        switch (auditEventType) {
-        case ADD_USER:
-        case DELETE_USER:
-        case UPDATE_USER:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.USER_ADMIN_TEMPLATE_ARRAY, auditingFields);
-
-            break;
-        case USER_ACCESS:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.USER_ACCESS_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_REGISTER:
-        case DISTRIBUTION_UN_REGISTER:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_REGISTRATION_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case UPDATE_RESOURCE_METADATA:
-        case CREATE_RESOURCE:
-        case IMPORT_RESOURCE:
-            ArrayList<AuditingFieldsKeysEnum> createResourceList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY));
-            createResourceList.addAll(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_SUFFIX_ARRAY));
-            if (auditEventType == AuditingActionEnum.IMPORT_RESOURCE) {
-                createResourceList.add(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TOSCA_NODE_TYPE);
-            }
-            AuditingFieldsKeysEnum[] createResourceArray = new AuditingFieldsKeysEnum[100];
-            createResourceArray = createResourceList.toArray(createResourceArray);
-            formattedString = buildStringAccrodingToArray(createResourceArray, auditingFields);
-            break;
-        case CHECKIN_RESOURCE:
-        case CHECKOUT_RESOURCE:
-        case UNDO_CHECKOUT_RESOURCE:
-        case CERTIFICATION_REQUEST_RESOURCE:
-        case START_CERTIFICATION_RESOURCE:
-        case CERTIFICATION_SUCCESS_RESOURCE:
-        case FAIL_CERTIFICATION_RESOURCE:
-        case CANCEL_CERTIFICATION_RESOURCE:
-            ArrayList<AuditingFieldsKeysEnum> checkinFieldsList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY));
-            checkinFieldsList.add(AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT);
-            checkinFieldsList.addAll(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_SUFFIX_ARRAY));
-            AuditingFieldsKeysEnum[] checkinFieldsArray = new AuditingFieldsKeysEnum[100];
-            checkinFieldsArray = checkinFieldsList.toArray(checkinFieldsArray);
-            String comment = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT);
-            if (comment == null || comment.equals(Constants.NULL_STRING)) {
-                auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_COMMENT, Constants.EMPTY_STRING);
-            }
-            formattedString = buildStringAccrodingToArray(checkinFieldsArray, auditingFields);
-            break;
-        case ARTIFACT_UPLOAD:
-        case ARTIFACT_DELETE:
-        case ARTIFACT_METADATA_UPDATE:
-        case ARTIFACT_PAYLOAD_UPDATE:
-        case ARTIFACT_DOWNLOAD:
-            ArrayList<AuditingFieldsKeysEnum> artifactFieldsSet = new ArrayList<>(Arrays.asList(AuditingLogFormatConstants.CREATE_RESOURCE_TEMPLATE_PREFIX_ARRAY)) ;
-            artifactFieldsSet.add(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID);
-            artifactFieldsSet.add(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID);
-            artifactFieldsSet.add(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA);
-            artifactFieldsSet.addAll(Arrays.asList(AuditingLogFormatConstants.EXTERNAL_DOWNLOAD_ARTIFACT_ARRAY));
-            AuditingFieldsKeysEnum[] artifactFieldsArray = new AuditingFieldsKeysEnum[100];
-            artifactFieldsArray = artifactFieldsSet.toArray(artifactFieldsArray);
-            formattedString = buildStringAccrodingToArray(artifactFieldsArray, auditingFields);
-            break;
-        case DOWNLOAD_ARTIFACT:
-            ArrayList<AuditingFieldsKeysEnum> downloadArtifactFieldsList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.EXTERNAL_DOWNLOAD_ARTIFACT_ARRAY));
-            AuditingFieldsKeysEnum[] downloadArtifactFieldsArray = new AuditingFieldsKeysEnum[100];
-            artifactFieldsArray = downloadArtifactFieldsList.toArray(downloadArtifactFieldsArray);
-            formattedString = buildStringAccrodingToArray(artifactFieldsArray, auditingFields);
-            break;
-        case DISTRIBUTION_STATE_CHANGE_REQUEST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ACTIVATE_DISTRIBUTION_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_STATE_CHANGE_APPROV:
-        case DISTRIBUTION_STATE_CHANGE_REJECT:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.CHANGE_DISTRIBUTION_STATUS_ARRAY, auditingFields);
-            break;
-        case CREATE_DISTRIBUTION_TOPIC:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.CREATE_TOPIC_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ADD_KEY_TO_TOPIC_ACL:
-        case REMOVE_KEY_FROM_TOPIC_ACL:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ADD_REMOVE_TOPIC_KEY_ACL_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_STATUS:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_STATUS_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_NOTIFY:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_NOTIFY_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_DEPLOY:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_DEPLOY_ARRAY, auditingFields);
-            break;
-        case GET_UEB_CLUSTER:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.GET_UEB_CLUSTER_ARRAY, auditingFields);
-            break;
-        case DISTRIBUTION_ARTIFACT_DOWNLOAD:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.DISTRIBUTION_DOWNLOAD_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case AUTH_REQUEST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.AUTH_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ADD_ECOMP_USER_CREDENTIALS:
-        case GET_ECOMP_USER_CREDENTIALS:
-        case DELETE_ECOMP_USER_CREDENTIALS:
-        case UPDATE_ECOMP_USER_CREDENTIALS:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ECOMP_USER_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ADD_CATEGORY:
-        case ADD_SUB_CATEGORY:
-        case ADD_GROUPING:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.CATEGORY_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_USERS_LIST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.GET_USERS_LIST_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_CATEGORY_HIERARCHY:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.GET_CATEGORY_HIERARCHY_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_ASSET_LIST:
-        case GET_FILTERED_ASSET_LIST:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_GET_ASSET_LIST_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case GET_ASSET_METADATA:
-        case GET_TOSCA_MODEL:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_GET_ASSET_TEMPLATE_ARRAY, auditingFields);
-            break;
-        case ARTIFACT_UPLOAD_BY_API:
-        case ARTIFACT_DELETE_BY_API:
-        case ARTIFACT_UPDATE_BY_API:
-            ArrayList<AuditingFieldsKeysEnum> uploadArtifactFieldsList = new ArrayList(Arrays.asList(AuditingLogFormatConstants.EXTERNAL_CRUD_API_ARTIFACT_ARRAY));
-            AuditingFieldsKeysEnum[] uploadArtifactFieldsArray = new AuditingFieldsKeysEnum[100];
-            artifactFieldsArray = uploadArtifactFieldsList.toArray(uploadArtifactFieldsArray);
-            formattedString = buildStringAccrodingToArray(artifactFieldsArray, auditingFields);
-            break;
-        case CREATE_RESOURCE_BY_API:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_CRUD_API_ARRAY, auditingFields);
-            break;
-        case CHANGE_LIFECYCLE_BY_API:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_LYFECYCLE_API_ARRAY, auditingFields);
-            break;
-            case ACTIVATE_SERVICE_BY_API:
-                formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.EXTERNAL_ACTIVATE_SERVICE_ARRAY, auditingFields);
-                break;
-        case CREATE_ENVIRONMENT:
-        case UPDATE_ENVIRONMENT:
-        case DELETE_ENVIRONMENT:
-        case UNKNOWN_ENVIRONMENT_NOTIFICATION:
-        case UNSUPPORTED_ENVIRONMENT_TYPE:
-            formattedString = buildStringAccrodingToArray(AuditingLogFormatConstants.ECOMP_OPERATIONAL_ENVIRONMENT_ARRAY, auditingFields);
-            break;
-        default:
-            break;
-        }
-
-        return formattedString;
-    }
-
-    private static StringBuilder buildStringAccrodingToArray(AuditingFieldsKeysEnum[] sortedFieldsArray, Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        StringBuilder formattedString = new StringBuilder();
-        for (int i = 0; i < sortedFieldsArray.length; i++) {
-            AuditingFieldsKeysEnum key = sortedFieldsArray[i];
-
-            Object fieldVal = auditingFields.get(key);
-            if (fieldVal != null) {
-                formattedString.append(key.getDisplayName()).append(" = \"").append(fieldVal).append("\"");
-                if (i < sortedFieldsArray.length - 1) {
-                    formattedString.append(" ");
-                }
-            }
-        }
-        return formattedString;
-    }
-
-    protected static String getModifier(String modifierName, String modifierUid) {
-        if (modifierUid == null || modifierUid.equals(Constants.EMPTY_STRING)) {
-            return Constants.EMPTY_STRING;
-        }
-        StringBuilder sb = new StringBuilder();
-        if (modifierName != null) {
-            sb.append(modifierName);
-        }
-        sb.append("(").append(modifierUid).append(")");
-        return sb.toString();
-    }
-
-    protected static String getUser(String userData) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(userData);
-        return sb.toString();
-    }
-
-
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java
index daf16390ae..f7c46b2eb9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/AuditingManager.java
@@ -20,29 +20,23 @@
 
 package org.openecomp.sdc.be.auditing.impl;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao;
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.dao.impl.AuditingDao;
-import org.openecomp.sdc.be.resources.data.auditing.AuditRecordFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
-import org.openecomp.sdc.common.util.ThreadLocalsHolder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.elements.LogFieldsMdcHandler;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.log.wrappers.LoggerSdcAudit;
 import org.springframework.stereotype.Component;
 
 @Component
 public class AuditingManager {
 
-    private static final Logger log = LoggerFactory.getLogger(AuditingManager.class);
+    private static final Logger log = Logger.getLogger(AuditingManager.class.getName());
+
     private final AuditingDao auditingDao;
     private final AuditCassandraDao cassandraDao;
 
@@ -51,66 +45,17 @@ public class AuditingManager {
         this.cassandraDao = cassandraDao;
     }
 
-    // TODO remove after completing refactoring
-    public String auditEvent(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        String msg = "";
-        try {
-            boolean disableAudit = ConfigurationManager.getConfigurationManager().getConfiguration().isDisableAudit();
-            if (disableAudit) {
-                return null;
-            }
-            // Adding UUID from thread local
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID, ThreadLocalsHolder.getUuid());
-
-            Object status = auditingFields.get(AuditingFieldsKeysEnum.AUDIT_STATUS);
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, String.valueOf(status));
-
-            // normalizing empty string values - US471661
-            normalizeEmptyAuditStringValues(auditingFields);
-
-            // Format modifier
-            formatModifier(auditingFields);
-
-            // Format user
-            formatUser(auditingFields);
-
-            // Logging the event
-            msg = AuditingLogFormatUtil.logAuditEvent(auditingFields);
-
-            // Determining the type of the auditing data object
-            AuditingActionEnum actionEnum = AuditingActionEnum.getActionByName((String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_ACTION));
-            log.info("audit event {} of type {}", actionEnum.getName(), actionEnum.getAuditingEsType());
-            ActionStatus addRecordStatus = auditingDao.addRecord(auditingFields, actionEnum.getAuditingEsType());
-            if (!addRecordStatus.equals(ActionStatus.OK)) {
-                log.warn("Failed to persist auditing event: {}", addRecordStatus);
-            }
-
-            AuditingGenericEvent recordForCassandra = AuditRecordFactory.createAuditRecord(auditingFields);
-            if (recordForCassandra != null) {
-                saveEventToCassandra(recordForCassandra);
-            }
-
-        } catch (Exception e) {
-            // Error during auditing shouldn't terminate flow
-            log.warn("Error during auditEvent: {}", e);
-        }
-        return msg;
-    }
-
 
     public String auditEvent(AuditEventFactory factory) {
         if (ConfigurationManager.getConfigurationManager().getConfiguration().isDisableAudit()) {
             return null;
         }
-        AuditingGenericEvent event = factory.getDbEvent();
-        // Logging the event
-        //TODO - change this call after EELF Audit stuff merge
         String msg = factory.getLogMessage();
-        AuditingLogFormatUtil.logAuditEvent(msg);
+        logAuditEvent(msg);
 
         //TODO - remove this method after we got rid of ES
-        saveEventToElasticSearch(factory, event);
-        saveEventToCassandra(event);
+        saveEventToElasticSearch(factory);
+        saveEventToCassandra(factory.getDbEvent());
         return msg;
     }
 
@@ -121,47 +66,22 @@ public class AuditingManager {
         }
     }
 
-    private void saveEventToElasticSearch(AuditEventFactory factory, AuditingGenericEvent event) {
-        ActionStatus addRecordStatus = auditingDao.addRecord(event, factory.getAuditingEsType());
+    private void saveEventToElasticSearch(AuditEventFactory factory) {
+        ActionStatus addRecordStatus = auditingDao.addRecord(factory.getDbEvent(), factory.getAuditingEsType());
         if (!addRecordStatus.equals(ActionStatus.OK)) {
             log.warn("Failed to persist auditing event: {}", addRecordStatus.name());
         }
     }
 
-
-    private void formatUser(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        if (auditingFields.get(AuditingFieldsKeysEnum.AUDIT_USER_UID) != null) {
-            String userDetails = (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_USER_UID);
-
-            String user = AuditingLogFormatUtil.getUser(userDetails);
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_USER_UID, user);
+    private void logAuditEvent(final String formattedString) {
+        log.trace("logAuditEvent - start");
+        log.debug(formattedString);
+        LogFieldsMdcHandler.getInstance()
+                .setAuditMessage(formattedString);
+        if (!LoggerSdcAudit.isFlowBeingTakenCare()){
+            log.debug("MOVED FROM AUDIT LOG: {}", formattedString);
         }
+        log.trace("logAuditEvent - end");
     }
 
-    private void formatModifier(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        String modifier = AuditingLogFormatUtil.getModifier((String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME), (String) auditingFields.get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID));
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier);
-        auditingFields.remove(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME);
-    }
-
-    private void normalizeEmptyAuditStringValues(Map<AuditingFieldsKeysEnum, Object> auditingFields) {
-        for (Entry<AuditingFieldsKeysEnum, Object> auditingEntry : auditingFields.entrySet()) {
-            if (auditingEntry.getKey().getValueClass().equals(String.class)) {
-                String auditingValue = (String) auditingEntry.getValue();
-                boolean isEmpty = false;
-                if (auditingValue != null) {
-                    String trimmedValue = auditingValue.trim();
-                    if ((trimmedValue.equals(Constants.EMPTY_STRING)) || trimmedValue.equals(Constants.NULL_STRING) || trimmedValue.equals(Constants.DOUBLE_NULL_STRING)) {
-                        isEmpty = true;
-                    }
-                } else {// is null
-                    isEmpty = true;
-                }
-                // Normalizing to ""
-                if (isEmpty) {
-                    auditingEntry.setValue(Constants.EMPTY_STRING);
-                }
-            }
-        }
-    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java
deleted file mode 100644
index 84c3a0392d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddCategoryEventFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.category;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddCategoryEventFactory extends AuditCategoryEventFactory {
-
-    public AuditAddCategoryEventFactory(CommonAuditData commonFields, User modifier,
-                                        String categoryName, String subCategoryName, String groupingName, String resourceType) {
-        super(AuditingActionEnum.ADD_CATEGORY, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java
deleted file mode 100644
index 6ee7624ddf..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddGroupingCategoryEventFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.category;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddGroupingCategoryEventFactory extends AuditCategoryEventFactory {
-
-    public AuditAddGroupingCategoryEventFactory(CommonAuditData commonFields, User modifier, String categoryName,
-                                                String subCategoryName, String groupingName, String resourceType) {
-        super(AuditingActionEnum.ADD_GROUPING, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java
deleted file mode 100644
index 241d0c0fc5..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditAddSubCategoryEventFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.category;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddSubCategoryEventFactory extends AuditCategoryEventFactory {
-
-    public AuditAddSubCategoryEventFactory(CommonAuditData commonFields, User modifier,
-                                           String categoryName, String subCategoryName, String groupingName, String resourceType) {
-        super(AuditingActionEnum.ADD_SUB_CATEGORY, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java
index 9a2d7b09a8..d4827f8938 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditCategoryEventFactory.java
@@ -7,17 +7,40 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 import org.openecomp.sdc.be.resources.data.auditing.CategoryEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
-public abstract class AuditCategoryEventFactory extends AuditBaseEventFactory {
+public class AuditCategoryEventFactory extends AuditBaseEventFactory {
 
+    private static final  String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" CATEGORY_NAME = \"%s\" SUB_CATEGORY_NAME = \"%s\"" +
+            " GROUPING_NAME = \"%s\" RESOURCE_TYPE = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final CategoryEvent event;
 
-    protected static final  String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" CATEGORY_NAME = \"%s\" SUB_CATEGORY_NAME = \"%s\"" +
-            " GROUPING_NAME = \"%s\" RESOURCE_TYPE = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+
+    private AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String categoryName,
+                                      String subCategoryName, String groupingName, String resourceType) {
+        super(action);
+        event = new CategoryEvent(getAction().getName(), commonFields, modifier, categoryName,
+                subCategoryName, groupingName, resourceType);
+    }
+
+    public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier,
+                                     String categoryName, String subCategoryName, String groupingName, String resourceType) {
+        this(action, commonFields, buildUserName(modifier), categoryName, subCategoryName, groupingName, resourceType);
+    }
+
+    public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String categoryName,
+                                     String subCategoryName, String groupingName, String resourceType, String timestamp) {
+        this(action, commonFields, modifier, categoryName, subCategoryName, groupingName, resourceType);
+        event.setTimestamp1(timestamp);
+    }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getCategoryName(), event.getSubCategoryName(),
-                event.getGroupingName(), event.getResourceType(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getCategoryName(), event.getSubCategoryName(),
+                event.getGroupingName(), event.getResourceType(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -25,10 +48,5 @@ public abstract class AuditCategoryEventFactory extends AuditBaseEventFactory {
         return event;
     }
 
-    public AuditCategoryEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier,
-                                     String categoryName, String subCategoryName, String groupingName, String resourceType) {
-        super(action);
-        event = new CategoryEvent(getAction().getName(), commonFields, buildUserName(modifier), categoryName,
-                subCategoryName, groupingName, resourceType);
-    }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java
index 8c4de3c43d..a007174b32 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/category/AuditGetCategoryHierarchyEventFactory.java
@@ -9,13 +9,31 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditGetCategoryHierarchyEventFactory extends AuditBaseEventFactory {
 
+    private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final  GetCategoryHierarchyEvent event;
 
-    protected static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    public AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, User modifier, String details) {
+        this(commonFields, buildUserName(modifier), details);
+    }
+
+    public AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, String modifier, String details, String timestamp) {
+        this(commonFields, modifier, details);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditGetCategoryHierarchyEventFactory(CommonAuditData commonFields, String modifier, String details) {
+        super(AuditingActionEnum.GET_CATEGORY_HIERARCHY);
+        event = new GetCategoryHierarchyEvent(getAction().getName(), commonFields, modifier, details);
+    }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -23,8 +41,5 @@ public class AuditGetCategoryHierarchyEventFactory extends AuditBaseEventFactory
         return event;
     }
 
-    public AuditGetCategoryHierarchyEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, String details) {
-        super(action);
-        event = new GetCategoryHierarchyEvent(getAction().getName(), commonFields, buildUserName(modifier), details);
-    }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddKeyDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddKeyDistribEngineEventFactory.java
deleted file mode 100644
index 907d73546f..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddKeyDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditAddKeyDistribEngineEventFactory extends AuditAddRemoveKeyDistribEngineEventFactory {
-
-    public AuditAddKeyDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                String apiKey, String envName, String role) {
-        super(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistribEngineEventFactory.java
deleted file mode 100644
index 5ad7380051..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistribEngineEventFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public abstract class AuditAddRemoveKeyDistribEngineEventFactory extends AuditDistribEngineEventFactory{
-
-    private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" ROLE = \"%s\" " +
-            "API_KEY = \"%s\" STATUS = \"%s\"";
-
-    public AuditAddRemoveKeyDistribEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                      String apiKey, String envName, String role) {
-        super(action, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public String getLogMessage() {
-        String topicName = event.getDnotifTopic() != null ? event.getDnotifTopic() : buildValue(event.getDstatusTopic());
-        return String.format(LOG_STR, event.getAction(), event.getEnvironmentName(), topicName,
-                event.getRole(), event.getApiKey(), event.getStatus());
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..7fd999bc4f
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditAddRemoveKeyDistributionEngineEventFactory.java
@@ -0,0 +1,29 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditAddRemoveKeyDistributionEngineEventFactory extends AuditDistributionEngineEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" ROLE = \"%s\" " +
+            "API_KEY = \"%s\" STATUS = \"%s\"";
+
+    AuditAddRemoveKeyDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, DistributionTopicData distributionTopicData,
+                                                           String apiKey, String envName, String role) {
+        super(action, commonFields, distributionTopicData, null, apiKey, envName, role);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        String topicName = event.getDnotifTopic() != null ? event.getDnotifTopic() : event.getDstatusTopic();
+        return new String[] {event.getAction(), event.getEnvironmentName(), topicName,
+                event.getRole(), event.getApiKey(), event.getStatus()};
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactory.java
deleted file mode 100644
index 7825cca0e9..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistribEngineEventFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditCreateTopicDistribEngineEventFactory extends AuditDistribEngineEventFactory{
-
-   private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" STATUS = \"%s\"";
-
-    public AuditCreateTopicDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                     String apiKey, String envName, String role) {
-        super(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public String getLogMessage() {
-        String topicName = event.getDnotifTopic() != null ? event.getDnotifTopic() : buildValue(event.getDstatusTopic());
-        return String.format(LOG_STR, event.getAction(), event.getEnvironmentName(), topicName, event.getStatus());
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..e8767be0a6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditCreateTopicDistributionEngineEventFactory.java
@@ -0,0 +1,26 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditCreateTopicDistributionEngineEventFactory extends AuditDistributionEngineEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" D_ENV = \"%s\" TOPIC_NAME = \"%s\" STATUS = \"%s\"";
+
+    AuditCreateTopicDistributionEngineEventFactory(CommonAuditData commonFields, DistributionTopicData distributionTopicData,
+                                                          String apiKey, String envName, String role) {
+        super(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, commonFields, distributionTopicData,null, apiKey, envName, role);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getEnvironmentName(), getTopicName(), event.getStatus()};
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactory.java
deleted file mode 100644
index cb86f5059c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDeployEventFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditDistribDeployEventFactory extends AuditBaseEventFactory {
-
-    private DistributionDeployEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
-            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" DID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
-                event.getCurrVersion(), event.getModifier(), event.getDid(), event.getStatus(), event.getDesc());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditDistribDeployEventFactory(CommonAuditData commonFields, String currentVersion,
-                                          String did, User modifier, String resourceName, String resourceType) {
-
-       super(AuditingActionEnum.DISTRIBUTION_DEPLOY);
-       this.event = new DistributionDeployEvent(getAction().getName(), commonFields, did, buildUserName(modifier),
-                                currentVersion, resourceName, resourceType);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribEngineEventFactory.java
deleted file mode 100644
index 3ebacb49d9..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribEngineEventFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionEngineEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public abstract class AuditDistribEngineEventFactory extends AuditBaseEventFactory{
-
-    protected final DistributionEngineEvent event;
-
-    public AuditDistribEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                          String apiKey, String envName, String role) {
-        super(action);
-        event = new DistributionEngineEvent(getAction().getName(), commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactory.java
deleted file mode 100644
index 80c4590b8d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribNotificationEventFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData;
-
-public class AuditDistribNotificationEventFactory extends AuditBaseEventFactory {
-
-    private DistributionNotificationEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
-            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\" DID = \"%s\" " +
-            "TOPIC_NAME = \"%s\" STATUS = \"%s\" DESC = \"%s\" TENANT = \"%s\" VNF_WORKLOAD_CONTEXT = \"%s\" ENV_ID = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
-                event.getCurrVersion(), event.getModifier(), event.getCurrState(), event.getDid(), event.getTopicName(), event.getStatus(), event.getDesc(),
-                event.getTenant(), event.getVnfWorkloadContext(), event.getEnvId());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditDistribNotificationEventFactory(CommonAuditData commonFields, String currentState, String currentVersion,
-                                                String did, User modifier, String resourceName,
-                                                String resourceType, String topicName, OperationalEnvAuditData opEnvFields) {
-
-       super(AuditingActionEnum.DISTRIBUTION_NOTIFY);
-       this.event = new DistributionNotificationEvent(getAction().getName(), commonFields, did, AuditBaseEventFactory.buildUserName(modifier),
-                currentState, currentVersion,resourceName, resourceType, topicName, opEnvFields);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactory.java
deleted file mode 100644
index 3d71a200a3..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribStatusEventFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditDistribStatusEventFactory extends AuditBaseEventFactory {
-
-    private DistributionStatusEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" DID = \"%s\" CONSUMER_ID = \"%s\" " +
-            "TOPIC_NAME = \"%s\" RESOURCE_URL = \"%s\" STATUS_TIME = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getDid(), event.getConsumerId(), event.getTopicName(), event.getResoureURL(),
-                event.getStatusTime(), event.getStatus(), event.getDesc());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditDistribStatusEventFactory(CommonAuditData commonFields, String did, String consumerId, String topicName,
-                                          String resourceURL, String statusTime) {
-
-       super(AuditingActionEnum.DISTRIBUTION_STATUS);
-       this.event = new DistributionStatusEvent(getAction().getName(), commonFields, did, consumerId, topicName, resourceURL, statusTime);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDeployEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDeployEventFactory.java
new file mode 100644
index 0000000000..48d22316f6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDeployEventFactory.java
@@ -0,0 +1,51 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+
+public class AuditDistributionDeployEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
+            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" DID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final DistributionDeployEvent event;
+
+    public AuditDistributionDeployEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                               String did, User modifier, String currentVersion) {
+        this(commonFields, resourceCommonInfo, did, buildUserName(modifier), currentVersion);
+    }
+
+    public AuditDistributionDeployEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                               String did, String modifier, String currentVersion, String timestamp) {
+        this(commonFields, resourceCommonInfo, did, modifier, currentVersion);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditDistributionDeployEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                               String did, String modifier, String currentVersion) {
+        super(AuditingActionEnum.DISTRIBUTION_DEPLOY);
+        event = new DistributionDeployEvent(getAction().getName(), commonFields, resourceCommonInfo, did, modifier,
+                currentVersion);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
+                event.getCurrVersion(), event.getModifier(), event.getDid(), event.getStatus(), event.getDesc()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDownloadEventFactory.java
index e8453b1d0b..cfc177e14e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistribDownloadEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionDownloadEventFactory.java
@@ -7,27 +7,34 @@ import org.openecomp.sdc.be.resources.data.auditing.DistributionDownloadEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
 
-public class AuditDistribDownloadEventFactory extends AuditBaseEventFactory {
-
-    private DistributionDownloadEvent event;
+public class AuditDistributionDownloadEventFactory extends AuditBaseEventFactory {
 
     private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final DistributionDownloadEvent event;
 
-    public AuditDistribDownloadEventFactory(CommonAuditData commonFields, DistributionData distributionData) {
-
+    public AuditDistributionDownloadEventFactory(CommonAuditData commonFields, DistributionData distributionData) {
         super(AuditingActionEnum.DISTRIBUTION_ARTIFACT_DOWNLOAD);
         this.event = new DistributionDownloadEvent(getAction().getName(), commonFields, distributionData);
     }
 
+    public AuditDistributionDownloadEventFactory(CommonAuditData commonFields, DistributionData distributionData, String timestamp) {
+       this(commonFields, distributionData);
+       this.event.setTimestamp1(timestamp);
+    }
+
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceUrl(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceUrl(),
+                event.getStatus(), event.getDesc()};
     }
 
     @Override
     public AuditingGenericEvent getDbEvent() {
         return event;
     }
-
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..f403b97eb8
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactory.java
@@ -0,0 +1,36 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionEngineEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public abstract class AuditDistributionEngineEventFactory extends AuditBaseEventFactory{
+
+    protected final DistributionEngineEvent event;
+
+    AuditDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                               DistributionTopicData distributionTopicData, String consumerId,
+                                               String apiKey, String envName, String role) {
+        super(action);
+        event = new DistributionEngineEvent(getAction().getName(), commonFields, consumerId, distributionTopicData, apiKey, envName, role);
+    }
+
+    AuditDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                               DistributionTopicData distributionTopicData, String consumerId,
+                                               String apiKey, String envName, String role, String timestamp) {
+        this(action, commonFields, distributionTopicData, consumerId, apiKey, envName, role);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    protected String getTopicName() {
+        return event.getDnotifTopic() != null ? event.getDnotifTopic() : event.getDstatusTopic();
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactoryManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactoryManager.java
new file mode 100644
index 0000000000..a03665e966
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventFactoryManager.java
@@ -0,0 +1,40 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+import org.openecomp.sdc.common.util.ThreadLocalsHolder;
+
+public class AuditDistributionEngineEventFactoryManager {
+
+    public static AuditEventFactory createDistributionEngineEventFactory(AuditingActionEnum action, String environmentName,
+                                                                         DistributionTopicData distributionTopicData, String role, String apiKey, String status) {
+        AuditEventFactory factory;
+
+        switch (action) {
+            case CREATE_DISTRIBUTION_TOPIC:
+                factory = new AuditCreateTopicDistributionEngineEventFactory(
+                        CommonAuditData.newBuilder()
+                                .status(status)
+                                .requestId(ThreadLocalsHolder.getUuid())
+                                .build(),
+                        distributionTopicData, apiKey, environmentName, role);
+                break;
+            case ADD_KEY_TO_TOPIC_ACL:
+            case REMOVE_KEY_FROM_TOPIC_ACL:
+                factory = new AuditAddRemoveKeyDistributionEngineEventFactory(action,
+                        CommonAuditData.newBuilder()
+                                .status(status)
+                                .requestId(ThreadLocalsHolder.getUuid())
+                                .build(),
+                        distributionTopicData, apiKey, environmentName, role);
+                break;
+            default:
+                throw new UnsupportedOperationException();
+
+        }
+        return factory;
+
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventMigrationFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventMigrationFactory.java
new file mode 100644
index 0000000000..87a4867597
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionEngineEventMigrationFactory.java
@@ -0,0 +1,24 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditDistributionEngineEventMigrationFactory extends AuditDistributionEngineEventFactory {
+
+    public AuditDistributionEngineEventMigrationFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                                        DistributionTopicData distributionTopicData, String consumerId,
+                                                        String apiKey, String envName, String role, String timestamp) {
+        super(action, commonFields, distributionTopicData, consumerId, apiKey, envName, role, timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return "";
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[0];
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionNotificationEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionNotificationEventFactory.java
new file mode 100644
index 0000000000..7e240b10c6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionNotificationEventFactory.java
@@ -0,0 +1,63 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.OperationalEnvAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+
+public class AuditDistributionNotificationEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" " +
+            "SERVICE_INSTANCE_ID = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\" DID = \"%s\" " +
+            "TOPIC_NAME = \"%s\" STATUS = \"%s\" DESC = \"%s\" TENANT = \"%s\" VNF_WORKLOAD_CONTEXT = \"%s\" ENV_ID = \"%s\"";
+    private final DistributionNotificationEvent event;
+
+    public AuditDistributionNotificationEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                     ResourceVersionInfo resourceVersionInfo,
+                                                     String did, User modifier, String topicName,
+                                                     OperationalEnvAuditData opEnvFields) {
+        this(commonAuditData, resourceCommonInfo,
+                resourceVersionInfo, did, AuditBaseEventFactory.buildUserName(modifier),
+                topicName, opEnvFields);
+    }
+
+    public AuditDistributionNotificationEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                     ResourceVersionInfo resourceVersionInfo,
+                                                     String did, String modifier, String topicName,
+                                                     OperationalEnvAuditData opEnvFields, String timestamp) {
+        this(commonAuditData, resourceCommonInfo, resourceVersionInfo, did, modifier, topicName, opEnvFields);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditDistributionNotificationEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                     ResourceVersionInfo resourceVersionInfo,
+                                                     String did, String modifier, String topicName,
+                                                     OperationalEnvAuditData opEnvFields) {
+        super(AuditingActionEnum.DISTRIBUTION_NOTIFY);
+        this.event = new DistributionNotificationEvent(getAction().getName(), commonAuditData, resourceCommonInfo,
+                resourceVersionInfo, did, modifier, topicName, opEnvFields);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), event.getServiceInstanceId(),
+                event.getCurrVersion(), event.getModifier(), event.getCurrState(), event.getDid(), event.getTopicName(),
+                event.getStatus(), event.getDesc(), event.getTenant(), event.getVnfWorkloadContext(), event.getEnvId()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionStatusEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionStatusEventFactory.java
new file mode 100644
index 0000000000..5719fe2b73
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditDistributionStatusEventFactory.java
@@ -0,0 +1,44 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
+import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+
+public class AuditDistributionStatusEventFactory extends AuditBaseEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" DID = \"%s\" CONSUMER_ID = \"%s\" " +
+            "TOPIC_NAME = \"%s\" RESOURCE_URL = \"%s\" STATUS_TIME = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final DistributionStatusEvent event;
+
+    public AuditDistributionStatusEventFactory(CommonAuditData commonFields, DistributionData distributionData,
+                                               String did, String topicName, String statusTime) {
+        super(AuditingActionEnum.DISTRIBUTION_STATUS);
+        this.event = new DistributionStatusEvent(getAction().getName(), commonFields, distributionData, did,
+                topicName, statusTime);
+    }
+
+    public AuditDistributionStatusEventFactory(CommonAuditData commonFields, DistributionData distributionData,
+                                               String did, String topicName, String statusTime, String timestamp) {
+        this(commonFields, distributionData, did, topicName, statusTime);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getDid(), event.getConsumerId(), event.getTopicName(),
+                event.getResoureURL(), event.getStatusTime(), event.getStatus(), event.getDesc()};
+    }
+
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactory.java
deleted file mode 100644
index 79d524a0dc..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditGetUebClusterEventFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGetUebClusterEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditGetUebClusterEventFactory extends AuditBaseEventFactory {
-
-    private AuditingGetUebClusterEvent event;
-
-    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" STATUS = \"%s\" STATUS_DESC = \"%s\"";
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getStatus(), event.getDesc());
-    }
-
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
-    }
-
-    public AuditGetUebClusterEventFactory(CommonAuditData commonFields, String consumerId) {
-
-       super(AuditingActionEnum.GET_UEB_CLUSTER);
-       this.event = new AuditingGetUebClusterEvent(getAction().getName(), commonFields, consumerId);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistribEngineEventFactory.java
deleted file mode 100644
index 2dbcde7b2c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistribEngineEventFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public abstract class AuditRegUnregDistribEngineEventFactory extends AuditDistribEngineEventFactory {
-
-    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" API_KEY = \"%s\" D_ENV = \"%s\" STATUS = \"%s\"" +
-            " DESC = \"%s\" DNOTIF_TOPIC = \"%s\" DSTATUS_TOPIC = \"%s\"";
-
-    public AuditRegUnregDistribEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String consumerId,
-                                                  String distStatusTopic, String distNotifTopic, String apiKey, String envName, String role) {
-        super(action, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getApiKey(), event.getEnvironmentName(),
-                event.getStatus(), event.getDesc(), event.getDnotifTopic(),event.getDstatusTopic());
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistributionEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistributionEngineEventFactory.java
new file mode 100644
index 0000000000..2dcb902f31
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegUnregDistributionEngineEventFactory.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.auditing.impl.distribution;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+
+public class AuditRegUnregDistributionEngineEventFactory extends AuditDistributionEngineEventFactory {
+
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" API_KEY = \"%s\" D_ENV = \"%s\" STATUS = \"%s\"" +
+            " DESC = \"%s\" DNOTIF_TOPIC = \"%s\" DSTATUS_TOPIC = \"%s\"";
+
+    public AuditRegUnregDistributionEngineEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                                       DistributionTopicData distrTopicData, String consumerId, String apiKey, String envName) {
+        super(action, commonFields, distrTopicData, consumerId, apiKey, envName, null);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getApiKey(),
+                event.getEnvironmentName(), event.getStatus(), event.getDesc(),
+                event.getDnotifTopic(), event.getDstatusTopic()};
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegisterDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegisterDistribEngineEventFactory.java
deleted file mode 100644
index e2ce0312f7..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRegisterDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditRegisterDistribEngineEventFactory extends AuditRegUnregDistribEngineEventFactory {
-
-    public AuditRegisterDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                  String apiKey, String envName, String role) {
-        super(AuditingActionEnum.DISTRIBUTION_REGISTER, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRemoveKeyDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRemoveKeyDistribEngineEventFactory.java
deleted file mode 100644
index fe7f335c77..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditRemoveKeyDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditRemoveKeyDistribEngineEventFactory extends AuditAddRemoveKeyDistribEngineEventFactory {
-
-    public AuditRemoveKeyDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                   String apiKey, String envName, String role) {
-        super(AuditingActionEnum.REMOVE_KEY_FROM_TOPIC_ACL, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditUnregisterDistribEngineEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditUnregisterDistribEngineEventFactory.java
deleted file mode 100644
index d402d38e25..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/distribution/AuditUnregisterDistribEngineEventFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.distribution;
-
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-
-public class AuditUnregisterDistribEngineEventFactory extends AuditRegUnregDistribEngineEventFactory {
-
-    public AuditUnregisterDistribEngineEventFactory(CommonAuditData commonFields, String consumerId, String distStatusTopic, String distNotifTopic,
-                                                    String apiKey, String envName, String role) {
-        super(AuditingActionEnum.DISTRIBUTION_UN_REGISTER, commonFields, consumerId, distStatusTopic, distNotifTopic, apiKey, envName, role);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java
index 942dae0507..f8add1dacf 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditActivateServiceExternalApiEventFactory.java
@@ -3,24 +3,34 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditActivateServiceExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
             " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" DESC = \"%s\"";
 
-    public AuditActivateServiceExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                       String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                       String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ACTIVATE_SERVICE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditActivateServiceExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                       DistributionData distributionData, String invariantUuid, User modifier) {
+        super(AuditingActionEnum.ACTIVATE_SERVICE_BY_API, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                    .build(),
+                ResourceVersionInfo.newBuilder()
+                    .build(),
+                invariantUuid, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getStatus(), event.getServiceInstanceId(),
-                event.getInvariantUuid(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceType(), event.getConsumerId(),
+                event.getResourceURL(), event.getModifier(), event.getStatus(),
+                event.getServiceInstanceId(), event.getInvariantUuid(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java
index 5e6256368e..0199c4ff7c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetExternalApiEventFactory.java
@@ -1,25 +1,34 @@
 package org.openecomp.sdc.be.auditing.impl.externalapi;
 
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
-public abstract class AuditAssetExternalApiEventFactory extends AuditExternalApiEventFactory {
+public class AuditAssetExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" RESOURCE_NAME = \"%s\" " +
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" RESOURCE_NAME = \"%s\" " +
             "RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditAssetExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                             String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                             String invariantUuid, User modifier, String artifactData) {
-        super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditAssetExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                             DistributionData distributionData) {
+        super(action, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                null, null, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceURL(), event.getResourceName(),
-                event.getResourceType(), event.getServiceInstanceId(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(), event.getResourceName(),
+                event.getResourceType(), event.getServiceInstanceId(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java
deleted file mode 100644
index 1a41d7d5f8..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetGetMetadataExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditAssetGetMetadataExternalApiEventFactory extends AuditAssetExternalApiEventFactory {
-
-    public AuditAssetGetMetadataExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                        String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                        String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_ASSET_METADATA, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java
index 13558881c5..d759ca2ba1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditAssetListExternalApiEventFactory.java
@@ -1,24 +1,33 @@
 package org.openecomp.sdc.be.auditing.impl.externalapi;
 
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
-public abstract class AuditAssetListExternalApiEventFactory extends AuditExternalApiEventFactory {
+public class AuditAssetListExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-     public AuditAssetListExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                                  String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                  String invariantUuid, User modifier, String artifactData) {
-        super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditAssetListExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields,
+                                                  DistributionData distributionData) {
+         super(action, commonFields, new ResourceCommonInfo(), distributionData,
+                 ResourceVersionInfo.newBuilder()
+                         .build(),
+                 ResourceVersionInfo.newBuilder()
+                         .build(),
+                 null, null, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getConsumerId(), event.getResourceURL(),
-                event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java
index 060cbd395e..1306efefa7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditChangeLifecycleExternalApiEventFactory.java
@@ -3,25 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditChangeLifecycleExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
+    private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
             " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\"" +
             " PREV_STATE = \"%s\" CURR_STATE = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditChangeLifecycleExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                       String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                       String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditChangeLifecycleExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                       DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                       String invariantUuid, User modifier) {
+        super(AuditingActionEnum.CHANGE_LIFECYCLE_BY_API, commonFields, resourceCommonInfo, distributionData, prevParams, currParams,
+                invariantUuid, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(), event.getPrevState(),
-                event.getCurrState(), event.getServiceInstanceId(), event.getInvariantUuid(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
+                event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(),
+                event.getPrevState(), event.getCurrState(), event.getServiceInstanceId(), event.getInvariantUuid(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java
index 07bac13495..f01d18cf22 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCreateResourceExternalApiEventFactory.java
@@ -3,26 +3,37 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditCreateResourceExternalApiEventFactory extends AuditExternalApiEventFactory {
 
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
-            " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
-            " PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID =  \"%s\" DESC = \"%s\"";
+            " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" CURR_VERSION = \"%s\" CURR_STATE = \"%s\" CURR_ARTIFACT_UUID = \"%s\" " +
+            "STATUS = \"%s\" SERVICE_INSTANCE_ID = \"%s\" INVARIANT_UUID = \"%s\" DESC = \"%s\"";
 
-    public AuditCreateResourceExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                      String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                      String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.CREATE_RESOURCE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditCreateResourceExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                      DistributionData distributionData, ResourceVersionInfo currResourceVersionInfo,
+                                                      String invariantUuid, User modifier) {
+        super(AuditingActionEnum.CREATE_RESOURCE_BY_API, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                currResourceVersionInfo,
+                invariantUuid, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getPrevVersion(), event.getCurrVersion(), event.getPrevState(),
-                event.getCurrState(), event.getPrevArtifactUuid(), event.getCurrArtifactUuid(), event.getStatus(),
-                event.getServiceInstanceId(), event.getInvariantUuid(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getConsumerId(), event.getResourceURL(), event.getModifier(),
+                event.getCurrVersion(), event.getCurrState(), event.getCurrArtifactUuid(),
+                event.getStatus(), event.getServiceInstanceId(), event.getInvariantUuid(),
+                event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java
index fd8be4cc47..a519130a04 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditCrudExternalApiArtifactEventFactory.java
@@ -3,25 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
-public abstract class AuditCrudExternalApiArtifactEventFactory extends AuditExternalApiEventFactory {
+public class AuditCrudExternalApiArtifactEventFactory extends AuditExternalApiEventFactory {
 
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" CONSUMER_ID = \"%s\"" +
             " RESOURCE_URL = \"%s\" MODIFIER = \"%s\" PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" ARTIFACT_DATA = \"%s\"" +
             " STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditCrudExternalApiArtifactEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                                    String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
+    public AuditCrudExternalApiArtifactEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                    DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
                                                     String invariantUuid, User modifier, String artifactData) {
-        super(action, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
+        super(action, commonFields, resourceCommonInfo, distributionData, prevParams, currParams,
                 invariantUuid, modifier, artifactData);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getResourceName(), event.getResourceType(), event.getConsumerId(),
-                event.getResourceURL(), event.getModifier(), event.getPrevArtifactUuid(), event.getCurrArtifactUuid(),
-                event.getArtifactData(), event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getConsumerId(), event.getResourceURL(), event.getModifier(),
+                event.getPrevArtifactUuid(), event.getCurrArtifactUuid(), event.getArtifactData(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java
deleted file mode 100644
index c2827b1e5d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDeleteArtByApiCrudExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditDeleteArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory {
-
-    public AuditDeleteArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                          String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                          String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ARTIFACT_DELETE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java
index 134dfd2921..b09f51c8ec 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditDownloadArtifactExternalApiEventFactory.java
@@ -3,21 +3,31 @@ package org.openecomp.sdc.be.auditing.impl.externalapi;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditDownloadArtifactExternalApiEventFactory extends AuditExternalApiEventFactory {
 
-    private static final String LOG_STR = "CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private static final String LOG_STR = "ACTION = \"%s\" CONSUMER_ID = \"%s\" RESOURCE_URL = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditDownloadArtifactExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                        String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                        String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.DOWNLOAD_ARTIFACT, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
+    public AuditDownloadArtifactExternalApiEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                        DistributionData distributionData, ResourceVersionInfo currResourceVersionInfo,
+                                                        User modifier) {
+        super(AuditingActionEnum.DOWNLOAD_ARTIFACT, commonFields, resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                        .build(),
+                currResourceVersionInfo, null, modifier, null);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getConsumerId(), event.getResourceURL(),event.getStatus(), event.getDesc());
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getConsumerId(), event.getResourceURL(),
+                event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java
index 4e233dee27..9974fee9a7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditExternalApiEventFactory.java
@@ -6,17 +6,23 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 import org.openecomp.sdc.be.resources.data.auditing.ExternalApiEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+import org.openecomp.sdc.common.util.ThreadLocalsHolder;
 
 public abstract class AuditExternalApiEventFactory extends AuditBaseEventFactory {
 
     protected final ExternalApiEvent event;
 
-    public AuditExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String resourceType, String resourceName,
-                                        String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
+    public AuditExternalApiEventFactory(AuditingActionEnum action, CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                        DistributionData distributionData, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
                                         String invariantUuid, User modifier, String artifactData) {
         super(action);
-        event = new ExternalApiEvent(getAction().getName(), commonFields, resourceType, resourceName, consumerId, resourceUrl,
+        if (commonAuditData.getRequestId() == null) {
+            commonAuditData.setRequestId(ThreadLocalsHolder.getUuid());
+        }
+        event = new ExternalApiEvent(getAction().getName(), commonAuditData, resourceCommonInfo, distributionData,
                 prevParams, currParams, AuditBaseEventFactory.buildUserName(modifier), invariantUuid, artifactData) ;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java
deleted file mode 100644
index e97614551f..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetAssetListExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditGetAssetListExternalApiEventFactory extends AuditAssetListExternalApiEventFactory {
-
-    public AuditGetAssetListExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                    String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                    String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_ASSET_LIST, commonFields, resourceType, resourceName,
-                consumerId, resourceUrl, prevParams, currParams, invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java
deleted file mode 100644
index 379124dc4a..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetFilteredAssetListExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditGetFilteredAssetListExternalApiEventFactory extends AuditAssetListExternalApiEventFactory {
-
-    public AuditGetFilteredAssetListExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                            String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                            String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_FILTERED_ASSET_LIST, commonFields, resourceType, resourceName,
-                consumerId, resourceUrl, prevParams, currParams, invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java
deleted file mode 100644
index 168cd1b150..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditGetToscaModelExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditGetToscaModelExternalApiEventFactory extends AuditAssetExternalApiEventFactory {
-
-    public AuditGetToscaModelExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                     String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                     String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.GET_TOSCA_MODEL, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java
deleted file mode 100644
index 5af8ff3d0d..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUpdateArtByApiCrudExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditUpdateArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory {
-
-    public AuditUpdateArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                          String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                          String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ARTIFACT_UPDATE_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java
deleted file mode 100644
index 02af363f46..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/externalapi/AuditUploadArtByApiCrudExternalApiEventFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.openecomp.sdc.be.auditing.impl.externalapi;
-
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
-
-public class AuditUploadArtByApiCrudExternalApiEventFactory extends AuditCrudExternalApiArtifactEventFactory {
-
-    public AuditUploadArtByApiCrudExternalApiEventFactory(CommonAuditData commonFields, String resourceType, String resourceName,
-                                                          String consumerId, String resourceUrl, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                          String invariantUuid, User modifier, String artifactData) {
-        super(AuditingActionEnum.ARTIFACT_UPLOAD_BY_API, commonFields, resourceType, resourceName, consumerId, resourceUrl, prevParams, currParams,
-                invariantUuid, modifier, artifactData);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java
index 9bda0d22d6..6f3336a67d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditArtifactResourceAdminEventFactory.java
@@ -3,31 +3,35 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditArtifactResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " INVARIANT_UUID = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
             " PREV_ARTIFACT_UUID = \"%s\" CURR_ARTIFACT_UUID = \"%s\" ARTIFACT_DATA = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
 
-    public AuditArtifactResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                  String resourceType, String resourceName, String invariantUuid,
-                                                  User modifier, String artifactData, String comment, String did) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditArtifactResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                  ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                  String invariantUuid, User modifier, String artifactData, String comment, String did) {
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        //TODO: check wheather or not "CONSUMER_ID =...RESOURCE_URL = " should be filled out - the info id not in the event
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), buildValue(event.getPrevArtifactUUID()), buildValue(event.getCurrArtifactUUID()),
-                buildValue(event.getArtifactData()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getPrevArtifactUUID(), event.getCurrArtifactUUID(),
+                event.getArtifactData(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java
index f5302957e1..8d387c5524 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCertificationResourceAdminEventFactory.java
@@ -3,28 +3,32 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditCertificationResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " INVARIANT_UUID = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
             " COMMENT = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditCertificationResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                       String resourceType, String resourceName, String invariantUuid,
-                                                       User modifier, String artifactData, String comment, String did) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditCertificationResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                       String invariantUuid, User modifier, String artifactData, String comment, String did) {
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), buildValue(event.getComment()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getComment(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java
index db76b78106..dfad3ef2cc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditCreateUpdateResourceAdminEventFactory.java
@@ -3,28 +3,32 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditCreateUpdateResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     protected static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " INVARIANT_UUID = \"%s\" PREV_VERSION = \"%s\" CURR_VERSION = \"%s\" MODIFIER = \"%s\" PREV_STATE = \"%s\" CURR_STATE = \"%s\"" +
             " STATUS = \"%s\" DESC = \"%s\"";
 
-
-    public AuditCreateUpdateResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                      String resourceType, String resourceName, String invariantUuid,
-                                                      User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditCreateUpdateResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo,
+                                                      ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                      String invariantUuid, User modifier, String artifactData, String comment, String did, String toscaNodeType) {
+        super(action, commonAuditData, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, toscaNodeType);
     }
 
-   @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), event.getStatus(), event.getDesc());
+    @Override
+        public String getLogPattern() {
+            return LOG_STR;
+        }
+
+        @Override
+        public String[] getLogMessageParams() {
+            return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java
index 62f95de6bd..042b4a1007 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeRequestResourceAdminEventFactory.java
@@ -3,28 +3,33 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditDistStateChangeRequestResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\"" +
             " DPREV_STATUS = \"%s\" DCURR_STATUS = \"%s\" DID = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
 
-    public AuditDistStateChangeRequestResourceAdminEventFactory(CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                                String resourceType, String resourceName, String invariantUuid,
-                                                                User modifier, String artifactData, String comment, String did) {
-        super(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditDistStateChangeRequestResourceAdminEventFactory(CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                                ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                                String invariantUuid, User modifier, String artifactData, String comment, String did) {
+        super(AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getCurrVersion()), buildValue(event.getModifier()),
-                buildValue(event.getCurrState()), buildValue(event.getDprevStatus()), buildValue(event.getDcurrStatus()),
-                buildValue(event.getDid()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getCurrVersion(), event.getModifier(),
+                event.getCurrState(), event.getDprevStatus(), event.getDcurrStatus(),
+                event.getDid(), event.getStatus(), event.getDesc()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java
index 3fd41b9681..77fa0c90bc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditDistStateChangeResourceAdminEventFactory.java
@@ -3,29 +3,35 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.common.api.Constants;
 
 public class AuditDistStateChangeResourceAdminEventFactory extends AuditResourceAdminEventFactory {
 
-
     private static final String LOG_STR = "ACTION = \"%s\" RESOURCE_NAME = \"%s\" RESOURCE_TYPE = \"%s\" SERVICE_INSTANCE_ID = \"%s\"" +
             " CURR_VERSION = \"%s\" MODIFIER = \"%s\" CURR_STATE = \"%s\"" +
             " DPREV_STATUS = \"%s\" DCURR_STATUS = \"%s\" STATUS = \"%s\" DESC = \"%s\" COMMENT = \"%s\"";
 
 
-    public AuditDistStateChangeResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams,
-                                                         ResourceAuditData currParams, String resourceType, String resourceName, String invariantUuid,
+    public AuditDistStateChangeResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                         ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
                                                          User modifier, String artifactData, String comment, String did) {
-        super(action, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, Constants.EMPTY_STRING);
     }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getCurrVersion()), buildValue(event.getModifier()),
-                buildValue(event.getCurrState()), buildValue(event.getDprevStatus()), buildValue(event.getDcurrStatus()),
-                buildValue(event.getStatus()), buildValue(event.getDesc()), buildValue(event.getComment()));
+    public String getLogPattern() {
+        return LOG_STR;
     }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getCurrVersion(), event.getModifier(),
+                event.getCurrState(), event.getDprevStatus(), event.getDcurrStatus(),
+                event.getStatus(), event.getDesc(), event.getComment()};
+    }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java
index 64da0fd6db..414e8aab4b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditImportResourceAdminEventFactory.java
@@ -3,32 +3,35 @@ package org.openecomp.sdc.be.auditing.impl.resourceadmin;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public class AuditImportResourceAdminEventFactory extends AuditCreateUpdateResourceAdminEventFactory {
 
-
     private static final String LOG_STR_TOSCA = LOG_STR + " TOSCA_NODE_TYPE = \"%s\"" ;
 
-
-    public AuditImportResourceAdminEventFactory(CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                String resourceType, String resourceName, String invariantUuid,
-                                                User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        super(AuditingActionEnum.IMPORT_RESOURCE, commonFields, prevParams, currParams, resourceType, resourceName, invariantUuid,
+    public AuditImportResourceAdminEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
+                                                String invariantUuid, User modifier, String artifactData, String comment, String did, String toscaNodeType) {
+        super(AuditingActionEnum.IMPORT_RESOURCE, commonAuditData, resourceCommonInfo, prevParams, currParams, invariantUuid,
                 modifier, artifactData, comment, did, toscaNodeType);
     }
 
-    public AuditImportResourceAdminEventFactory(CommonAuditData commonFields, ResourceAuditData prevParams, ResourceAuditData currParams,
-                                                String resourceType, String resourceName,
+    public AuditImportResourceAdminEventFactory(CommonAuditData commonAuditData, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams, ResourceVersionInfo currParams,
                                                 String invariantUuid, User modifier, String toscaNodeType) {
-        super(AuditingActionEnum.IMPORT_RESOURCE, commonFields,  prevParams, currParams, resourceType, resourceName, invariantUuid,
+        super(AuditingActionEnum.IMPORT_RESOURCE, commonAuditData, resourceCommonInfo, prevParams, currParams, invariantUuid,
                    modifier, null, null, null, toscaNodeType);
     }
 
-    @Override    public String getLogMessage() {
-        return String.format(LOG_STR_TOSCA, event.getAction(), buildValue(event.getResourceName()), buildValue(event.getResourceType()),
-                buildValue(event.getServiceInstanceId()), buildValue(event.getInvariantUUID()), buildValue(event.getPrevVersion()),
-                buildValue(event.getCurrVersion()), buildValue(event.getModifier()), buildValue(event.getPrevState()),
-                buildValue(event.getCurrState()), buildValue(event.getStatus()), buildValue(event.getDesc()), buildValue(event.getToscaNodeType()));
+    @Override
+    public String getLogPattern() {
+        return LOG_STR_TOSCA;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getResourceName(), event.getResourceType(),
+                event.getServiceInstanceId(), event.getInvariantUUID(), event.getPrevVersion(),
+                event.getCurrVersion(), event.getModifier(), event.getPrevState(),
+                event.getCurrState(), event.getStatus(), event.getDesc(), event.getToscaNodeType()};
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java
index 2a188d2c1a..9d8836becd 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventFactory.java
@@ -6,22 +6,38 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 
 public abstract class AuditResourceAdminEventFactory extends AuditBaseEventFactory {
 
     protected final ResourceAdminEvent event;
 
-    public AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceAuditData prevParams,
-                                          ResourceAuditData currParams, String resourceType, String resourceName, String invariantUuid,
+    AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevParams,
+                                          ResourceVersionInfo currParams, String invariantUuid,
                                           User modifier, String artifactData, String comment, String did, String toscaNodeType) {
-        super(action);
-
-        this.event = new ResourceAdminEvent(action.getName(), commonFields, prevParams, currParams, resourceType,
-                resourceName, invariantUuid, AuditBaseEventFactory.buildUserName(modifier),
+        this(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, AuditBaseEventFactory.buildUserName(modifier),
                 artifactData, AuditBaseEventFactory.replaceNullNameWithEmpty(comment), did, toscaNodeType);
     }
 
+    AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                          ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                          String modifier, String artifactData, String comment, String did,
+                                          String toscaNodeType, String timestamp) {
+        this(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, modifier,
+                artifactData, comment, did, toscaNodeType);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditResourceAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                          ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                          String modifier, String artifactData, String comment, String did,
+                                          String toscaNodeType) {
+        super(action);
+        this.event = new ResourceAdminEvent(getAction().getName(), commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, modifier,
+                artifactData, comment, did, toscaNodeType);
+    }
+
     @Override
     public AuditingGenericEvent getDbEvent() {
         return event;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventMigrationFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventMigrationFactory.java
new file mode 100644
index 0000000000..3dad5259ac
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceAdminEventMigrationFactory.java
@@ -0,0 +1,27 @@
+package org.openecomp.sdc.be.auditing.impl.resourceadmin;
+
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+
+public class AuditResourceAdminEventMigrationFactory extends AuditResourceAdminEventFactory {
+
+    public AuditResourceAdminEventMigrationFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                   ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                                   String modifier, String artifactData, String comment, String did,
+                                                   String toscaNodeType, String timestamp) {
+        super(action, commonFields, resourceCommonInfo, prevParams, currParams, invariantUuid, modifier,
+                artifactData, comment, did, toscaNodeType, timestamp);
+    }
+
+    @Override
+    public String getLogPattern() {
+        return "";
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[0];
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceEventFactoryManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceEventFactoryManager.java
new file mode 100644
index 0000000000..690a0464df
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/resourceadmin/AuditResourceEventFactoryManager.java
@@ -0,0 +1,69 @@
+package org.openecomp.sdc.be.auditing.impl.resourceadmin;
+
+import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
+import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+
+public class AuditResourceEventFactoryManager {
+
+
+    public static AuditEventFactory createResourceEventFactory(AuditingActionEnum action, CommonAuditData commonFields, ResourceCommonInfo resourceCommonInfo,
+                                                               ResourceVersionInfo prevParams, ResourceVersionInfo currParams, String invariantUuid,
+                                                               User modifier, String artifactData, String comment, String did, String toscaNodeType) {
+        AuditBaseEventFactory factory = null;
+
+        switch (action) {
+            case IMPORT_RESOURCE:
+                factory = new AuditImportResourceAdminEventFactory(commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did, toscaNodeType);
+                break;
+            case CREATE_RESOURCE:
+            case CREATE_SERVICE:
+            case UPDATE_RESOURCE_METADATA:
+            case ARCHIVE_COMPONENT:
+            case RESTORE_COMPONENT:
+            case UPDATE_SERVICE_METADATA:
+                factory = new AuditCreateUpdateResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did, org.openecomp.sdc.common.api.Constants.EMPTY_STRING);
+                break;
+            case CHECKIN_RESOURCE:
+            case CHECKOUT_RESOURCE:
+            case UNDO_CHECKOUT_RESOURCE:
+            case CERTIFICATION_REQUEST_RESOURCE:
+            case START_CERTIFICATION_RESOURCE:
+            case CERTIFICATION_SUCCESS_RESOURCE:
+            case FAIL_CERTIFICATION_RESOURCE:
+            case CANCEL_CERTIFICATION_RESOURCE:
+            case UPDATE_SERVICE_REFERENCE:
+            case VF_UPGRADE_SERVICES:
+                factory = new AuditCertificationResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did);
+                break;
+            case ARTIFACT_UPLOAD:
+            case ARTIFACT_DELETE:
+            case ARTIFACT_METADATA_UPDATE:
+            case ARTIFACT_PAYLOAD_UPDATE:
+            case ARTIFACT_DOWNLOAD:
+                factory = new AuditArtifactResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                        invariantUuid, modifier, artifactData, comment, did);
+                break;
+            case DISTRIBUTION_STATE_CHANGE_REQUEST:
+                factory = new AuditDistStateChangeRequestResourceAdminEventFactory(commonFields, resourceCommonInfo, prevParams, currParams,
+                         invariantUuid, modifier, artifactData, comment, did);
+                break;
+            case DISTRIBUTION_STATE_CHANGE_APPROV:
+            case DISTRIBUTION_STATE_CHANGE_REJECT:
+                factory = new AuditDistStateChangeResourceAdminEventFactory(action, commonFields, resourceCommonInfo, prevParams, currParams,
+                         invariantUuid, modifier, artifactData, comment, did);
+                break;
+            default:
+                throw new UnsupportedOperationException();
+        }
+        return factory;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java
index c7ea8cc428..22220dc729 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditGetUsersListEventFactory.java
@@ -8,19 +8,34 @@ import org.openecomp.sdc.be.resources.data.auditing.GetUsersListEvent;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditGetUsersListEventFactory extends AuditBaseEventFactory {
-    private final GetUsersListEvent event;
 
     private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" DETAILS = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final GetUsersListEvent event;
 
     public AuditGetUsersListEventFactory(CommonAuditData commonFields, User modifier,
                                          String userDetails) {
+        this(commonFields, AuditBaseEventFactory.buildUserName(modifier), userDetails);
+    }
+
+    public AuditGetUsersListEventFactory(CommonAuditData commonFields, String modifier,
+                                         String userDetails, String timestamp) {
+        this(commonFields, modifier, userDetails);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditGetUsersListEventFactory(CommonAuditData commonFields, String modifier, String userDetails) {
         super(AuditingActionEnum.GET_USERS_LIST);
-        event = new GetUsersListEvent(getAction().getName(), commonFields, AuditBaseEventFactory.buildUserName(modifier), userDetails);
+        event = new GetUsersListEvent(getAction().getName(), commonFields, modifier, userDetails);
     }
 
-   @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc());
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getDetails(), event.getStatus(), event.getDesc()};
     }
 
     @Override
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java
index 4f97ae12c9..758e5858c9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAccessEventFactory.java
@@ -9,26 +9,36 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditUserAccessEventFactory extends AuditBaseEventFactory {
 
-    protected final static String LOG_STR = "ACTION = \"%s\" USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
-
+    private final static String LOG_STR = "ACTION = \"%s\" USER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
     private final UserAccessEvent event;
 
+    public AuditUserAccessEventFactory(CommonAuditData commonFields, User user) {
+        this(commonFields, AuditBaseEventFactory.buildUserName(user));
+    }
 
-    @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, event.getAction(), event.getUserUid(), event.getStatus(), event.getDesc());
+    public AuditUserAccessEventFactory(CommonAuditData commonFields, String user, String timestamp) {
+        this(commonFields, user);
+        this.event.setTimestamp1(timestamp);
     }
 
-    @Override
-    public AuditingGenericEvent getDbEvent() {
-        return event;
+    private AuditUserAccessEventFactory(CommonAuditData commonFields, String user) {
+        super(AuditingActionEnum.USER_ACCESS);
+        event = new UserAccessEvent(getAction().getName(), commonFields, user);
     }
 
+    @Override
+    public String getLogPattern() {
+        return LOG_STR;
+    }
 
-    public AuditUserAccessEventFactory(CommonAuditData commonFields, User user) {
-        super(AuditingActionEnum.USER_ACCESS);
-        event = new UserAccessEvent(getAction().getName(), commonFields, AuditBaseEventFactory.buildUserName(user));
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getUserUid(), event.getStatus(), event.getDesc()};
     }
 
+    @Override
+    public AuditingGenericEvent getDbEvent() {
+        return event;
+    }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java
index 9c19c49b2d..cfe76a4c4d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/auditing/impl/usersadmin/AuditUserAdminEventFactory.java
@@ -9,14 +9,37 @@ import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
 
 public class AuditUserAdminEventFactory extends AuditBaseEventFactory {
 
-    final private UserAdminEvent event;
+    private static final String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" USER_BEFORE = \"%s\" USER_AFTER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    private final UserAdminEvent event;
 
-    protected final static String LOG_STR = "ACTION = \"%s\" MODIFIER = \"%s\" USER_BEFORE = \"%s\" USER_AFTER = \"%s\" STATUS = \"%s\" DESC = \"%s\"";
+    public AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, User userBefore, User userAfter) {
+        this(action, commonFields, AuditBaseEventFactory.buildUserName(modifier),
+                AuditBaseEventFactory.buildUserNameExtended(userBefore),
+                AuditBaseEventFactory.buildUserNameExtended(userAfter));
+    }
+
+    //Used by migration util
+    public AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String userBefore,
+                                      String userAfter, String timestamp) {
+        this(action, commonFields, modifier, userBefore, userAfter);
+        this.event.setTimestamp1(timestamp);
+    }
+
+    private AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, String modifier, String userBefore,
+                                      String userAfter) {
+        super(action);
+        event = new UserAdminEvent(action.getName(), commonFields, modifier, userBefore, userAfter);
+    }
 
     @Override
-    public String getLogMessage() {
-        return String.format(LOG_STR, buildValue(event.getAction()), buildValue(event.getModifier()), buildValue(event.getUserBefore()),
-                buildValue(event.getUserAfter()), buildValue(event.getStatus()), buildValue(event.getDesc()));
+    public String getLogPattern() {
+        return LOG_STR;
+    }
+
+    @Override
+    public String[] getLogMessageParams() {
+        return new String[] {event.getAction(), event.getModifier(), event.getUserBefore(),
+                event.getUserAfter(), event.getStatus(), event.getDesc()};
     }
 
     @Override
@@ -24,10 +47,5 @@ public class AuditUserAdminEventFactory extends AuditBaseEventFactory {
         return event;
     }
 
-    public AuditUserAdminEventFactory(AuditingActionEnum action, CommonAuditData commonFields, User modifier, User userBefore, User userAfter) {
-        super(action);
-        event = new UserAdminEvent(getAction().getName(), commonFields, AuditBaseEventFactory.buildUserName(modifier),
-                AuditBaseEventFactory.buildUserNameExtended(userBefore),
-                AuditBaseEventFactory.buildUserNameExtended(userAfter));
-     }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java
index 9a71adb0cb..ebce6e6fca 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java
@@ -1,21 +1,9 @@
 package org.openecomp.sdc.be.components.csar;
 
-import static org.openecomp.sdc.be.tosca.CsarUtils.ARTIFACTS_PATH;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -32,22 +20,13 @@ import org.openecomp.sdc.be.config.Configuration.VfModuleProperty;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.utils.ArtifactUtils;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.info.ArtifactTemplateInfo;
 import org.openecomp.sdc.be.info.MergedArtifactInfo;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.CsarInfo;
-import org.openecomp.sdc.be.model.GroupDefinition;
-import org.openecomp.sdc.be.model.GroupProperty;
-import org.openecomp.sdc.be.model.GroupTypeDefinition;
-import org.openecomp.sdc.be.model.HeatParameterDefinition;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.heat.HeatParameterType;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
@@ -56,23 +35,30 @@ import org.openecomp.sdc.be.tosca.CsarUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
+import static org.openecomp.sdc.be.tosca.CsarUtils.ARTIFACTS_PATH;
 
 
 @org.springframework.stereotype.Component("csarArtifactsAndGroupsBusinessLogic")
 public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(CsarArtifactsAndGroupsBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(CsarArtifactsAndGroupsBusinessLogic.class.getName());
+    public static final String ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME = "Artifact  file is not in expected formatr, fileName  {}";
+    public static final String ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMAT_FILE_NAME = "Artifact  file is not in expected format, fileName  {}";
+    public static final String ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME1 = "Artifact  file is not in expected formatr, fileName ";
+    public static final String ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMAT_FILE_NAME1 = "Artifact  file is not in expected format, fileName ";
+    public static final String ARTIFACT_INTERNALS_ARE_INVALID = "Artifact internals are invalid";
+    public static final String ARTIFACT_WITH_NAME_AND_TYPE_ALREADY_EXIST_WITH_TYPE = "Artifact with name {} and type {} already exist with type  {}";
     private final Gson gson = new Gson();
     private static final Pattern pattern = Pattern.compile("\\..(.*?)\\..");
     @Autowired
@@ -83,13 +69,13 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
             boolean shouldLock, boolean inTransaction) {
 
         log.debug("parseResourceArtifactsInfoFromFile start");
-        return  parseResourceArtifactsInfoFromFile(resource, artifactsMetaFile, artifactsMetaFileName, csarInfo.getModifier())
+        return  parseResourceArtifactsInfoFromFile(resource, artifactsMetaFile, artifactsMetaFileName)
                 .left()
                 .bind( p-> createResourceArtifacts(csarInfo, resource, p, createdArtifacts,shouldLock, inTransaction))
                 .right()
                 .map(rf -> { componentsUtils.auditResource(rf, csarInfo.getModifier(), resource, AuditingActionEnum.IMPORT_RESOURCE); return rf;})
                 .left()
-                .bind( c -> getResourcetFromGraph(c));
+                .bind(this::getResourcetFromGraph);
     }
 
 
@@ -100,7 +86,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         Resource updatedResource = resource;
 
         Either<Map<String, List<ArtifactTemplateInfo>>, ResponseFormat> parseResourceInfoFromYamlEither = parseResourceArtifactsInfoFromFile(
-                updatedResource, artifactsMetaFile, artifactsMetaFileName, csarInfo.getModifier());
+                updatedResource, artifactsMetaFile, artifactsMetaFileName);
         if (parseResourceInfoFromYamlEither.isRight()) {
             ResponseFormat responseFormat = parseResourceInfoFromYamlEither.right().value();
             componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, AuditingActionEnum.IMPORT_RESOURCE);
@@ -190,7 +176,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         ////////////// dissociate, associate or create
         ////////////// artifacts////////////////////////////
         Either<Resource, ResponseFormat> assDissotiateEither = associateAndDissociateArtifactsToGroup(csarInfo,
-                updatedResource, createdNewArtifacts, labelCounter, shouldLock, inTransaction,
+                updatedResource, createdNewArtifacts, labelCounter, inTransaction,
                 createdDeplymentArtifactsAfterDelete, mergedgroup, deletedArtifacts);
         groups = updatedResource.getGroups();
         if (assDissotiateEither.isRight()) {
@@ -212,7 +198,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         Set<GroupDefinition> groupForAssociateWithMembers = mergedgroup.keySet();
         if (groups != null && !groups.isEmpty()) {
             Either<List<GroupDefinition>, ResponseFormat> validateUpdateVfGroupNamesRes = groupBusinessLogic
-                    .validateUpdateVfGroupNamesOnGraph(groups, updatedResource, inTransaction);
+                    .validateUpdateVfGroupNamesOnGraph(groups, updatedResource);
             if (validateUpdateVfGroupNamesRes.isRight()) {
                 return Either.right(validateUpdateVfGroupNamesRes.right().value());
             }
@@ -263,7 +249,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
 
         }
         if (!newArtifactsGroup.isEmpty()) {
-            Collections.sort(newArtifactsGroup, (art1, art2) -> ArtifactTemplateInfo.compareByGroupName(art1, art2));
+            Collections.sort(newArtifactsGroup, ArtifactTemplateInfo::compareByGroupName);
             int startGroupCounter = groupBusinessLogic.getNextVfModuleNameCounter(groups);
             Either<Boolean, ResponseFormat> validateGroupNamesRes = groupBusinessLogic
                     .validateGenerateVfModuleGroupNames(newArtifactsGroup, updatedResource.getSystemName(), startGroupCounter);
@@ -285,7 +271,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
                     .collect(Collectors.toList());
 
             Either<List<GroupDefinition>, ResponseFormat> updateVersionEither = groupBusinessLogic
-                    .updateGroups(updatedResource, groupsId);
+                    .updateGroups(updatedResource, groupsId, true);
             if (updateVersionEither.isRight()) {
                 log.debug("Failed to update groups version. Status is {} ", updateVersionEither.right().value());
 
@@ -295,7 +281,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         }
         if (artifactsWithoutGroups != null && !artifactsWithoutGroups.isEmpty()) {
             for (ArtifactTemplateInfo t : artifactsWithoutGroups) {
-                List<ArtifactTemplateInfo> arrtifacts = new ArrayList<ArtifactTemplateInfo>();
+                List<ArtifactTemplateInfo> arrtifacts = new ArrayList<>();
                 arrtifacts.add(t);
                 Either<Resource, ResponseFormat> resStatus = createGroupDeploymentArtifactsFromCsar(csarInfo, updatedResource,
                         arrtifacts, createdNewArtifacts, createdDeplymentArtifactsAfterDelete, labelCounter, shouldLock,
@@ -337,7 +323,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
                 } 
             }
         }
-        
+	        
         return artifactsToDelete;
     }
 
@@ -403,7 +389,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
 
     @SuppressWarnings({ "unchecked", "static-access" })
     public Either<Map<String, List<ArtifactTemplateInfo>>, ResponseFormat> parseResourceArtifactsInfoFromFile(
-            Resource resource, String artifactsMetaFile, String artifactFileName, User user) {
+            Resource resource, String artifactsMetaFile, String artifactFileName) {
 
         try {
             JsonObject jsonElement = new JsonObject();
@@ -411,10 +397,10 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
 
             JsonElement importStructureElement = jsonElement.get(Constants.IMPORT_STRUCTURE);
             if (importStructureElement == null || importStructureElement.isJsonNull()) {
-                log.debug("Artifact  file is not in expected formatr, fileName  {}", artifactFileName);
+                log.debug(ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME, artifactFileName);
                 BeEcompErrorManager.getInstance().logInternalDataError(
-                        "Artifact  file is not in expected formatr, fileName " + artifactFileName,
-                        "Artifact internals are invalid", ErrorSeverity.ERROR);
+                        ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME1 + artifactFileName,
+                        ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                 return Either
                         .right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, artifactFileName));
             }
@@ -422,10 +408,10 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
             Map<String, List<Map<String, Object>>> artifactTemplateMap = new HashMap<>();
             artifactTemplateMap = ComponentsUtils.parseJsonToObject(importStructureElement.toString(), HashMap.class);
             if (artifactTemplateMap.isEmpty()) {
-                log.debug("Artifact  file is not in expected formatr, fileName  {}", artifactFileName);
+                log.debug(ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME, artifactFileName);
                 BeEcompErrorManager.getInstance().logInternalDataError(
-                        "Artifact  file is not in expected formatr, fileName " + artifactFileName,
-                        "Artifact internals are invalid", ErrorSeverity.ERROR);
+                        ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME1 + artifactFileName,
+                        ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                 return Either
                         .right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, artifactFileName));
             }
@@ -450,11 +436,11 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
             }
             return Either.left(artifactsMap);
         } catch (Exception e) {
-            log.debug("Artifact  file is not in expected format, fileName  {}", artifactFileName);
+            log.debug(ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMAT_FILE_NAME, artifactFileName);
             log.debug("failed with exception.", e);
             BeEcompErrorManager.getInstance().logInternalDataError(
-                    "Artifact  file is not in expected format, fileName " + artifactFileName,
-                    "Artifact internals are invalid", ErrorSeverity.ERROR);
+                    ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMAT_FILE_NAME1 + artifactFileName,
+                    ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, artifactFileName));
         }
 
@@ -467,18 +453,18 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         Either<List<ArtifactTemplateInfo>, ResponseFormat> artifactTemplateInfoListPairStatus = createArtifactTemplateInfoModule(
                 artifactsTypeKey, o);
         if (artifactTemplateInfoListPairStatus.isRight()) {
-            log.debug("Artifact  file is not in expected formatr, fileName  {}", artifactFileName);
+            log.debug(ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME, artifactFileName);
             BeEcompErrorManager.getInstance().logInternalDataError(
-                    "Artifact  file is not in expected format, fileName " + artifactFileName,
-                    "Artifact internals are invalid", ErrorSeverity.ERROR);
+                    ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMAT_FILE_NAME1 + artifactFileName,
+                    ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(artifactTemplateInfoListPairStatus.right().value());
         }
         List<ArtifactTemplateInfo> artifactTemplateInfoList = artifactTemplateInfoListPairStatus.left().value();
         if (artifactTemplateInfoList == null) {
-            log.debug("Artifact  file is not in expected formatr, fileName  {}", artifactFileName);
+            log.debug(ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME, artifactFileName);
             BeEcompErrorManager.getInstance().logInternalDataError(
-                    "Artifact  file is not in expected format, fileName " + artifactFileName,
-                    "Artifact internals are invalid", ErrorSeverity.ERROR);
+                    ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMAT_FILE_NAME1 + artifactFileName,
+                    ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(
                     componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, artifactFileName));
 
@@ -562,7 +548,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         }
 
         Either<List<GroupDefinition>, ResponseFormat> createGroups = groupBusinessLogic
-                .addGroups(component.left().value(), needToCreate);
+                .addGroups(component.left().value(), needToCreate, false);
         if (createGroups.isRight()) {
             return Either.right(createGroups.right().value());
         }
@@ -628,7 +614,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         if(createdArtifact == null){
 
             Either<ArtifactDefinition, ResponseFormat> newArtifactEither = createDeploymentArtifact(csarInfo, resource,
-                    artifactPath, artifactTemplateInfo, createdArtifacts, labelCounter,  inTransaction);
+                    artifactPath, artifactTemplateInfo, createdArtifacts, labelCounter);
             if (newArtifactEither.isRight()) {
                 resStatus = Either.right(newArtifactEither.right().value());
                 return resStatus;
@@ -692,11 +678,11 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         if(op.isPresent()){
             res = op.get();
             if (!res.getArtifactType().equalsIgnoreCase(artifactTemplateInfo.getType())) {
-                log.debug("Artifact with name {} and type {} already exist with type  {}", artifactFileName,
+                log.debug(ARTIFACT_WITH_NAME_AND_TYPE_ALREADY_EXIST_WITH_TYPE, artifactFileName,
                         artifactTemplateInfo.getType(), res.getArtifactType());
                 BeEcompErrorManager.getInstance().logInternalDataError(
-                        "Artifact  file is not in expected formatr, fileName " + artifactFileName,
-                        "Artifact internals are invalid", ErrorSeverity.ERROR);
+                        ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME1 + artifactFileName,
+                        ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                 return Either.right(componentsUtils.getResponseFormat(
                         ActionStatus.ARTIFACT_ALRADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR, artifactFileName,
                         artifactTemplateInfo.getType(), res.getArtifactType()));
@@ -708,8 +694,8 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
     }
 
     private Either<ArtifactDefinition, ResponseFormat> createDeploymentArtifact(CsarInfo csarInfo, Resource resource,
-            String artifactPath, ArtifactTemplateInfo artifactTemplateInfo, List<ArtifactDefinition> createdArtifacts,
-            int label, boolean inTransaction) {
+                                                                                String artifactPath, ArtifactTemplateInfo artifactTemplateInfo, List<ArtifactDefinition> createdArtifacts,
+                                                                                int label) {
         int updatedlabel = label;
         final String artifactFileName = artifactTemplateInfo.getFileName();
         Either<ImmutablePair<String, byte[]>, ResponseFormat> artifactContententStatus = CsarValidationUtils
@@ -721,7 +707,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         updatedlabel += createdArtifacts.size();
 
         Map<String, Object> json = ArtifactUtils.buildJsonForArtifact(artifactTemplateInfo,
-                artifactContententStatus.left().value().getValue(), updatedlabel);
+                artifactContententStatus.left().value().getValue(), updatedlabel, true);
 
         Either<Either<ArtifactDefinition, Operation>, ResponseFormat> uploadArtifactToService = createOrUpdateCsarArtifactFromJson(
                 resource, csarInfo.getModifier(), json,
@@ -905,6 +891,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         String origMd5 = GeneralUtility.calculateMD5Base64EncodedByString(jsonStr);
         ArtifactDefinition artifactDefinitionFromJson = RepresentationUtils.convertJsonToArtifactDefinition(jsonStr,
                 ArtifactDefinition.class);
+		
         String artifactUniqueId = artifactDefinitionFromJson == null ? null : artifactDefinitionFromJson.getUniqueId();
         Either<Either<ArtifactDefinition, Operation>, ResponseFormat> uploadArtifactToService = artifactsBusinessLogic
                 .validateAndHandleArtifact(resource.getUniqueId(), ComponentTypeEnum.RESOURCE, operation,
@@ -1018,7 +1005,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
             List<PropertyDefinition> groupTypeProperties) {
 
         Map<String, GroupProperty> propertiesMap = properties.stream()
-                .collect(Collectors.toMap(p -> p.getName(), p -> p));
+                .collect(Collectors.toMap(PropertyDataDefinition::getName, p -> p));
         for (PropertyDefinition groupTypeProperty : groupTypeProperties) {
             if (!propertiesMap.containsKey(groupTypeProperty.getName())) {
                 properties.add(new GroupProperty(groupTypeProperty));
@@ -1292,7 +1279,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         }
         updatedResource = component.left().value();
 
-         Either<List<GroupDefinition>, ResponseFormat> addGroups = groupBusinessLogic.addGroups(updatedResource, needToAdd);
+         Either<List<GroupDefinition>, ResponseFormat> addGroups = groupBusinessLogic.addGroups(updatedResource, needToAdd, false);
         if (addGroups.isRight()) {
             return Either.right(addGroups.right().value());
         }
@@ -1318,11 +1305,11 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
                     artifactUid = artifactFromResource.getUniqueId();
                     artifactUUID = artifactFromResource.getArtifactUUID();
                     if (!artifactFromResource.getArtifactType().equalsIgnoreCase(artifactTemplateInfo.getType())) {
-                        log.debug("Artifact with name {} and type {} already exist with type  {}", artifactFileName,
+                        log.debug(ARTIFACT_WITH_NAME_AND_TYPE_ALREADY_EXIST_WITH_TYPE, artifactFileName,
                                 artifactTemplateInfo.getType(), artifactFromResource.getArtifactType());
                         BeEcompErrorManager.getInstance().logInternalDataError(
-                                "Artifact  file is not in expected formatr, fileName " + artifactFileName,
-                                "Artifact internals are invalid", ErrorSeverity.ERROR);
+                                ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME1 + artifactFileName,
+                                ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                         return Either.right(componentsUtils.getResponseFormat(
                                 ActionStatus.ARTIFACT_ALRADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR, artifactFileName,
                                 artifactTemplateInfo.getType(), artifactFromResource.getArtifactType()));
@@ -1342,11 +1329,11 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
                     artifactUUID = createdArtifact.getArtifactUUID();
 
                     if (!createdArtifact.getArtifactType().equalsIgnoreCase(artifactTemplateInfo.getType())) {
-                        log.debug("Artifact with name {} and type {} already exist with type  {}", artifactFileName,
+                        log.debug(ARTIFACT_WITH_NAME_AND_TYPE_ALREADY_EXIST_WITH_TYPE, artifactFileName,
                                 artifactTemplateInfo.getType(), createdArtifact.getArtifactType());
                         BeEcompErrorManager.getInstance().logInternalDataError(
-                                "Artifact  file is not in expected formatr, fileName " + artifactFileName,
-                                "Artifact internals are invalid", ErrorSeverity.ERROR);
+                                ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME1 + artifactFileName,
+                                ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                         return Either.right(componentsUtils.getResponseFormat(
                                 ActionStatus.ARTIFACT_ALRADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR, artifactFileName,
                                 artifactTemplateInfo.getType(), createdArtifact.getArtifactType()));
@@ -1362,7 +1349,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
         if (!alreadyExist) {
 
             Either<ArtifactDefinition, ResponseFormat> newArtifactEither = createDeploymentArtifact(csarInfo, resource,
-                    ARTIFACTS_PATH, artifactTemplateInfo, createdArtifacts, labelCounter, inTransaction);
+                    ARTIFACTS_PATH, artifactTemplateInfo, createdArtifacts, labelCounter);
             if (newArtifactEither.isRight()) {
                 resStatus = Either.right(newArtifactEither.right().value());
                 return resStatus;
@@ -1405,9 +1392,9 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
     }
 
     private Either<Resource, ResponseFormat> associateAndDissociateArtifactsToGroup(CsarInfo csarInfo,
-            Resource resource, List<ArtifactDefinition> createdNewArtifacts, int labelCounter, boolean shouldLock,
-            boolean inTransaction, List<ArtifactDefinition> createdDeplymentArtifactsAfterDelete,
-            Map<GroupDefinition, MergedArtifactInfo> mergedgroup, List<ArtifactDefinition> deletedArtifacts) {
+                                                                                    Resource resource, List<ArtifactDefinition> createdNewArtifacts, int labelCounter,
+                                                                                    boolean inTransaction, List<ArtifactDefinition> createdDeplymentArtifactsAfterDelete,
+                                                                                    Map<GroupDefinition, MergedArtifactInfo> mergedgroup, List<ArtifactDefinition> deletedArtifacts) {
         Map<GroupDefinition, List<ArtifactTemplateInfo>> artifactsToAssotiate = new HashMap<>();
         Map<GroupDefinition, List<ImmutablePair<ArtifactDefinition, ArtifactTemplateInfo>>> artifactsToUpdateMap = new HashMap<>();
         Either<Resource, ResponseFormat> resEither = Either.left(resource);
@@ -1525,7 +1512,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
 
                 if (isCreate) {
                     Either<ArtifactDefinition, ResponseFormat> createArtifactEither = createDeploymentArtifact(csarInfo,
-                            resource, ARTIFACTS_PATH, artifactTemplate, createdNewArtifacts, labelCounter, inTransaction);
+                            resource, ARTIFACTS_PATH, artifactTemplate, createdNewArtifacts, labelCounter);
                     if (createArtifactEither.isRight()) {
                         resEither = Either.right(createArtifactEither.right().value());
                         return resEither;
@@ -1594,8 +1581,8 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic {
                     log.debug("Artifact with name {} and type {} already updated with type  {}", artifactFileName,
                             artifactTemplateInfo.getType(), updatedArtifact.getArtifactType());
                     BeEcompErrorManager.getInstance().logInternalDataError(
-                            "Artifact  file is not in expected formatr, fileName " + artifactFileName,
-                            "Artifact internals are invalid", ErrorSeverity.ERROR);
+                            ARTIFACT_FILE_IS_NOT_IN_EXPECTED_FORMATR_FILE_NAME1 + artifactFileName,
+                            ARTIFACT_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                     resStatus = Either.right(componentsUtils.getResponseFormat(
                             ActionStatus.ARTIFACT_ALRADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR, artifactFileName,
                             artifactTemplateInfo.getType(), updatedArtifact.getArtifactType()));
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarBusinessLogic.java
new file mode 100644
index 0000000000..fb7843430f
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarBusinessLogic.java
@@ -0,0 +1,147 @@
+package org.openecomp.sdc.be.components.csar;
+
+import fj.data.Either;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.components.impl.BaseBusinessLogic;
+import org.openecomp.sdc.be.components.impl.CsarValidationUtils;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.NodeTypeInfo;
+import org.openecomp.sdc.be.model.ParsedToscaYamlInfo;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.impl.CsarOperation;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Map;
+
+@org.springframework.stereotype.Component("csarBusinessLogic")
+public class CsarBusinessLogic extends BaseBusinessLogic {
+
+    private static final Logger log = Logger.getLogger(CsarBusinessLogic.class);
+
+    private static final String CREATING_RESOURCE_FROM_CSAR_FETCHING_CSAR_WITH_ID = "Creating resource from CSAR: fetching CSAR with id ";
+    private static final String FAILED = " failed";
+
+    @Autowired
+    private CsarOperation csarOperation;
+
+    @Autowired
+    private YamlTemplateParsingHandler yamlHandler;
+
+    public void setCsarOperation(CsarOperation csarOperation) {
+        this.csarOperation = csarOperation;
+    }
+
+    public void validateCsarBeforeCreate(Resource resource, AuditingActionEnum auditingAction, User user, String csarUUID) {
+        // check if VF with the same Csar UUID or with he same name already
+        // exists
+        StorageOperationStatus status = toscaOperationFacade.validateCsarUuidUniqueness(csarUUID);
+        if(status == StorageOperationStatus.ENTITY_ALREADY_EXISTS){
+            log.debug("Failed to create resource {}, csarUUID {} already exist for a different VF ",
+                    resource.getSystemName(), csarUUID);
+            auditAndThrowException(resource, user, auditingAction, ActionStatus.VSP_ALREADY_EXISTS,
+                    csarUUID);
+        } else if (status != StorageOperationStatus.OK) {
+            log.debug("Failed to validate uniqueness of CsarUUID {} for resource", csarUUID,
+                    resource.getSystemName());
+            throw new ComponentException(componentsUtils.convertFromStorageResponse(status));
+        }
+    }
+
+    public CsarInfo getCsarInfo(Resource resource, Resource oldResource,User user, Map<String, byte[]> payload, String csarUUID){
+        Map<String, byte[]> csar = getCsar(resource, user, payload, csarUUID);
+        ImmutablePair<String, String> toscaYamlCsarStatus = validateAndParseCsar(resource,
+                user, csar, csarUUID)
+                .left().on(this::throwComponentException);
+
+        String checksum = CsarValidationUtils.getToscaYamlChecksum(csar,
+                csarUUID, componentsUtils).left().on(r->logAndThrowComponentException(r, "Failed to calculate checksum for casrUUID {} error {} ", csarUUID));
+        if (oldResource!=null && !checksum.equals(
+                oldResource.getComponentMetadataDefinition().getMetadataDataDefinition().getImportedToscaChecksum())) {
+            log.debug("The checksum of main template yaml of csar with csarUUID {} is not equal to the previous one, existing checksum is {}, new one is {}.", csarUUID,
+                    oldResource.getComponentMetadataDefinition().getMetadataDataDefinition()
+                            .getImportedToscaChecksum(),
+                    checksum);
+            oldResource.getComponentMetadataDefinition().getMetadataDataDefinition()
+                    .setImportedToscaChecksum(checksum);
+        }
+
+        return new CsarInfo(user, csarUUID, csar, resource.getName(),
+                toscaYamlCsarStatus.getKey(), toscaYamlCsarStatus.getValue(), true);
+    }
+
+
+    public ParsedToscaYamlInfo getParsedToscaYamlInfo(String topologyTemplateYaml, String yamlName, Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo, String nodeName) {
+        return yamlHandler.parseResourceInfoFromYAML(
+                yamlName, topologyTemplateYaml, csarInfo.getCreatedNodesToscaResourceNames(), nodeTypesInfo,
+                nodeName);
+    }
+
+    private String logAndThrowComponentException(ResponseFormat responseFormat, String logMessage, String ...params) {
+        log.debug(logMessage, params, responseFormat);
+        throw new ComponentException(responseFormat);
+    }
+
+    private ImmutablePair<String,String> throwComponentException(ResponseFormat responseFormat) {
+        throw new ComponentException(responseFormat);
+    }
+
+    private Either<ImmutablePair<String, String>, ResponseFormat> validateAndParseCsar(Resource resource, User user,
+                                                                                      Map<String, byte[]> payload, String csarUUID) {
+        Map<String, byte[]> csar = getCsar(resource, user, payload, csarUUID);
+        Either<Boolean, ResponseFormat> validateCsarStatus = CsarValidationUtils.validateCsar(csar,
+                csarUUID, componentsUtils);
+        if (validateCsarStatus.isRight()) {
+            ResponseFormat responseFormat = validateCsarStatus.right().value();
+            log.debug("Error when validate csar with ID {}, error: {}", csarUUID, responseFormat);
+            BeEcompErrorManager.getInstance()
+                    .logBeDaoSystemError(CREATING_RESOURCE_FROM_CSAR_FETCHING_CSAR_WITH_ID + csarUUID + FAILED);
+            componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.CREATE_RESOURCE);
+            return Either.right(responseFormat);
+        }
+
+        Either<ImmutablePair<String, String>, ResponseFormat> toscaYamlCsarStatus = CsarValidationUtils
+                .getToscaYaml(csar, csarUUID, componentsUtils);
+
+        if (toscaYamlCsarStatus.isRight()) {
+            ResponseFormat responseFormat = toscaYamlCsarStatus.right().value();
+            log.debug("Error when try to get csar toscayamlFile with csar ID {}, error: {}", csarUUID, responseFormat);
+            BeEcompErrorManager.getInstance()
+                    .logBeDaoSystemError(CREATING_RESOURCE_FROM_CSAR_FETCHING_CSAR_WITH_ID + csarUUID + FAILED);
+            componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.CREATE_RESOURCE);
+            return Either.right(responseFormat);
+        }
+        return toscaYamlCsarStatus;
+    }
+
+    private Map<String, byte[]> getCsar(Resource resource, User user, Map<String, byte[]> payload, String csarUUID) {
+        if (payload != null) {
+            return payload;
+        }
+        Either<Map<String, byte[]>, StorageOperationStatus> csar = csarOperation.getCsar(csarUUID, user);
+        if (csar.isRight()) {
+            StorageOperationStatus value = csar.right().value();
+            log.debug("#getCsar - failed to fetch csar with ID {}, error: {}", csarUUID, value);
+            BeEcompErrorManager.getInstance()
+                    .logBeDaoSystemError(CREATING_RESOURCE_FROM_CSAR_FETCHING_CSAR_WITH_ID + csarUUID + FAILED);
+            ResponseFormat responseFormat = componentsUtils
+                    .getResponseFormat(componentsUtils.convertFromStorageResponse(value), csarUUID);
+            componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.CREATE_RESOURCE);
+            throw new StorageException(csar.right().value());
+        }
+        return csar.left().value();
+    }
+
+    private void auditAndThrowException(Resource resource, User user, AuditingActionEnum auditingAction, ActionStatus status, String... params){
+        ResponseFormat errorResponse = componentsUtils.getResponseFormat(status, params);
+        componentsUtils.auditResource(errorResponse, user, resource, auditingAction);
+        throw new ComponentException(errorResponse);
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarInfo.java
new file mode 100644
index 0000000000..53adc3c970
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarInfo.java
@@ -0,0 +1,222 @@
+package org.openecomp.sdc.be.components.csar;
+
+import fj.data.Either;
+import org.apache.commons.collections.CollectionUtils;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.NodeTypeInfo;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.tosca.CsarUtils;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.yaml.snakeyaml.Yaml;
+
+import java.util.*;
+import java.util.regex.Pattern;
+
+import static org.openecomp.sdc.be.components.impl.ImportUtils.*;
+
+public class CsarInfo {
+    private static final Logger log = Logger.getLogger(CsarInfo.class);
+
+    private String vfResourceName;
+    private User modifier;
+    private String csarUUID;
+    private Map<String, byte[]> csar;
+    private String mainTemplateName;
+    private String mainTemplateContent;
+    private Map<String, Object> mappedToscaMainTemplate;
+    private Map<String, String> createdNodesToscaResourceNames;
+    private Queue<String> cvfcToCreateQueue;
+    private boolean isUpdate;
+    private Map<String, Resource> createdNodes;
+
+    @SuppressWarnings("unchecked")
+    public CsarInfo(User modifier, String csarUUID, Map<String, byte[]> csar, String vfResourceName, String mainTemplateName, String mainTemplateContent, boolean isUpdate){
+        this.vfResourceName = vfResourceName;
+        this.modifier = modifier;
+        this.csarUUID = csarUUID;
+        this.csar = csar;
+        this.mainTemplateName = mainTemplateName;
+        this.mainTemplateContent = mainTemplateContent;
+        this.mappedToscaMainTemplate = (Map<String, Object>) new Yaml().load(mainTemplateContent);
+        this.createdNodesToscaResourceNames = new HashMap<>();
+        this.cvfcToCreateQueue = new PriorityQueue<>();
+        this.isUpdate = isUpdate;
+        this.createdNodes  = new HashMap<>();
+    }
+
+    public String getVfResourceName() {
+        return vfResourceName;
+    }
+
+    public void setVfResourceName(String vfResourceName) {
+        this.vfResourceName = vfResourceName;
+    }
+
+    public User getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(User modifier) {
+        this.modifier = modifier;
+    }
+
+    public String getCsarUUID() {
+        return csarUUID;
+    }
+
+    public void setCsarUUID(String csarUUID) {
+        this.csarUUID = csarUUID;
+    }
+
+    public Map<String, byte[]> getCsar() {
+        return csar;
+    }
+
+    public void setCsar(Map<String, byte[]> csar) {
+        this.csar = csar;
+    }
+
+    public Map<String, Object> getMappedToscaMainTemplate() {
+        return mappedToscaMainTemplate;
+    }
+
+    public Map<String, String> getCreatedNodesToscaResourceNames() {
+        return createdNodesToscaResourceNames;
+    }
+
+    public void addNodeToQueue(String nodeName) {
+        if(!cvfcToCreateQueue.contains(nodeName)) {
+            cvfcToCreateQueue.add(nodeName);
+        } else {
+            log.debug("Failed to validate complex VFC {}. Loop detected, VSP {}. ", nodeName,
+                    getVfResourceName());
+            throw new ComponentException(ActionStatus.CFVC_LOOP_DETECTED,
+                    getVfResourceName(), nodeName);
+        }
+    }
+
+    public void removeNodeFromQueue() {
+        cvfcToCreateQueue.remove();
+    }
+
+    public boolean isUpdate() {
+        return isUpdate;
+    }
+
+    public void setUpdate(boolean isUpdate) {
+        this.isUpdate = isUpdate;
+    }
+
+    public Map<String, Resource> getCreatedNodes() {
+        return createdNodes;
+    }
+
+    public Map<String,NodeTypeInfo> extractNodeTypesInfo() {
+        Map<String, NodeTypeInfo> nodeTypesInfo = new HashMap<>();
+        List<Map.Entry<String, byte[]>> globalSubstitutes = new ArrayList<>();
+        for (Map.Entry<String, byte[]> entry : getCsar().entrySet()) {
+            extractNodeTypeInfo(nodeTypesInfo, globalSubstitutes, entry);
+        }
+        if (CollectionUtils.isNotEmpty(globalSubstitutes)) {
+            setDerivedFrom(nodeTypesInfo, globalSubstitutes);
+        }
+        markNestedVfc(getMappedToscaMainTemplate(), nodeTypesInfo);
+        return nodeTypesInfo;
+    }
+
+    @SuppressWarnings("unchecked")
+    private void extractNodeTypeInfo(Map<String, NodeTypeInfo> nodeTypesInfo,
+                                     List<Map.Entry<String, byte[]>> globalSubstitutes, Map.Entry<String, byte[]> entry) {
+        if (Pattern.compile(CsarUtils.SERVICE_TEMPLATE_PATH_PATTERN).matcher(entry.getKey()).matches()) {
+            if (!isGlobalSubstitute(entry.getKey())) {
+                Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(new String(entry.getValue()));
+                findToscaElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.SUBSTITUTION_MAPPINGS, ToscaElementTypeEnum.MAP)
+                    .right()
+                    .on(sub->handleSubstitutionMappings(nodeTypesInfo, entry, mappedToscaTemplate, (Map<String, Object>)sub));
+            }else {
+                globalSubstitutes.add(entry);
+            }
+        }
+    }
+
+    private ResultStatusEnum handleSubstitutionMappings(Map<String, NodeTypeInfo> nodeTypesInfo, Map.Entry<String, byte[]> entry, Map<String, Object> mappedToscaTemplate, Map<String, Object> substitutionMappings) {
+        if (substitutionMappings.containsKey(TypeUtils.ToscaTagNamesEnum.NODE_TYPE.getElementName())) {
+            NodeTypeInfo nodeTypeInfo = new NodeTypeInfo();
+            nodeTypeInfo.setType(
+                    (String) substitutionMappings.get(TypeUtils.ToscaTagNamesEnum.NODE_TYPE.getElementName()));
+            nodeTypeInfo.setTemplateFileName(entry.getKey());
+            nodeTypeInfo.setMappedToscaTemplate(mappedToscaTemplate);
+            nodeTypesInfo.put(nodeTypeInfo.getType(), nodeTypeInfo);
+        }
+        return ResultStatusEnum.OK;
+    }
+
+    private boolean isGlobalSubstitute(String fileName) {
+        return fileName.equalsIgnoreCase(Constants.GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE)
+                || fileName.equalsIgnoreCase(Constants.ABSTRACT_SUBSTITUTE_GLOBAL_TYPES_SERVICE_TEMPLATE);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void setDerivedFrom(Map<String, NodeTypeInfo> nodeTypesInfo,
+                                List<Map.Entry<String, byte[]>> globalSubstitutes) {
+        for (Map.Entry<String, byte[]> entry : globalSubstitutes) {
+            String yamlFileContents = new String(entry.getValue());
+            Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(yamlFileContents);
+            Either<Object, ResultStatusEnum> nodeTypesEither = findToscaElement(mappedToscaTemplate,
+                    TypeUtils.ToscaTagNamesEnum.NODE_TYPES, ToscaElementTypeEnum.MAP);
+            if (nodeTypesEither.isLeft()) {
+                Map<String, Object> nodeTypes = (Map<String, Object>) nodeTypesEither.left().value();
+                for (Map.Entry<String, Object> nodeType : nodeTypes.entrySet()) {
+                    processNodeType(nodeTypesInfo, nodeType);
+                }
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void processNodeType(Map<String, NodeTypeInfo> nodeTypesInfo, Map.Entry<String, Object> nodeType) {
+        Map<String, Object> nodeTypeMap = (Map<String, Object>) nodeType.getValue();
+        if (nodeTypeMap.containsKey(TypeUtils.ToscaTagNamesEnum.DERIVED_FROM.getElementName()) && nodeTypesInfo.containsKey(nodeType.getKey())) {
+            NodeTypeInfo nodeTypeInfo = nodeTypesInfo.get(nodeType.getKey());
+            List<String> derivedFrom = new ArrayList<>();
+            derivedFrom.add((String) nodeTypeMap.get(TypeUtils.ToscaTagNamesEnum.DERIVED_FROM.getElementName()));
+            nodeTypeInfo.setDerivedFrom(derivedFrom);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void markNestedVfc(Map<String, Object> mappedToscaTemplate, Map<String, NodeTypeInfo> nodeTypesInfo) {
+        findToscaElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.NODE_TEMPLATES,
+                ToscaElementTypeEnum.MAP)
+                .right()
+                .on(nts-> processNodeTemplates((Map<String, Object>)nts, nodeTypesInfo));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static ResultStatusEnum processNodeTemplates( Map<String, Object> nodeTemplates, Map<String, NodeTypeInfo> nodeTypesInfo) {
+        nodeTemplates.values().forEach(nt->processNodeTemplate(nodeTypesInfo, (Map<String, Object>) nt));
+        return ResultStatusEnum.OK;
+    }
+
+    private static void processNodeTemplate(Map<String, NodeTypeInfo> nodeTypesInfo, Map<String, Object> nodeTemplate) {
+        if (nodeTemplate.containsKey(TypeUtils.ToscaTagNamesEnum.TYPE.getElementName())) {
+            String type = (String) nodeTemplate.get(TypeUtils.ToscaTagNamesEnum.TYPE.getElementName());
+            if (nodeTypesInfo.containsKey(type)) {
+                NodeTypeInfo nodeTypeInfo = nodeTypesInfo.get(type);
+                nodeTypeInfo.setNested(true);
+            }
+        }
+    }
+
+    public String getMainTemplateName() {
+        return mainTemplateName;
+    }
+
+    public String getMainTemplateContent() {
+        return mainTemplateContent;
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java
new file mode 100644
index 0000000000..9bc2d01c6d
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/YamlTemplateParsingHandler.java
@@ -0,0 +1,857 @@
+package org.openecomp.sdc.be.components.csar;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import fj.data.Either;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
+import org.openecomp.sdc.be.components.impl.AnnotationBusinessLogic;
+import org.openecomp.sdc.be.components.impl.GroupTypeBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ImportUtils;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.stereotype.Component;
+import org.yaml.snakeyaml.parser.ParserException;
+
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toList;
+import static org.openecomp.sdc.be.components.impl.ImportUtils.*;
+import static org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum.*;
+
+/**
+ * A handler class designed to parse the YAML file of the service template for a JAVA object
+ */
+@Component
+public class YamlTemplateParsingHandler {
+
+    private static final Pattern propertyValuePattern = Pattern.compile("[ ]*\\{[ ]*(str_replace=|token=|get_property=|concat=|get_attribute=)+");
+    private static final int SUB_MAPPING_CAPABILITY_OWNER_NAME_IDX = 0;
+    private static final int SUB_MAPPING_CAPABILITY_NAME_IDX = 1;
+    private static final Logger log = Logger.getLogger(YamlTemplateParsingHandler.class);
+
+
+    private Gson gson = new Gson();
+    private TitanDao titanDao;
+    private GroupTypeBusinessLogic groupTypeBusinessLogic;
+    private AnnotationBusinessLogic annotationBusinessLogic;
+
+    public YamlTemplateParsingHandler(TitanDao titanDao,
+                                      GroupTypeBusinessLogic groupTypeBusinessLogic, AnnotationBusinessLogic annotationBusinessLogic) {
+        this.titanDao = titanDao;
+        this.groupTypeBusinessLogic = groupTypeBusinessLogic;
+        this.annotationBusinessLogic = annotationBusinessLogic;
+    }
+
+    public ParsedToscaYamlInfo parseResourceInfoFromYAML(String fileName, String resourceYml, Map<String, String> createdNodesToscaResourceNames,
+                                                         Map<String, NodeTypeInfo> nodeTypesInfo, String nodeName) {
+        log.debug("#parseResourceInfoFromYAML - Going to parse yaml {} ", fileName);
+        Map<String, Object> mappedToscaTemplate = getMappedToscaTemplate(fileName, resourceYml, nodeTypesInfo, nodeName);
+        ParsedToscaYamlInfo parsedToscaYamlInfo = new ParsedToscaYamlInfo();
+        findToscaElement(mappedToscaTemplate, TOPOLOGY_TEMPLATE, ToscaElementTypeEnum.ALL)
+                .left()
+                .on(err -> failIfNotTopologyTemplate(fileName));
+
+        parsedToscaYamlInfo.setInputs(getInputs(mappedToscaTemplate));
+        parsedToscaYamlInfo.setInstances(getInstances(fileName, mappedToscaTemplate, createdNodesToscaResourceNames));
+        parsedToscaYamlInfo.setGroups(getGroups(fileName, mappedToscaTemplate));
+        log.debug("#parseResourceInfoFromYAML - The yaml {} has been parsed ", fileName);
+        return parsedToscaYamlInfo;
+    }
+
+    private Map<String, Object> getMappedToscaTemplate(String fileName, String resourceYml, Map<String, NodeTypeInfo> nodeTypesInfo, String nodeName) {
+        Map<String, Object> mappedToscaTemplate;
+        if (isNodeExist(nodeTypesInfo, nodeName)) {
+            mappedToscaTemplate = nodeTypesInfo.get(nodeName).getMappedToscaTemplate();
+        } else {
+            mappedToscaTemplate = loadYaml(fileName, resourceYml);
+        }
+        return mappedToscaTemplate;
+    }
+
+    private Map<String, Object> loadYaml(String fileName, String resourceYml) {
+        Map<String, Object> mappedToscaTemplate = null;
+        try {
+            mappedToscaTemplate = loadYamlAsStrictMap(resourceYml);
+        } catch (ParserException e) {
+            log.debug("#getMappedToscaTemplate - Failed to load YAML file {}", fileName, e);
+            rollbackWithException(ActionStatus.TOSCA_PARSE_ERROR, fileName, e.getMessage());
+        }
+        return mappedToscaTemplate;
+    }
+
+    private boolean isNodeExist(Map<String, NodeTypeInfo> nodeTypesInfo, String nodeName) {
+        return nodeTypesInfo != null && nodeName != null && nodeTypesInfo.containsKey(nodeName);
+    }
+
+    private Map<String, InputDefinition> getInputs(Map<String, Object> toscaJson) {
+        Map<String, InputDefinition> inputs = ImportUtils.getInputs(toscaJson, annotationBusinessLogic.getAnnotationTypeOperations())
+                .left()
+                .on(err -> new HashMap<>());
+        annotationBusinessLogic.validateAndMergeAnnotationsAndAssignToInput(inputs);
+        return inputs;
+    }
+
+    private Map<String, UploadComponentInstanceInfo> getInstances(String yamlName, Map<String, Object> toscaJson, Map<String, String> createdNodesToscaResourceNames) {
+
+        Map<String, Object> nodeTemlates = findFirstToscaMapElement(toscaJson, NODE_TEMPLATES)
+                .left()
+                .on(err -> failIfNoNodeTemplates(yamlName));
+
+        Map<String, UploadComponentInstanceInfo> componentInstances = getInstances(toscaJson, createdNodesToscaResourceNames, nodeTemlates);
+        if (MapUtils.isEmpty(componentInstances)) {
+            failIfNotTopologyTemplate(yamlName);
+        }
+        return componentInstances;
+    }
+
+    private Map<String, UploadComponentInstanceInfo> getInstances(Map<String, Object> toscaJson, Map<String, String> createdNodesToscaResourceNames, Map<String, Object> nodeTemlates) {
+        Map<String, UploadComponentInstanceInfo> moduleComponentInstances;
+        Map<String, Object> substitutionMappings = getSubstitutionMappings(toscaJson);
+        moduleComponentInstances = nodeTemlates.entrySet()
+                .stream()
+                .map(node -> buildModuleComponentInstanceInfo(node, substitutionMappings, createdNodesToscaResourceNames))
+                .collect(Collectors.toMap(UploadComponentInstanceInfo::getName, i -> i));
+        return moduleComponentInstances;
+    }
+
+    private Map<String, Object> getSubstitutionMappings(Map<String, Object> toscaJson) {
+        Map<String, Object> substitutionMappings = null;
+        Either<Map<String, Object>, ResultStatusEnum> eitherSubstitutionMappings = findFirstToscaMapElement(toscaJson, SUBSTITUTION_MAPPINGS);
+        if (eitherSubstitutionMappings.isLeft()) {
+            substitutionMappings = eitherSubstitutionMappings.left().value();
+        }
+        return substitutionMappings;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, GroupDefinition> getGroups(String fileName, Map<String, Object> toscaJson) {
+
+        Map<String, Object> foundGroups = findFirstToscaMapElement(toscaJson, GROUPS)
+                .left()
+                .on(err -> logGroupsNotFound(fileName));
+
+        if (MapUtils.isNotEmpty(foundGroups)) {
+            Map<String, GroupDefinition> groups = foundGroups
+                    .entrySet()
+                    .stream()
+                    .map(this::createGroup)
+                    .collect(Collectors.toMap(GroupDefinition::getName, g -> g));
+            Map<String, Object> substitutionMappings = getSubstitutionMappings(toscaJson);
+            if (capabilitiesSubstitutionMappingsExist(substitutionMappings)) {
+                groups.entrySet().forEach(entry -> updateCapabilitiesNames(entry.getValue(), getNamesToUpdate(entry.getKey(),
+                        (Map<String, List<String>>) substitutionMappings.get(CAPABILITIES.getElementName()))));
+            }
+            return groups;
+        }
+        return new HashMap<>();
+    }
+
+    private Map<String, Object> logGroupsNotFound(String fileName) {
+        log.debug("#logGroupsNotFound - Groups were not found in the yaml template {}.", fileName);
+        return new HashMap<>();
+    }
+
+    private void updateCapabilitiesNames(GroupDefinition group, Map<String, String> capabilityNames) {
+        if (MapUtils.isNotEmpty(group.getCapabilities())) {
+            group.getCapabilities().values()
+                    .stream()
+                    .flatMap(Collection::stream)
+                    .filter(cap -> capabilityNames.containsKey(cap.getName()))
+                    .forEach(cap -> cap.setName(capabilityNames.get(cap.getName())));
+        }
+    }
+
+    private Map<String, String> getNamesToUpdate(String name, Map<String, List<String>> pair) {
+        return pair.entrySet().stream()
+                .filter(e -> e.getValue().get(SUB_MAPPING_CAPABILITY_OWNER_NAME_IDX).equalsIgnoreCase(name))
+                .collect(Collectors.toMap(e -> e.getValue().get(SUB_MAPPING_CAPABILITY_NAME_IDX), Map.Entry::getKey,  (n1 ,n2) -> n1));
+    }
+
+    private boolean capabilitiesSubstitutionMappingsExist(Map<String, Object> substitutionMappings) {
+        return substitutionMappings != null && substitutionMappings.containsKey(CAPABILITIES.getElementName());
+    }
+
+    private GroupDefinition createGroup(Map.Entry<String, Object> groupNameValue) {
+        GroupDefinition group = new GroupDefinition();
+        group.setName(groupNameValue.getKey());
+        try {
+            if (groupNameValue.getValue() != null && groupNameValue.getValue() instanceof Map) {
+                Map<String, Object> groupTemplateJsonMap = (Map<String, Object>) groupNameValue.getValue();
+                validateAndFillGroup(group, groupTemplateJsonMap);
+                validateUpdateGroupProperties(group, groupTemplateJsonMap);
+                validateUpdateGroupCapabilities(group, groupTemplateJsonMap);
+            } else {
+                rollbackWithException(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE);
+            }
+        } catch (ClassCastException e) {
+            log.debug("#createGroup - Failed to create the group {}. The exception occure", groupNameValue.getKey(), e);
+            rollbackWithException(ActionStatus.INVALID_YAML);
+        }
+        return group;
+    }
+
+    private Map<String, CapabilityDefinition> addCapabilities(Map<String, CapabilityDefinition> cap, Map<String, CapabilityDefinition> otherCap) {
+        cap.putAll(otherCap);
+        return cap;
+    }
+
+    private Map<String, CapabilityDefinition> addCapability(CapabilityDefinition cap) {
+        Map<String, CapabilityDefinition> map = Maps.newHashMap();
+        map.put(cap.getName(), cap);
+        return map;
+    }
+
+    private void setMembers(GroupDefinition groupInfo, Map<String, Object> groupTemplateJsonMap) {
+        if (groupTemplateJsonMap.containsKey(MEMBERS.getElementName())) {
+            Object members = groupTemplateJsonMap.get(MEMBERS.getElementName());
+            if (members != null) {
+                if (members instanceof List) {
+                    setMembersFromList(groupInfo, (List<?>) members);
+                } else {
+                    log.debug("The 'members' member is not of type list under group {}", groupInfo.getName());
+                    rollbackWithException(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE);
+                }
+            }
+        }
+    }
+
+    private void setMembersFromList(GroupDefinition groupInfo, List<?> membersAsList) {
+        groupInfo.setMembers(membersAsList
+                .stream()
+                .collect(Collectors.toMap(Object::toString, member -> "")));
+    }
+
+    @SuppressWarnings("unchecked")
+    private void validateUpdateGroupProperties(GroupDefinition groupInfo, Map<String, Object> groupTemplateJsonMap) {
+        if (groupTemplateJsonMap.containsKey(PROPERTIES.getElementName())) {
+            Object propertiesElement = groupTemplateJsonMap.get(PROPERTIES.getElementName());
+            if (propertiesElement instanceof Map){
+                mergeGroupProperties(groupInfo, (Map<String, Object>) propertiesElement);
+            }
+        }
+    }
+
+    private void mergeGroupProperties(GroupDefinition groupInfo, Map<String, Object> parsedProperties) {
+        if(CollectionUtils.isNotEmpty(groupInfo.getProperties())){
+            validateGroupProperties(parsedProperties, groupInfo);
+            groupInfo.getProperties().forEach(p -> mergeGroupProperty(p, parsedProperties));
+        }
+    }
+
+    private void mergeGroupProperty(PropertyDataDefinition property, Map<String, Object> parsedProperties) {
+        if(parsedProperties.containsKey(property.getName())){
+            Object propValue = parsedProperties.get(property.getName());
+            if (valueNotContainsPattern(propertyValuePattern, propValue)) {
+                setPropertyValueAndGetInputsValues(property, propValue);
+            }
+        }
+    }
+
+    private void setPropertyValueAndGetInputsValues(PropertyDataDefinition property, Object propValue) {
+        if(propValue != null){
+            UploadPropInfo uploadPropInfo = buildProperty(property.getName(), propValue);
+            property.setValue(convertPropertyValue(ToscaPropertyType.isValidType(property.getType()), uploadPropInfo.getValue()));
+            property.setGetInputValues(uploadPropInfo.getGet_input());
+        }
+    }
+
+    private String convertPropertyValue(ToscaPropertyType type, Object value) {
+        String convertedValue = null;
+        if (value != null) {
+            if (type == null || value instanceof Map || value instanceof List) {
+                convertedValue = gson.toJson(value);
+            } else {
+                convertedValue = value.toString();
+            }
+        }
+        return convertedValue;
+    }
+
+    private void setDescription(GroupDefinition groupInfo, Map<String, Object> groupTemplateJsonMap) {
+        if (groupTemplateJsonMap.containsKey(DESCRIPTION.getElementName())) {
+            groupInfo.setDescription(
+                    (String) groupTemplateJsonMap.get(DESCRIPTION.getElementName()));
+        }
+    }
+
+    private void validateAndFillGroup(GroupDefinition groupInfo, Map<String, Object> groupTemplateJsonMap) {
+        String type = (String) groupTemplateJsonMap.get(TYPE.getElementName());
+        if(StringUtils.isEmpty(type)){
+            log.debug("#validateAndFillGroup - The 'type' member is not found under group {}", groupInfo.getName());
+            rollbackWithException(ActionStatus.GROUP_MISSING_GROUP_TYPE, groupInfo.getName());
+        }
+        groupInfo.setType(type);
+        GroupTypeDefinition groupType =  groupTypeBusinessLogic.getLatestGroupTypeByType(type);
+        if (groupType == null) {
+            log.debug("#validateAndFillGroup - The group type {} not found", groupInfo.getName());
+            rollbackWithException(ActionStatus.GROUP_TYPE_IS_INVALID, type);
+        }
+        groupInfo.convertFromGroupProperties(groupType.getProperties());
+        groupInfo.convertCapabilityDefinitions(groupType.getCapabilities());
+        setDescription(groupInfo, groupTemplateJsonMap);
+        setMembers(groupInfo, groupTemplateJsonMap);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void validateUpdateGroupCapabilities(GroupDefinition groupInfo, Map<String, Object> groupTemplateJsonMap) {
+
+        if (groupTemplateJsonMap.containsKey(CAPABILITIES.getElementName())) {
+            Object capabilities = groupTemplateJsonMap.get(CAPABILITIES.getElementName());
+            if (capabilities instanceof List) {
+                validateUpdateCapabilities(groupInfo, ((List<Object>) capabilities).stream()
+                        .map(o -> buildGroupCapability(groupInfo, o))
+                        .collect(Collectors.toMap(CapabilityDefinition::getType, this::addCapability, this::addCapabilities)));
+            } else if (capabilities instanceof Map) {
+                validateUpdateCapabilities(groupInfo, ((Map<String, Object>) capabilities).entrySet()
+                        .stream()
+                        .map(e -> buildGroupCapability(groupInfo, e))
+                        .collect(Collectors.toMap(CapabilityDefinition::getType, this::addCapability, this::addCapabilities)));
+            } else {
+                log.debug("#setCapabilities - Failed to import the capabilities of the group {}. ", groupInfo.getName());
+                rollbackWithException(ActionStatus.INVALID_YAML);
+            }
+        }
+    }
+
+    private void validateUpdateCapabilities(GroupDefinition groupInfo, Map<String, Map<String, CapabilityDefinition>> capabilityInfo) {
+        validateGroupCapabilities(groupInfo, capabilityInfo);
+        groupInfo.updateCapabilitiesProperties(capabilityInfo);
+    }
+
+    private void validateGroupCapabilities(GroupDefinition group, Map<String, Map<String, CapabilityDefinition>> parsedCapabilities) {
+        if (MapUtils.isNotEmpty(parsedCapabilities)) {
+            if (MapUtils.isEmpty(group.getCapabilities())) {
+                failOnMissingCapabilityTypes(group, Lists.newArrayList(parsedCapabilities.keySet()));
+            }
+            List<String> missingCapTypes = parsedCapabilities.keySet().stream().filter(ct -> !group.getCapabilities().containsKey(ct)).collect(toList());
+            if (CollectionUtils.isNotEmpty(missingCapTypes)) {
+                failOnMissingCapabilityTypes(group, missingCapTypes);
+            }
+            group.getCapabilities().entrySet().forEach(e -> validateCapabilities(group, e.getValue(), parsedCapabilities.get(e.getKey())));
+        }
+    }
+
+    private void validateCapabilities(GroupDefinition group, List<CapabilityDefinition> capabilities, Map<String, CapabilityDefinition> parsedCapabilities) {
+        List<String> allowedCapNames = capabilities.stream().map(CapabilityDefinition::getName).distinct().collect(toList());
+        List<String> missingCapNames = parsedCapabilities.keySet().stream().filter(c -> !allowedCapNames.contains(c)).collect(toList());
+        if (CollectionUtils.isNotEmpty(missingCapNames)) {
+            failOnMissingCapabilityNames(group, missingCapNames);
+        }
+        validateCapabilitiesProperties(capabilities, parsedCapabilities);
+    }
+
+    private void validateCapabilitiesProperties(List<CapabilityDefinition> capabilities, Map<String, CapabilityDefinition> parsedCapabilities) {
+        capabilities.forEach(c -> validateCapabilityProperties(c, parsedCapabilities.get(c.getName())));
+    }
+
+    private void validateCapabilityProperties(CapabilityDefinition capability, CapabilityDefinition parsedCapability) {
+        if(parsedCapability != null && parsedCapability.getProperties() != null){
+            List<String> parsedPropertiesNames = parsedCapability.getProperties()
+                .stream()
+                .map(ComponentInstanceProperty::getName).collect(toList());
+            validateProperties(capability.getProperties().stream().map(PropertyDataDefinition::getName).collect(toList()), parsedPropertiesNames, ActionStatus.PROPERTY_NOT_FOUND, capability.getName(), capability.getType());
+        }
+    }
+
+    private void  validateGroupProperties(Map<String, Object> parsedProperties, GroupDefinition groupInfo) {
+        List<String> parsedPropertiesNames = parsedProperties.entrySet()
+                        .stream()
+                        .map(Map.Entry::getKey).collect(toList());
+        validateProperties(groupInfo.getProperties().stream().map(PropertyDataDefinition::getName).collect(toList()), parsedPropertiesNames, ActionStatus.GROUP_PROPERTY_NOT_FOUND, groupInfo.getName(), groupInfo.getType());
+    }
+
+    private void validateProperties(List<String> validProperties, List<String> parsedProperties, ActionStatus actionStatus, String name, String type) {
+        if (CollectionUtils.isNotEmpty(parsedProperties)) {
+            verifyMissingProperties(actionStatus, name, type, parsedProperties
+                    .stream()
+                    .filter(n -> !validProperties.contains(n))
+                    .collect(toList()));
+        }
+    }
+
+    private void verifyMissingProperties(ActionStatus actionStatus, String name, String type, List<String> missingProperties) {
+        if (CollectionUtils.isNotEmpty(missingProperties)) {
+            log.debug("#validateProperties - Failed to validate properties. The properties {} are missing on {} of the type {}. ", missingProperties.toString(), name, type);
+            rollbackWithException(actionStatus, missingProperties.toString(), missingProperties.toString(), name, type);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private CapabilityDefinition buildGroupCapability(GroupDefinition groupInfo, Object capObject) {
+        if (!(capObject instanceof Map)) {
+            log.debug("#convertToGroupCapability - Failed to import the capability {}. ", capObject);
+            rollbackWithException(ActionStatus.INVALID_YAML);
+        }
+        return buildGroupCapability(groupInfo, ((Map<String, Object>) capObject).entrySet().iterator().next());
+    }
+
+    @SuppressWarnings("unchecked")
+    private CapabilityDefinition buildGroupCapability(GroupDefinition groupInfo, Map.Entry<String, Object> capEntry) {
+        CapabilityDefinition capability = new CapabilityDefinition();
+        capability.setOwnerType(CapabilityDataDefinition.OwnerType.GROUP);
+        capability.setName(capEntry.getKey());
+        capability.setParentName(capEntry.getKey());
+        capability.setOwnerId(groupInfo.getName());
+        if (!(capEntry.getValue() instanceof Map)) {
+            log.debug("#convertMapEntryToCapabilityDefinition - Failed to import the capability {}. ", capEntry.getKey());
+            rollbackWithException(ActionStatus.INVALID_YAML);
+        }
+        Map<String, Object> capabilityValue = (Map<String, Object>) capEntry.getValue();
+        String type = (String) capabilityValue.get(TYPE.getElementName());
+        if (StringUtils.isEmpty(type)) {
+            log.debug("#convertMapEntryToCapabilityDefinition - Failed to import the capability {}. Missing capability type. ", capEntry.getKey());
+            rollbackWithException(ActionStatus.INVALID_YAML);
+        }
+        capability.setType(type);
+        if (!(capabilityValue.get(PROPERTIES.getElementName()) instanceof Map)) {
+            log.debug("#convertMapEntryToCapabilityDefinition - Failed to import the capability {}. ", capEntry.getKey());
+            rollbackWithException(ActionStatus.INVALID_YAML);
+        }
+        Map<String, Object> properties = (Map<String, Object>) capabilityValue.get(PROPERTIES.getElementName());
+        capability.setProperties(properties.entrySet().stream().map(this::convertToProperty).collect(toList()));
+        return capability;
+    }
+
+    private ComponentInstanceProperty convertToProperty(Map.Entry<String, Object> e) {
+        ComponentInstanceProperty property = new ComponentInstanceProperty();
+        property.setName(e.getKey());
+        property.setValue((String) e.getValue());
+        return property;
+    }
+
+    @SuppressWarnings("unchecked")
+    private UploadComponentInstanceInfo buildModuleComponentInstanceInfo(
+            Map.Entry<String, Object> nodeTemplateJsonEntry, Map<String, Object> substitutionMappings,
+            Map<String, String> createdNodesToscaResourceNames) {
+
+        UploadComponentInstanceInfo nodeTemplateInfo = new UploadComponentInstanceInfo();
+        nodeTemplateInfo.setName(nodeTemplateJsonEntry.getKey());
+        try {
+            if (nodeTemplateJsonEntry.getValue() instanceof String) {
+                String nodeTemplateJsonString = (String) nodeTemplateJsonEntry.getValue();
+                nodeTemplateInfo.setType(nodeTemplateJsonString);
+            } else if (nodeTemplateJsonEntry.getValue() instanceof Map) {
+                Map<String, Object> nodeTemplateJsonMap = (Map<String, Object>) nodeTemplateJsonEntry.getValue();
+                setToscaResourceType(createdNodesToscaResourceNames, nodeTemplateInfo, nodeTemplateJsonMap);
+                setRequirements(nodeTemplateInfo, nodeTemplateJsonMap);
+                setCapabilities(nodeTemplateInfo, nodeTemplateJsonMap);
+                updateProperties(nodeTemplateInfo, nodeTemplateJsonMap);
+                setSubstitutions(substitutionMappings, nodeTemplateInfo);
+            } else {
+                rollbackWithException(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE);
+            }
+        } catch (ClassCastException e) {
+            BeEcompErrorManager.getInstance().logBeSystemError("Import Resource - create capability");
+            log.debug("error when creating capability, message:{}", e.getMessage(), e);
+            rollbackWithException(ActionStatus.INVALID_YAML);
+        }
+        return nodeTemplateInfo;
+    }
+
+    @SuppressWarnings("unchecked")
+    private void setSubstitutions(Map<String, Object> substitutionMappings, UploadComponentInstanceInfo nodeTemplateInfo) {
+        if (substitutionMappings != null) {
+            if (substitutionMappings.containsKey(CAPABILITIES.getElementName())) {
+                nodeTemplateInfo.setCapabilitiesNamesToUpdate(getNamesToUpdate(nodeTemplateInfo.getName(), (Map<String, List<String>>) substitutionMappings
+                        .get(CAPABILITIES.getElementName())));
+            }
+            if (substitutionMappings.containsKey(REQUIREMENTS.getElementName())) {
+                nodeTemplateInfo.setRequirementsNamesToUpdate(getNamesToUpdate(
+                        nodeTemplateInfo.getName(), (Map<String, List<String>>) substitutionMappings
+                                .get(REQUIREMENTS.getElementName())));
+            }
+        }
+    }
+
+    private void updateProperties(UploadComponentInstanceInfo nodeTemplateInfo, Map<String, Object> nodeTemplateJsonMap) {
+        if (nodeTemplateJsonMap.containsKey(PROPERTIES.getElementName())) {
+            Map<String, List<UploadPropInfo>> properties = buildPropModuleFromYaml(nodeTemplateJsonMap);
+            if (!properties.isEmpty()) {
+                nodeTemplateInfo.setProperties(properties);
+            }
+        }
+    }
+
+    private void setCapabilities(UploadComponentInstanceInfo nodeTemplateInfo, Map<String, Object> nodeTemplateJsonMap) {
+        if (nodeTemplateJsonMap.containsKey(CAPABILITIES.getElementName())) {
+            Map<String, List<UploadCapInfo>> eitherCapRes = createCapModuleFromYaml(nodeTemplateJsonMap);
+            if (!eitherCapRes.isEmpty()) {
+                nodeTemplateInfo.setCapabilities(eitherCapRes);
+            }
+        }
+    }
+
+    private void setRequirements(UploadComponentInstanceInfo nodeTemplateInfo, Map<String, Object> nodeTemplateJsonMap) {
+        if (nodeTemplateJsonMap.containsKey(REQUIREMENTS.getElementName())) {
+            Map<String, List<UploadReqInfo>> regResponse = createReqModuleFromYaml(nodeTemplateJsonMap);
+            if (!regResponse.isEmpty()) {
+                nodeTemplateInfo.setRequirements(regResponse);
+            }
+        }
+    }
+
+    private void setToscaResourceType(Map<String, String> createdNodesToscaResourceNames,
+                                      UploadComponentInstanceInfo nodeTemplateInfo, Map<String, Object> nodeTemplateJsonMap) {
+        if (nodeTemplateJsonMap.containsKey(TYPE.getElementName())) {
+            String toscaResourceType = (String) nodeTemplateJsonMap.get(TYPE.getElementName());
+            if (createdNodesToscaResourceNames.containsKey(toscaResourceType)) {
+                toscaResourceType = createdNodesToscaResourceNames.get(toscaResourceType);
+            }
+            nodeTemplateInfo.setType(toscaResourceType);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, List<UploadReqInfo>> createReqModuleFromYaml(Map<String, Object> nodeTemplateJsonMap) {
+        Map<String, List<UploadReqInfo>> moduleRequirements = new HashMap<>();
+        Either<List<Object>, ResultStatusEnum> requirementsListRes =
+                findFirstToscaListElement(nodeTemplateJsonMap, REQUIREMENTS);
+
+        if (requirementsListRes.isLeft()) {
+            for (Object jsonReqObj : requirementsListRes.left().value()) {
+                String reqName = ((Map<String, Object>) jsonReqObj).keySet().iterator().next();
+                Object reqJson = ((Map<String, Object>) jsonReqObj).get(reqName);
+                addModuleNodeTemplateReq(moduleRequirements, reqJson, reqName);
+            }
+        } else {
+            Either<Map<String, Object>, ResultStatusEnum> requirementsMapRes =
+                    findFirstToscaMapElement(nodeTemplateJsonMap, REQUIREMENTS);
+            if (requirementsMapRes.isLeft()) {
+                for (Map.Entry<String, Object> entry : requirementsMapRes.left().value().entrySet()) {
+                    String reqName = entry.getKey();
+                    Object reqJson = entry.getValue();
+                    addModuleNodeTemplateReq(moduleRequirements, reqJson, reqName);
+                }
+            }
+        }
+        return moduleRequirements;
+    }
+
+    private void addModuleNodeTemplateReq(Map<String, List<UploadReqInfo>> moduleRequirements, Object requirementJson, String requirementName) {
+
+        UploadReqInfo requirement = buildModuleNodeTemplateReg(requirementJson);
+        requirement.setName(requirementName);
+        if (moduleRequirements.containsKey(requirementName)) {
+            moduleRequirements.get(requirementName).add(requirement);
+        } else {
+            List<UploadReqInfo> list = new ArrayList<>();
+            list.add(requirement);
+            moduleRequirements.put(requirementName, list);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<String, List<UploadCapInfo>> createCapModuleFromYaml(Map<String, Object> nodeTemplateJsonMap) {
+        Map<String, List<UploadCapInfo>> moduleCap = new HashMap<>();
+        Either<List<Object>, ResultStatusEnum> capabilitiesListRes =
+                findFirstToscaListElement(nodeTemplateJsonMap, CAPABILITIES);
+        if (capabilitiesListRes.isLeft()) {
+            for (Object jsonCapObj : capabilitiesListRes.left().value()) {
+                String key = ((Map<String, Object>) jsonCapObj).keySet().iterator().next();
+                Object capJson = ((Map<String, Object>) jsonCapObj).get(key);
+                addModuleNodeTemplateCap(moduleCap, capJson, key);
+            }
+        } else {
+            Either<Map<String, Object>, ResultStatusEnum> capabilitiesMapRes =
+                    findFirstToscaMapElement(nodeTemplateJsonMap, CAPABILITIES);
+            if (capabilitiesMapRes.isLeft()) {
+                for (Map.Entry<String, Object> entry : capabilitiesMapRes.left().value().entrySet()) {
+                    String capName = entry.getKey();
+                    Object capJson = entry.getValue();
+                    addModuleNodeTemplateCap(moduleCap, capJson, capName);
+                }
+            }
+        }
+        return moduleCap;
+    }
+
+    private void addModuleNodeTemplateCap(Map<String, List<UploadCapInfo>> moduleCap, Object capJson, String key) {
+
+        UploadCapInfo capabilityDef = buildModuleNodeTemplateCap(capJson);
+        capabilityDef.setKey(key);
+        if (moduleCap.containsKey(key)) {
+            moduleCap.get(key).add(capabilityDef);
+        } else {
+            List<UploadCapInfo> list = new ArrayList<>();
+            list.add(capabilityDef);
+            moduleCap.put(key, list);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private UploadCapInfo buildModuleNodeTemplateCap(Object capObject) {
+        UploadCapInfo capTemplateInfo = new UploadCapInfo();
+
+        if (capObject instanceof String) {
+            String nodeTemplateJsonString = (String) capObject;
+            capTemplateInfo.setNode(nodeTemplateJsonString);
+        } else if (capObject instanceof Map) {
+            fillCapability(capTemplateInfo, (Map<String, Object>) capObject);
+        }
+        return capTemplateInfo;
+    }
+
+    private void fillCapability(UploadCapInfo capTemplateInfo, Map<String, Object> nodeTemplateJsonMap) {
+        if (nodeTemplateJsonMap.containsKey(NODE.getElementName())) {
+            capTemplateInfo.setNode((String) nodeTemplateJsonMap.get(NODE.getElementName()));
+        }
+        if (nodeTemplateJsonMap.containsKey(TYPE.getElementName())) {
+            capTemplateInfo.setType((String) nodeTemplateJsonMap.get(TYPE.getElementName()));
+        }
+        if (nodeTemplateJsonMap.containsKey(VALID_SOURCE_TYPES.getElementName())) {
+            Either<List<Object>, ResultStatusEnum> validSourceTypesRes =
+                    findFirstToscaListElement(nodeTemplateJsonMap, VALID_SOURCE_TYPES);
+            if (validSourceTypesRes.isLeft()) {
+                capTemplateInfo.setValidSourceTypes(validSourceTypesRes.left().value().stream()
+                        .map(Object::toString).collect(toList()));
+            }
+        }
+        if (nodeTemplateJsonMap.containsKey(PROPERTIES.getElementName())) {
+            Map<String, List<UploadPropInfo>> props = buildPropModuleFromYaml(nodeTemplateJsonMap);
+            if (!props.isEmpty()) {
+                List<UploadPropInfo> properties = props.values().stream().flatMap(Collection::stream).collect(toList());
+                capTemplateInfo.setProperties(properties);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private UploadReqInfo buildModuleNodeTemplateReg(Object regObject) {
+
+        UploadReqInfo regTemplateInfo = new UploadReqInfo();
+        if (regObject instanceof String) {
+            String nodeTemplateJsonString = (String) regObject;
+            regTemplateInfo.setNode(nodeTemplateJsonString);
+        } else if (regObject instanceof Map) {
+            Map<String, Object> nodeTemplateJsonMap = (Map<String, Object>) regObject;
+            if (nodeTemplateJsonMap.containsKey(NODE.getElementName())) {
+                regTemplateInfo.setNode((String) nodeTemplateJsonMap.get(NODE.getElementName()));
+            }
+            if (nodeTemplateJsonMap.containsKey(CAPABILITY.getElementName())) {
+                regTemplateInfo.setCapabilityName(
+                        (String) nodeTemplateJsonMap.get(CAPABILITY.getElementName()));
+            }
+        }
+        return regTemplateInfo;
+    }
+
+    private Map<String, List<UploadPropInfo>> buildPropModuleFromYaml(Map<String, Object> nodeTemplateJsonMap) {
+
+        Map<String, List<UploadPropInfo>> moduleProp = new HashMap<>();
+        Either<Map<String, Object>, ResultStatusEnum> toscaProperties =
+                findFirstToscaMapElement(nodeTemplateJsonMap, PROPERTIES);
+        if (toscaProperties.isLeft()) {
+            Map<String, Object> jsonProperties = toscaProperties.left().value();
+            for (Map.Entry<String, Object> jsonPropObj : jsonProperties.entrySet()) {
+                if (valueNotContainsPattern(propertyValuePattern, jsonPropObj.getValue())) {
+                    addProperty(moduleProp, jsonPropObj);
+                }
+            }
+        }
+        return moduleProp;
+    }
+
+    private void addProperty(Map<String, List<UploadPropInfo>> moduleProp, Map.Entry<String, Object> jsonPropObj) {
+        UploadPropInfo propertyDef = buildProperty(jsonPropObj.getKey(), jsonPropObj.getValue());
+        if (moduleProp.containsKey(propertyDef.getName())) {
+            moduleProp.get(propertyDef.getName()).add(propertyDef);
+        } else {
+            List<UploadPropInfo> list = new ArrayList<>();
+            list.add(propertyDef);
+            moduleProp.put(propertyDef.getName(), list);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private UploadPropInfo buildProperty(String propName, Object propValue) {
+
+        UploadPropInfo propertyDef = new UploadPropInfo();
+        propertyDef.setValue(propValue);
+        propertyDef.setName(propName);
+        if (propValue instanceof Map) {
+            if (((Map<String, Object>) propValue).containsKey(TYPE.getElementName())) {
+                propertyDef.setType(((Map<String, Object>) propValue)
+                        .get(TYPE.getElementName()).toString());
+            }
+            if (containsGetInput(propValue)) {
+                fillInputRecursively(propName, (Map<String, Object>) propValue, propertyDef);
+            }
+
+            if (((Map<String, Object>) propValue).containsKey(DESCRIPTION.getElementName())) {
+                propertyDef.setDescription(((Map<String, Object>) propValue)
+                        .get(DESCRIPTION.getElementName()).toString());
+            }
+            if (((Map<String, Object>) propValue)
+                    .containsKey(DEFAULT_VALUE.getElementName())) {
+                propertyDef.setValue(((Map<String, Object>) propValue)
+                        .get(DEFAULT_VALUE.getElementName()));
+            }
+            if (((Map<String, Object>) propValue).containsKey(IS_PASSWORD.getElementName())) {
+                propertyDef.setPassword(Boolean.getBoolean(((Map<String, Object>) propValue)
+                        .get(IS_PASSWORD.getElementName()).toString()));
+            } else {
+                propertyDef.setValue(propValue);
+            }
+        } else if (propValue instanceof List) {
+            List<Object> propValueList = (List<Object>) propValue;
+
+            fillInputsListRecursively(propertyDef, propValueList);
+            propertyDef.setValue(propValue);
+        }
+
+        return propertyDef;
+    }
+
+    @SuppressWarnings("unchecked")
+    private boolean containsGetInput(Object propValue) {
+        return ((Map<String, Object>) propValue).containsKey(GET_INPUT.getElementName())
+                || ImportUtils.containsGetInput(propValue);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void fillInputsListRecursively(UploadPropInfo propertyDef, List<Object> propValueList) {
+        for (Object objValue : propValueList) {
+
+            if (objValue instanceof Map) {
+                Map<String, Object> objMap = (Map<String, Object>) objValue;
+                if (objMap.containsKey(GET_INPUT.getElementName())) {
+                    fillInputRecursively(propertyDef.getName(), objMap, propertyDef);
+                } else {
+                    Set<String> keys = objMap.keySet();
+                    findAndFillInputsListRecursively(propertyDef, objMap, keys);
+                }
+            } else if (objValue instanceof List) {
+                List<Object> propSubValueList = (List<Object>) objValue;
+                fillInputsListRecursively(propertyDef, propSubValueList);
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void findAndFillInputsListRecursively(UploadPropInfo propertyDef, Map<String, Object> objMap,
+                                                  Set<String> keys) {
+        for (String key : keys) {
+            Object value = objMap.get(key);
+            if (value instanceof Map) {
+                fillInputRecursively(key, (Map<String, Object>) value, propertyDef);
+            } else if (value instanceof List) {
+                List<Object> propSubValueList = (List<Object>) value;
+                fillInputsListRecursively(propertyDef, propSubValueList);
+            }
+        }
+    }
+
+    private void fillInputRecursively(String propName, Map<String, Object> propValue, UploadPropInfo propertyDef) {
+
+        if (propValue.containsKey(GET_INPUT.getElementName())) {
+            Object getInput = propValue.get(GET_INPUT.getElementName());
+            GetInputValueDataDefinition getInputInfo = new GetInputValueDataDefinition();
+            List<GetInputValueDataDefinition> getInputs = propertyDef.getGet_input();
+            if (getInputs == null) {
+                getInputs = new ArrayList<>();
+            }
+            if (getInput instanceof String) {
+
+                getInputInfo.setInputName((String) getInput);
+                getInputInfo.setPropName(propName);
+
+            } else if (getInput instanceof List) {
+                fillInput(propName, getInput, getInputInfo);
+            }
+            getInputs.add(getInputInfo);
+            propertyDef.setGet_input(getInputs);
+            propertyDef.setValue(propValue);
+        } else {
+            findAndFillInputRecursively(propValue, propertyDef);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void findAndFillInputRecursively(Map<String, Object> propValue, UploadPropInfo propertyDef) {
+        for (String propName : propValue.keySet()) {
+            Object value = propValue.get(propName);
+            if (value instanceof Map) {
+                fillInputRecursively(propName, (Map<String, Object>) value, propertyDef);
+
+            } else if (value instanceof List) {
+                fillInputsRecursively(propertyDef, propName, (List<Object>) value);
+            }
+        }
+    }
+
+    private void fillInputsRecursively(UploadPropInfo propertyDef, String propName, List<Object> inputs) {
+        inputs.stream()
+                .filter(o -> o instanceof Map)
+                .forEach(o -> fillInputRecursively(propName, (Map<String, Object>)o, propertyDef));
+    }
+
+    @SuppressWarnings("unchecked")
+    private void fillInput(String propName, Object getInput, GetInputValueDataDefinition getInputInfo) {
+        List<Object> getInputList = (List<Object>) getInput;
+        getInputInfo.setPropName(propName);
+        getInputInfo.setInputName((String) getInputList.get(0));
+        if (getInputList.size() > 1) {
+            Object indexObj = getInputList.get(1);
+            if (indexObj instanceof Integer) {
+                getInputInfo.setIndexValue((Integer) indexObj);
+            } else if (indexObj instanceof Float) {
+                int index = ((Float) indexObj).intValue();
+                getInputInfo.setIndexValue(index);
+            } else if (indexObj instanceof Map && ((Map<String, Object>) indexObj)
+                    .containsKey(GET_INPUT.getElementName())) {
+                Object index = ((Map<String, Object>) indexObj)
+                        .get(GET_INPUT.getElementName());
+                GetInputValueDataDefinition getInputInfoIndex = new GetInputValueDataDefinition();
+                getInputInfoIndex.setInputName((String) index);
+                getInputInfoIndex.setPropName(propName);
+                getInputInfo.setGetInputIndex(getInputInfoIndex);
+            }
+            getInputInfo.setList(true);
+        }
+    }
+
+    private boolean valueNotContainsPattern(Pattern pattern, Object propValue) {
+        return propValue == null || !pattern.matcher(propValue.toString()).find();
+    }
+
+    private Map<String, Object> failIfNoNodeTemplates(String fileName) {
+        titanDao.rollback();
+        throw new ComponentException(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, fileName);
+    }
+
+    private Object failIfNotTopologyTemplate(String fileName) {
+        titanDao.rollback();
+        throw new ComponentException(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, fileName);
+    }
+
+    private void rollbackWithException(ActionStatus actionStatus, String... params) {
+        titanDao.rollback();
+        throw new ComponentException(actionStatus, params);
+    }
+
+    private void failOnMissingCapabilityTypes(GroupDefinition groupDefinition, List<String> missingCapTypes) {
+        log.debug("#failOnMissingCapabilityTypes - Failed to validate the capabilities of the group {}. The capability types {} are missing on the group type {}. ", groupDefinition.getName(), missingCapTypes.toString(), groupDefinition.getType());
+        if(CollectionUtils.isNotEmpty(missingCapTypes)) {
+            rollbackWithException(ActionStatus.MISSING_CAPABILITY_TYPE, missingCapTypes.toString());
+        }
+    }
+
+    private void failOnMissingCapabilityNames(GroupDefinition groupDefinition, List<String> missingCapNames) {
+        log.debug("#failOnMissingCapabilityNames - Failed to validate the capabilities of the group {}. The capabilities with the names {} are missing on the group type {}. ", groupDefinition.getName(), missingCapNames.toString(), groupDefinition.getType());
+        rollbackWithException(ActionStatus.MISSING_CAPABILITIES, missingCapNames.toString(), CapabilityDataDefinition.OwnerType.GROUP.getValue(), groupDefinition.getName());
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/AaiRequestHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/AaiRequestHandler.java
index 2730ee413b..cc48a378af 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/AaiRequestHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/AaiRequestHandler.java
@@ -1,14 +1,5 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.util.Properties;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
 import org.apache.http.conn.ConnectTimeoutException;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.common.api.Constants;
@@ -19,14 +10,21 @@ import org.openecomp.sdc.common.http.client.api.HttpRequest;
 import org.openecomp.sdc.common.http.client.api.HttpResponse;
 import org.openecomp.sdc.common.http.client.api.Responses;
 import org.openecomp.sdc.common.http.config.ExternalServiceConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import java.net.ConnectException;
+import java.net.SocketTimeoutException;
+import java.util.Properties;
+import java.util.UUID;
+
 @Component
 public class AaiRequestHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(AaiRequestHandler.class);
+    private static final Logger logger = Logger.getLogger(AaiRequestHandler.class);
     private ExternalServiceConfig aaiConfig;
     
     protected static final String OPERATIONAL_ENV_RESOURCE_CONFIG_PARAM = "operationalEnvironments";
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImpl.java
index 9a5bc33fb3..045bde699b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ArtifactInfoImpl.java
@@ -20,18 +20,19 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 public class ArtifactInfoImpl implements IArtifactInfo {
 
     private String artifactName;
@@ -61,7 +62,7 @@ public class ArtifactInfoImpl implements IArtifactInfo {
     }
 
     public static List<ArtifactInfoImpl> convertToArtifactInfoImpl(Service service, ComponentInstance resourceInstance, Collection<ArtifactDefinition> list) {
-        List<ArtifactInfoImpl> ret = new ArrayList<ArtifactInfoImpl>();
+        List<ArtifactInfoImpl> ret = new ArrayList<>();
         Map<String, List<ArtifactDefinition>> artifactIdToDef = list.stream().collect(Collectors.groupingBy(ArtifactDefinition::getUniqueId));
         if (list != null) {
             for (ArtifactDefinition artifactDef : list) {
@@ -82,7 +83,7 @@ public class ArtifactInfoImpl implements IArtifactInfo {
     }
 
     public static List<ArtifactInfoImpl> convertServiceArtifactToArtifactInfoImpl(Service service, Collection<ArtifactDefinition> list) {
-        List<ArtifactInfoImpl> ret = new ArrayList<ArtifactInfoImpl>();
+        List<ArtifactInfoImpl> ret = new ArrayList<>();
         Map<String, List<ArtifactDefinition>> artifactIdToDef = list.stream().collect(Collectors.groupingBy(ArtifactDefinition::getUniqueId));
         if (list != null) {
             for (ArtifactDefinition artifactDef : list) {
@@ -104,7 +105,7 @@ public class ArtifactInfoImpl implements IArtifactInfo {
     private static List<String> getUpdatedRequiredArtifactsFromNamesToUuids(ArtifactDefinition artifactDefinition, Map<String, ArtifactDefinition> artifacts) {
         List<String> requiredArtifacts = null;
         if (artifactDefinition != null && artifactDefinition.getRequiredArtifacts() != null && !artifactDefinition.getRequiredArtifacts().isEmpty() && artifacts != null && !artifacts.isEmpty()) {
-            requiredArtifacts = artifacts.values().stream().filter(art -> artifactDefinition.getRequiredArtifacts().contains(art.getArtifactName())).map(art -> art.getArtifactUUID()).collect(Collectors.toList());
+            requiredArtifacts = artifacts.values().stream().filter(art -> artifactDefinition.getRequiredArtifacts().contains(art.getArtifactName())).map(ArtifactDataDefinition::getArtifactUUID).collect(Collectors.toList());
         }
         return requiredArtifacts;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaErrorResponse.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaErrorResponse.java
index c52bad9abb..1041e584f7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaErrorResponse.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaErrorResponse.java
@@ -20,11 +20,11 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
+import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
-
 public class CambriaErrorResponse {
 
     public static final int HTTP_OK = 200;
@@ -33,7 +33,7 @@ public class CambriaErrorResponse {
 
     CambriaOperationStatus operationStatus;
     Integer httpCode;
-    List<String> variables = new ArrayList<String>();
+    List<String> variables = new ArrayList<>();
 
     public CambriaErrorResponse() {
         super();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandler.java
index ffac7843fd..7d99563a76 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/CambriaHandler.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,58 +20,49 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.http.HttpStatus;
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
 import com.att.nsa.apiClient.credentials.ApiCredential;
 import com.att.nsa.apiClient.http.HttpException;
 import com.att.nsa.apiClient.http.HttpObjectNotFoundException;
-import com.att.nsa.cambria.client.CambriaBatchingPublisher;
-import com.att.nsa.cambria.client.CambriaClient;
+import com.att.nsa.cambria.client.*;
 import com.att.nsa.cambria.client.CambriaClient.CambriaApiException;
-import com.att.nsa.cambria.client.CambriaClientBuilders;
 import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
 import com.att.nsa.cambria.client.CambriaClientBuilders.IdentityManagerBuilder;
 import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
 import com.att.nsa.cambria.client.CambriaClientBuilders.TopicManagerBuilder;
-import com.att.nsa.cambria.client.CambriaConsumer;
-import com.att.nsa.cambria.client.CambriaIdentityManager;
 import com.att.nsa.cambria.client.CambriaPublisher.message;
-import com.att.nsa.cambria.client.CambriaTopicManager;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.Gson;
-
 import fj.data.Either;
+import org.apache.http.HttpStatus;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 @Component("cambriaHandler")
 public class CambriaHandler {
 
-    private static final Logger logger = LoggerFactory.getLogger(CambriaHandler.class);
-
+    private static final Logger log = Logger.getLogger(CambriaHandler.class.getName());
     private static final String PARTITION_KEY = "asdc" + "aa";
-
-    private final String SEND_NOTIFICATION = "send notification";
-
-    private Gson gson = new Gson();
-
-    private static final String CONSUMER_ID = ConfigurationManager.getConfigurationManager().getDistributionEngineConfiguration().getDistributionStatusTopic().getConsumerId();
-
+    private static final String SEND_NOTIFICATION = "send notification";
+    private static final String CONSUMER_ID = ConfigurationManager.getConfigurationManager()
+                                                                  .getDistributionEngineConfiguration()
+                                                                  .getDistributionStatusTopic()
+                                                                  .getConsumerId();
+    private final Gson gson = new Gson();
 
 
     /**
@@ -82,7 +73,7 @@ public class CambriaHandler {
      */
     private Integer processMessageException(String message) {
 
-        String[] patterns = { "(HTTP Status )(\\d\\d\\d)", "(HTTP/\\d.\\d )(\\d\\d\\d)" };
+        String[] patterns = {"(HTTP Status )(\\d\\d\\d)", "(HTTP/\\d.\\d )(\\d\\d\\d)"};
 
         Integer result = checkPattern(patterns[0], message, 2);
         if (result != null) {
@@ -113,8 +104,9 @@ public class CambriaHandler {
             if (httpCode != null) {
                 try {
                     result = Integer.valueOf(httpCode);
-                } catch (NumberFormatException e) {
-                    logger.debug("Failed to parse http code {}", httpCode);
+                }
+                catch (NumberFormatException e) {
+                    log.debug("Failed to parse http code {}", httpCode);
                 }
             }
         }
@@ -136,21 +128,20 @@ public class CambriaHandler {
 
             Set<String> topics = createTopicManager.getTopics();
 
-            if (topics == null || true == topics.isEmpty()) {
+            if (topics == null || topics.isEmpty()) {
                 CambriaErrorResponse cambriaErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.NOT_FOUND, null);
                 return Either.right(cambriaErrorResponse);
             }
 
             return Either.left(topics);
 
-        } catch (IOException | GeneralSecurityException e) {
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
+        }
+        catch (IOException | GeneralSecurityException e) {
 
             CambriaErrorResponse cambriaErrorResponse = processError(e);
 
-            logger.debug("Failed to fetch topics from U-EB server", e);
-            writeErrorToLog(cambriaErrorResponse, e.getMessage(), methodName, "get topics");
+            log.debug("Failed to fetch topics from U-EB server", e);
+            writeErrorToLog(cambriaErrorResponse, "getTopics", "get topics");
 
             return Either.right(cambriaErrorResponse);
         } finally {
@@ -163,7 +154,7 @@ public class CambriaHandler {
 
     /**
      * process the error message from Cambria client.
-     *
+     * <p>
      * set Cambria status and http code in case we succeed to fetch it
      *
      * @return
@@ -178,19 +169,20 @@ public class CambriaHandler {
             cambriaErrorResponse.setHttpCode(httpCode);
             switch (httpCode.intValue()) {
 
-            case 401:
-                cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.AUTHENTICATION_ERROR);
-                break;
-            case 409:
-                cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.TOPIC_ALREADY_EXIST);
-                break;
-            case 500:
-                cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.INTERNAL_SERVER_ERROR);
-                break;
-            default:
-                cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.CONNNECTION_ERROR);
+                case 401:
+                    cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.AUTHENTICATION_ERROR);
+                    break;
+                case 409:
+                    cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.TOPIC_ALREADY_EXIST);
+                    break;
+                case 500:
+                    cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.INTERNAL_SERVER_ERROR);
+                    break;
+                default:
+                    cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.CONNNECTION_ERROR);
             }
-        } else {
+        }
+        else {
 
             boolean found = false;
             Throwable throwable = e.getCause();
@@ -210,7 +202,7 @@ public class CambriaHandler {
                 }
             }
 
-            if (false == found) {
+            if (!found) {
                 cambriaErrorResponse.setOperationStatus(CambriaOperationStatus.CONNNECTION_ERROR);
                 cambriaErrorResponse.setHttpCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);
             }
@@ -221,33 +213,29 @@ public class CambriaHandler {
 
     /**
      * write the error to the log
-     *
-     * @param cambriaErrorResponse
-     * @param errorMessage
+     *  @param cambriaErrorResponse
      * @param methodName
      * @param operationDesc
      */
-    private void writeErrorToLog(CambriaErrorResponse cambriaErrorResponse, String errorMessage, String methodName, String operationDesc) {
+    private void writeErrorToLog(CambriaErrorResponse cambriaErrorResponse, String methodName, String operationDesc) {
 
         String httpCode = cambriaErrorResponse.getHttpCode() == null ? "" : String.valueOf(cambriaErrorResponse.getHttpCode());
 
         switch (cambriaErrorResponse.getOperationStatus()) {
-        case UNKNOWN_HOST_ERROR:
-            String hostname = cambriaErrorResponse.getVariables().get(0);
-            BeEcompErrorManager.getInstance().logBeUebUnkownHostError(methodName, httpCode);
-            break;
-        case AUTHENTICATION_ERROR:
-            BeEcompErrorManager.getInstance().logBeUebAuthenticationError(methodName, httpCode);
-            break;
-        case CONNNECTION_ERROR:
-            BeEcompErrorManager.getInstance().logBeUebConnectionError(methodName, httpCode);
-            break;
-
-        case INTERNAL_SERVER_ERROR:
-            BeEcompErrorManager.getInstance().logBeUebSystemError(methodName, operationDesc);
-            break;
-        default:
-            break;
+            case UNKNOWN_HOST_ERROR:
+                BeEcompErrorManager.getInstance().logBeUebUnkownHostError(methodName, httpCode);
+                break;
+            case AUTHENTICATION_ERROR:
+                BeEcompErrorManager.getInstance().logBeUebAuthenticationError(methodName, httpCode);
+                break;
+            case CONNNECTION_ERROR:
+                BeEcompErrorManager.getInstance().logBeUebConnectionError(methodName, httpCode);
+                break;
+            case INTERNAL_SERVER_ERROR:
+                BeEcompErrorManager.getInstance().logBeUebSystemError(methodName, operationDesc);
+                break;
+            default:
+                break;
         }
 
     }
@@ -255,12 +243,10 @@ public class CambriaHandler {
     /**
      * create a topic if it does not exists in the topicsList
      *
-     * @param hostSet
-     *            - list of U-EB servers
+     * @param hostSet          - list of U-EB servers
      * @param apiKey
      * @param secretKey
-     * @param topicName
-     *            - topic to create
+     * @param topicName        - topic to create
      * @param partitionCount
      * @param replicationCount
      * @return
@@ -270,20 +256,20 @@ public class CambriaHandler {
         CambriaTopicManager createTopicManager = null;
         try {
 
-            createTopicManager = buildCambriaClient(new TopicManagerBuilder().usingHosts(hostSet).authenticatedBy(apiKey, secretKey));
+            createTopicManager = buildCambriaClient(new TopicManagerBuilder().usingHosts(hostSet)
+                                                                             .authenticatedBy(apiKey, secretKey));
 
             createTopicManager.createTopic(topicName, "ASDC distribution notification topic", partitionCount, replicationCount);
 
-        } catch (HttpException | IOException | GeneralSecurityException e) {
+        }
+        catch (HttpException | IOException | GeneralSecurityException e) {
 
-            logger.debug("Failed to create topic {}", topicName, e);
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
+            log.debug("Failed to create topic {}", topicName, e);
 
             CambriaErrorResponse cambriaErrorResponse = processError(e);
 
             if (cambriaErrorResponse.getOperationStatus() != CambriaOperationStatus.TOPIC_ALREADY_EXIST) {
-                writeErrorToLog(cambriaErrorResponse, e.getMessage(), methodName, "create topic");
+                writeErrorToLog(cambriaErrorResponse, "createTopic", "create topic");
             }
 
             return cambriaErrorResponse;
@@ -298,34 +284,35 @@ public class CambriaHandler {
     }
 
     public CambriaErrorResponse unRegisterFromTopic(Collection<String> hostSet, String managerApiKey, String managerSecretKey, String subscriberApiKey, SubscriberTypeEnum subscriberTypeEnum, String topicName) {
+        String methodName = "unRegisterFromTopic";
         CambriaTopicManager createTopicManager = null;
         try {
-            createTopicManager = buildCambriaClient(new TopicManagerBuilder().usingHosts(hostSet).authenticatedBy(managerApiKey, managerSecretKey));
+            createTopicManager = buildCambriaClient(new TopicManagerBuilder().usingHosts(hostSet)
+                                                                             .authenticatedBy(managerApiKey, managerSecretKey));
 
             if (subscriberTypeEnum == SubscriberTypeEnum.PRODUCER) {
                 createTopicManager.revokeProducer(topicName, subscriberApiKey);
-            } else {
+            }
+            else {
                 createTopicManager.revokeConsumer(topicName, subscriberApiKey);
             }
 
-        } catch (HttpObjectNotFoundException | GeneralSecurityException e) {
-            logger.debug("Failed to unregister {} from topic {} as {}", managerApiKey, topicName, subscriberTypeEnum.toString().toLowerCase(), e);
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
-
+        }
+        catch (HttpObjectNotFoundException e) {
+            log.debug("Failed to unregister {} from topic {} as {}", managerApiKey, topicName, subscriberTypeEnum.toString()
+                                                                                                                 .toLowerCase(), e);
             BeEcompErrorManager.getInstance().logBeUebObjectNotFoundError(methodName, e.getMessage());
 
-            CambriaErrorResponse cambriaErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.OBJECT_NOT_FOUND, HttpStatus.SC_NOT_FOUND);
-            return cambriaErrorResponse;
-
-        } catch (HttpException | IOException e) {
-            logger.debug("Failed to unregister {} from topic {} as producer", managerApiKey, topicName, e);
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
+            return new CambriaErrorResponse(CambriaOperationStatus.OBJECT_NOT_FOUND, HttpStatus.SC_NOT_FOUND);
 
+        }
+        catch (HttpException | IOException | GeneralSecurityException e) {
+            log.debug("Failed to unregister {} from topic {} as producer", managerApiKey, topicName, e);
             CambriaErrorResponse cambriaErrorResponse = processError(e);
 
-            writeErrorToLog(cambriaErrorResponse, e.getMessage(), methodName, "unregister from topic as " + subscriberTypeEnum.toString().toLowerCase());
+            writeErrorToLog(cambriaErrorResponse, methodName, "unregister from topic as " + subscriberTypeEnum
+                    .toString()
+                    .toLowerCase());
 
             return cambriaErrorResponse;
         } finally {
@@ -334,12 +321,10 @@ public class CambriaHandler {
             }
         }
 
-        CambriaErrorResponse cambriaErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.OK, HttpStatus.SC_OK);
-        return cambriaErrorResponse;
+        return new CambriaErrorResponse(CambriaOperationStatus.OK, HttpStatus.SC_OK);
     }
 
     /**
-     *
      * register a public key (subscriberId) to a given topic as a CONSUMER or PRODUCER
      *
      * @param hostSet
@@ -352,34 +337,37 @@ public class CambriaHandler {
      */
     public CambriaErrorResponse registerToTopic(Collection<String> hostSet, String managerApiKey, String managerSecretKey, String subscriberApiKey, SubscriberTypeEnum subscriberTypeEnum, String topicName) {
 
+        String methodName = "registerToTopic";
         CambriaTopicManager createTopicManager = null;
         try {
-            createTopicManager = buildCambriaClient(new TopicManagerBuilder().usingHosts(hostSet).authenticatedBy(managerApiKey, managerSecretKey));
+            createTopicManager = buildCambriaClient(new TopicManagerBuilder().usingHosts(hostSet)
+                                                                             .authenticatedBy(managerApiKey, managerSecretKey));
 
             if (subscriberTypeEnum == SubscriberTypeEnum.PRODUCER) {
                 createTopicManager.allowProducer(topicName, subscriberApiKey);
-            } else {
+            }
+            else {
                 createTopicManager.allowConsumer(topicName, subscriberApiKey);
             }
 
-        } catch (HttpObjectNotFoundException | GeneralSecurityException e) {
-            logger.debug("Failed to register {} to topic {} as {}", managerApiKey, topicName, subscriberTypeEnum.toString().toLowerCase(), e);
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
+        }
+        catch (HttpObjectNotFoundException e) {
+            log.debug("Failed to register {} to topic {} as {}", managerApiKey, topicName, subscriberTypeEnum.toString()
+                                                                                                             .toLowerCase(), e);
 
             BeEcompErrorManager.getInstance().logBeUebObjectNotFoundError(methodName, e.getMessage());
 
-            CambriaErrorResponse cambriaErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.OBJECT_NOT_FOUND, HttpStatus.SC_NOT_FOUND);
-            return cambriaErrorResponse;
-
-        } catch (HttpException | IOException e) {
-            logger.debug("Failed to register {} to topic {} as {}", managerApiKey, topicName, subscriberTypeEnum.toString().toLowerCase(), e);
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
+            return new CambriaErrorResponse(CambriaOperationStatus.OBJECT_NOT_FOUND, HttpStatus.SC_NOT_FOUND);
 
+        }
+        catch (HttpException | IOException | GeneralSecurityException e) {
+            log.debug("Failed to register {} to topic {} as {}", managerApiKey, topicName, subscriberTypeEnum.toString()
+                                                                                                             .toLowerCase(), e);
             CambriaErrorResponse cambriaErrorResponse = processError(e);
 
-            writeErrorToLog(cambriaErrorResponse, e.getMessage(), methodName, "register to topic as " + subscriberTypeEnum.toString().toLowerCase());
+            writeErrorToLog(cambriaErrorResponse, methodName, "register to topic as " + subscriberTypeEnum
+                    .toString()
+                    .toLowerCase());
 
             return cambriaErrorResponse;
         } finally {
@@ -388,8 +376,7 @@ public class CambriaHandler {
             }
         }
 
-        CambriaErrorResponse cambriaErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.OK, HttpStatus.SC_OK);
-        return cambriaErrorResponse;
+        return new CambriaErrorResponse(CambriaOperationStatus.OK, HttpStatus.SC_OK);
     }
 
     /**
@@ -407,7 +394,12 @@ public class CambriaHandler {
      */
     public CambriaConsumer createConsumer(Collection<String> hostSet, String topicName, String apiKey, String secretKey, String consumerId, String consumerGroup, int timeoutMS) throws Exception {
 
-        CambriaConsumer consumer = new ConsumerBuilder().authenticatedBy(apiKey, secretKey).knownAs(consumerGroup, consumerId).onTopic(topicName).usingHosts(hostSet).waitAtServer(timeoutMS).build();
+        CambriaConsumer consumer = new ConsumerBuilder().authenticatedBy(apiKey, secretKey)
+                                                        .knownAs(consumerGroup, consumerId)
+                                                        .onTopic(topicName)
+                                                        .usingHosts(hostSet)
+                                                        .waitAtServer(timeoutMS)
+                                                        .build();
         consumer.setApiCredentials(apiKey, secretKey);
         return consumer;
     }
@@ -428,31 +420,25 @@ public class CambriaHandler {
      */
     public Either<Iterable<String>, CambriaErrorResponse> fetchFromTopic(CambriaConsumer topicConsumer) {
 
+        String methodName = "fetchFromTopic";
         try {
             Iterable<String> messages = topicConsumer.fetch();
             if (messages == null) {
-                messages = new ArrayList<String>();
+                messages = new ArrayList<>();
             }
             return Either.left(messages);
 
-        } catch (IOException e) {
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
-
+        }
+        catch (IOException e) {
             CambriaErrorResponse cambriaErrorResponse = processError(e);
-
-            logger.debug("Failed to fetch from U-EB topic. error={}", e.getMessage());
-            writeErrorToLog(cambriaErrorResponse, e.getMessage(), methodName, "get messages from topic");
-
+            log.debug("Failed to fetch from U-EB topic. error={}", e.getMessage());
+            writeErrorToLog(cambriaErrorResponse, methodName, "get messages from topic");
             return Either.right(cambriaErrorResponse);
 
-        } catch (Exception e) {
-            logger.debug("Failed to fetch from U-EB topic", e);
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
-
+        }
+        catch (Exception e) {
+            log.debug("Failed to fetch from U-EB topic", e);
             BeEcompErrorManager.getInstance().logBeDistributionEngineSystemError(methodName, e.getMessage());
-
             CambriaErrorResponse cambriaErrorResponse = new CambriaErrorResponse(CambriaOperationStatus.INTERNAL_SERVER_ERROR, HttpStatus.SC_INTERNAL_SERVER_ERROR);
             return Either.right(cambriaErrorResponse);
         }
@@ -475,7 +461,7 @@ public class CambriaHandler {
         try {
 
             String json = gson.toJson(data);
-            logger.trace("Before sending notification data {} to topic {}", json, topicName);
+            log.trace("Before sending notification data {} to topic {}", json, topicName);
 
             createSimplePublisher = new PublisherBuilder().onTopic(topicName).usingHosts(uebServers).build();
             createSimplePublisher.setApiCredentials(uebPublicKey, uebSecretKey);
@@ -483,46 +469,42 @@ public class CambriaHandler {
             int result = createSimplePublisher.send(PARTITION_KEY, json);
 
             try {
-                Thread.sleep(1 * 1000);
-            } catch (InterruptedException e) {
-                logger.debug("Failed during sleep after sending the message.", e);
+                SECONDS.sleep(1L);
+            }
+            catch (InterruptedException e) {
+                log.debug("Failed during sleep after sending the message.", e);
             }
 
-            logger.debug("After sending notification data to topic {}. result is {}", topicName, result);
-
-            CambriaErrorResponse response = new CambriaErrorResponse(CambriaOperationStatus.OK, 200);
+            log.debug("After sending notification data to topic {}. result is {}", topicName, result);
 
-            return response;
+            return new CambriaErrorResponse(CambriaOperationStatus.OK, 200);
 
         } catch (IOException | GeneralSecurityException e) {
-            logger.debug("Failed to send notification {} to topic {} ", data, topicName, e);
-
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
+            log.debug("Failed to send notification {} to topic {} ", data, topicName, e);
 
             CambriaErrorResponse cambriaErrorResponse = processError(e);
 
-            writeErrorToLog(cambriaErrorResponse, e.getMessage(), methodName, SEND_NOTIFICATION);
+            writeErrorToLog(cambriaErrorResponse, "sendNotification", SEND_NOTIFICATION);
 
             return cambriaErrorResponse;
-        } finally {
+        }
+        finally {
             if (createSimplePublisher != null) {
-                logger.debug("Before closing publisher");
+                log.debug("Before closing publisher");
                 createSimplePublisher.close();
-                logger.debug("After closing publisher");
+                log.debug("After closing publisher");
             }
         }
     }
 
     public CambriaErrorResponse sendNotificationAndClose(String topicName, String uebPublicKey, String uebSecretKey, List<String> uebServers, INotificationData data, long waitBeforeCloseTimeout) {
-
-        CambriaBatchingPublisher createSimplePublisher = null;
-
-        CambriaErrorResponse response = null;
+        String methodName = "sendNotificationAndClose";
+        CambriaBatchingPublisher createSimplePublisher;
+        CambriaErrorResponse response;
         try {
 
             String json = gson.toJson(data);
-            logger.debug("Before sending notification data {} to topic {}", json, topicName);
+            log.debug("Before sending notification data {} to topic {}", json, topicName);
 
             createSimplePublisher = new PublisherBuilder().onTopic(topicName).usingHosts(uebServers).build();
             createSimplePublisher.setApiCredentials(uebPublicKey, uebSecretKey);
@@ -531,47 +513,45 @@ public class CambriaHandler {
 
             try {
                 Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                logger.debug("Failed during sleep after sending the message.", e);
+            }
+            catch (InterruptedException e) {
+                log.debug("Failed during sleep after sending the message.", e);
             }
 
-            logger.debug("After sending notification data to topic {}. result is {}", topicName, result);
+            log.debug("After sending notification data to topic {}. result is {}", topicName, result);
 
-        } catch (IOException | GeneralSecurityException  e) {
-            logger.debug("Failed to send notification {} to topic {} ", data, topicName, e);
+        }
+        catch (IOException | GeneralSecurityException  e) {
+            log.debug("Failed to send notification {} to topic {} ", data, topicName, e);
 
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
 
             response = processError(e);
 
-            writeErrorToLog(response, e.getMessage(), methodName, SEND_NOTIFICATION);
+            writeErrorToLog(response, methodName, SEND_NOTIFICATION);
 
             return response;
 
         }
 
-        logger.debug("Before closing publisher. Maximum timeout is {} seconds", waitBeforeCloseTimeout);
+        log.debug("Before closing publisher. Maximum timeout is {} seconds", waitBeforeCloseTimeout);
         try {
-            List<message> messagesInQ = createSimplePublisher.close(waitBeforeCloseTimeout, TimeUnit.SECONDS);
-            if (messagesInQ != null && false == messagesInQ.isEmpty()) {
-                logger.debug("Cambria client returned {} non sent messages.", messagesInQ.size());
+            List<message> messagesInQ = createSimplePublisher.close(waitBeforeCloseTimeout, SECONDS);
+            if (messagesInQ != null && !messagesInQ.isEmpty()) {
+                log.debug("Cambria client returned {} non sent messages.", messagesInQ.size());
                 response = new CambriaErrorResponse(CambriaOperationStatus.INTERNAL_SERVER_ERROR, 500);
-                String methodName = new Object() {
-                }.getClass().getEnclosingMethod().getName();
-                writeErrorToLog(response, "closing publisher returned non sent messages", methodName, SEND_NOTIFICATION);
-            } else {
-                logger.debug("No message left in the queue after closing cambria publisher");
+                writeErrorToLog(response, methodName, SEND_NOTIFICATION);
+            }
+            else {
+                log.debug("No message left in the queue after closing cambria publisher");
                 response = new CambriaErrorResponse(CambriaOperationStatus.OK, 200);
             }
-        } catch (IOException | InterruptedException e) {
-            logger.debug("Failed to close cambria publisher", e);
+        }
+        catch (IOException | InterruptedException e) {
+            log.debug("Failed to close cambria publisher", e);
             response = new CambriaErrorResponse(CambriaOperationStatus.INTERNAL_SERVER_ERROR, 500);
-            String methodName = new Object() {
-            }.getClass().getEnclosingMethod().getName();
-            writeErrorToLog(response, "closing publisher returned non sent messages", methodName, SEND_NOTIFICATION);
+            writeErrorToLog(response, methodName, SEND_NOTIFICATION);
         }
-        logger.debug("After closing publisher");
+        log.debug("After closing publisher");
 
         return response;
 
@@ -579,8 +559,7 @@ public class CambriaHandler {
 
     public CambriaErrorResponse getApiKey(String server, String apiKey) {
 
-        CambriaErrorResponse response = null;
-
+        CambriaErrorResponse response;
         List<String> hostSet = new ArrayList<>();
         hostSet.add(server);
         try {
@@ -589,8 +568,9 @@ public class CambriaHandler {
 
             response = new CambriaErrorResponse(CambriaOperationStatus.OK, 200);
 
-        } catch (HttpException | IOException | CambriaApiException | GeneralSecurityException e) {
-            logger.debug("Failed to fetch api key {} from server {}", apiKey, server, e);
+        }
+        catch (HttpException | IOException | CambriaApiException | GeneralSecurityException e) {
+            log.debug("Failed to fetch api key {} from server {}", apiKey, server, e);
 
             response = processError(e);
 
@@ -610,8 +590,9 @@ public class CambriaHandler {
             createIdentityManager.setApiCredentials(credential.getApiKey(), credential.getApiSecret());
             result = Either.left(credential);
 
-        } catch (Exception e) {
-            logger.debug("Failed to create ueb keys for servers {}",hostSet, e);
+        }
+        catch (Exception e) {
+            log.debug("Failed to create ueb keys for servers {}", hostSet, e);
 
             result = Either.right(processError(e));
 
@@ -622,6 +603,6 @@ public class CambriaHandler {
 
     @VisibleForTesting
     <T extends CambriaClient> T buildCambriaClient(CambriaClientBuilders.AbstractAuthenticatedManagerBuilder<? extends CambriaClient> client) throws MalformedURLException, GeneralSecurityException {
-        return (T)client.build();
+        return (T) client.build();
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DME2EndpointIteratorCreator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DME2EndpointIteratorCreator.java
index 780a40c118..e2049a64f5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DME2EndpointIteratorCreator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DME2EndpointIteratorCreator.java
@@ -1,11 +1,10 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import org.springframework.stereotype.Component;
-
 import com.att.aft.dme2.api.DME2Exception;
 import com.att.aft.dme2.api.DME2Manager;
 import com.att.aft.dme2.iterator.DME2EndpointIterator;
 import com.att.aft.dme2.iterator.factory.DME2EndpointIteratorFactory;
+import org.springframework.stereotype.Component;
 
 @Component
 public class DME2EndpointIteratorCreator {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java
index 5337283e1a..9d428c812a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngine.java
@@ -42,6 +42,7 @@ import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
 import org.openecomp.sdc.common.util.YamlToObjectConverter;
@@ -288,17 +289,16 @@ public class DistributionEngine implements IDistributionEngine {
     }
 
     @Override
-    public ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envName, String userId, String modifierName) {
-        return notifyService(distributionId, service, notificationData, envName, envName, userId, modifierName);
+    public ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envName, User modifier) {
+        return notifyService(distributionId, service, notificationData, envName, envName, modifier);
     }
-
     @Override
-    public ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envId, String envName, String userId, String modifierName) {
-        LOGGER.debug("Received notify service request. distributionId = {}, serviceUuid = {} serviceUid = {}, envName = {}, userId = {}, modifierName {}", distributionId, service.getUUID(), service.getUniqueId(), envName, userId, modifierName);
+    public ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envId, String envName,  User modifier) {
+        LOGGER.debug("Received notify service request. distributionId = {}, serviceUuid = {} serviceUid = {}, envName = {}, modifier {}", distributionId, service.getUUID(), service.getUniqueId(), envName,  modifier);
         String topicName = buildTopicName(envName);
         ActionStatus notifyServiceStatus = Optional.ofNullable(environmentsEngine.getEnvironmentById(envId))
                 .map(EnvironmentMessageBusData::new)
-                .map(messageBusData -> distributionNotificationSender.sendNotification(topicName, distributionId, messageBusData, notificationData, service, userId, modifierName))
+                .map(messageBusData -> distributionNotificationSender.sendNotification(topicName, distributionId, messageBusData, notificationData, service, modifier))
                 .orElse(ActionStatus.DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE);
         LOGGER.debug("Finish notifyService. status is {}", notifyServiceStatus);
         return notifyServiceStatus;
@@ -311,23 +311,13 @@ public class DistributionEngine implements IDistributionEngine {
     }
 
     @Override
-    public StorageOperationStatus isReadyForDistribution(Service service, String envName) {
+    public StorageOperationStatus isReadyForDistribution(String envName) {
         StorageOperationStatus status = isEnvironmentAvailable(envName);
         if (status != StorageOperationStatus.OK) {
             String envErrorDec = getEnvironmentErrorDescription(status);
             BeEcompErrorManager.getInstance().logBeDistributionEngineSystemError(DistributionNotificationSender.DISTRIBUTION_NOTIFICATION_SENDING, "Environment name " + envName + " is not available. Reason : " + envErrorDec);
-            return status;
         }
-
-        return verifyServiceHasDeploymentArtifacts(service);
-    }
-
-    @Override
-    public StorageOperationStatus verifyServiceHasDeploymentArtifacts(Service service) {
-         if (!serviceDistributionArtifactsBuilder.verifyServiceContainsDeploymentArtifacts(service)) {
-             return StorageOperationStatus.DISTR_ARTIFACT_NOT_FOUND;
-         }
-        return StorageOperationStatus.OK;
+        return status;
     }
 
     @Override
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineClusterHealth.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineClusterHealth.java
index 48533f1518..e803730566 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineClusterHealth.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineClusterHealth.java
@@ -20,38 +20,30 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.api.HealthCheckInfo;
 import org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 @Component("distribution-engine-cluster-health")
 public class DistributionEngineClusterHealth {
 
     protected static String UEB_HEALTH_LOG_CONTEXT = "ueb.healthcheck";
 
-    private static final Logger healthLogger = LoggerFactory.getLogger(UEB_HEALTH_LOG_CONTEXT);
+    //TODO use LoggerMetric instead
+    private static final Logger healthLogger = Logger.getLogger(UEB_HEALTH_LOG_CONTEXT);
 
     private static final String UEB_HEALTH_CHECK_STR = "uebHealthCheck";
 
@@ -63,7 +55,7 @@ public class DistributionEngineClusterHealth {
 
     private long healthCheckReadTimeout = 20;
 
-    private static final Logger logger = LoggerFactory.getLogger(DistributionEngineClusterHealth.class);
+    private static final Logger logger = Logger.getLogger(DistributionEngineClusterHealth.class.getName());
 
     private List<String> uebServers = null;
 
@@ -149,7 +141,7 @@ public class DistributionEngineClusterHealth {
 
             boolean healthStatus = verifyAtLeastOneEnvIsUp();
 
-            if (true == healthStatus) {
+            if (healthStatus) {
                 boolean queryUebStatus = queryUeb();
                 if (queryUebStatus == lastHealthState) {
                     return;
@@ -160,7 +152,7 @@ public class DistributionEngineClusterHealth {
                         logger.trace("UEB Health State Changed to {}. Issuing alarm / recovery alarm...", healthStatus);
                         lastHealthState = queryUebStatus;
                         logAlarm(lastHealthState);
-                        if (true == queryUebStatus) {
+                        if (queryUebStatus) {
                             healthCheckInfo = HealthCheckInfoResult.OK.getHealthCheckInfo();
                         } else {
                             healthCheckInfo = HealthCheckInfoResult.UNAVAILABLE.getHealthCheckInfo();
@@ -185,7 +177,7 @@ public class DistributionEngineClusterHealth {
                 Collection<AtomicBoolean> values = envNamePerStatus.values();
                 if (values != null) {
                     for (AtomicBoolean status : values) {
-                        if (true == status.get()) {
+                        if (status.get()) {
                             healthStatus = true;
                             break;
                         }
@@ -226,7 +218,7 @@ public class DistributionEngineClusterHealth {
 
                     healthLogger.debug("After running Health Check retry query number {} towards UEB server {}. Result is {}", retryNumber, healthCheckCall.getServer(), result);
 
-                    if (result != null && true == result.booleanValue()) {
+                    if (result != null && result.booleanValue()) {
                         break;
                     }
 
@@ -300,7 +292,7 @@ public class DistributionEngineClusterHealth {
     public void startHealthCheckTask(Map<String, AtomicBoolean> envNamePerStatus, boolean startTask) {
         this.envNamePerStatus = envNamePerStatus;
 
-        if (startTask == true && this.scheduledFuture == null) {
+        if (startTask && this.scheduledFuture == null) {
             this.scheduledFuture = this.healthCheckScheduler.scheduleAtFixedRate(healthCheckScheduledTask, 0, reconnectInterval, TimeUnit.SECONDS);
         }
     }
@@ -310,7 +302,7 @@ public class DistributionEngineClusterHealth {
     }
 
     private void logAlarm(boolean lastHealthState) {
-        if (lastHealthState == true) {
+        if (lastHealthState) {
             BeEcompErrorManager.getInstance().logBeHealthCheckUebClusterRecovery(UEB_HEALTH_CHECK_STR);
         } else {
             BeEcompErrorManager.getInstance().logBeHealthCheckUebClusterError(UEB_HEALTH_CHECK_STR);
@@ -337,11 +329,11 @@ public class DistributionEngineClusterHealth {
 
     public void setHealthCheckOkAndReportInCaseLastStateIsDown() {
 
-        if (lastHealthState == true) {
+        if (lastHealthState) {
             return;
         }
         synchronized (lockOject) {
-            if (lastHealthState == false) {
+            if (!lastHealthState) {
                 logger.debug("Going to update health check state to available");
                 lastHealthState = true;
                 healthCheckInfo = HealthCheckInfoResult.OK.getHealthCheckInfo();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java
index 043efdf81d..2b1e716fa0 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEngineInitTask.java
@@ -20,6 +20,16 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
+import fj.data.Either;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
+import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.Executors;
@@ -29,17 +39,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
-import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import fj.data.Either;
-
 public class DistributionEngineInitTask implements Runnable {
 
     public static final String INIT_DISTRIBUTION_ENGINE_FLOW = "initDistributionEngine";
@@ -80,7 +79,7 @@ public class DistributionEngineInitTask implements Runnable {
 
     private ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
 
-    private static final Logger logger = LoggerFactory.getLogger(DistributionEngineInitTask.class);
+    private static final Logger logger = Logger.getLogger(DistributionEngineInitTask.class.getName());
 
     ScheduledFuture<?> scheduledFuture = null;
 
@@ -127,7 +126,7 @@ public class DistributionEngineInitTask implements Runnable {
         if (scheduledFuture != null) {
             boolean result = scheduledFuture.cancel(true);
             logger.debug("Stop reinit task. result = {}", result);
-            if (false == result) {
+            if (!result) {
                 BeEcompErrorManager.getInstance().logBeUebSystemError(INIT_DISTRIBUTION_ENGINE_FLOW, "try to stop the reinit task");
             }
             scheduledFuture = null;
@@ -147,7 +146,7 @@ public class DistributionEngineInitTask implements Runnable {
         boolean result = false;
         result = initFlow();
 
-        if (true == result) {
+        if (result) {
             this.stopTask();
             this.status.set(true);
             if (this.distributionEnginePollingTask != null) {
@@ -156,7 +155,7 @@ public class DistributionEngineInitTask implements Runnable {
                 this.distributionEnginePollingTask.startTask(topicName);
             }
         } else {
-            if (false == maximumRetryInterval) {
+            if (!maximumRetryInterval) {
                 this.restartTask();
             }
         }
@@ -189,9 +188,7 @@ public class DistributionEngineInitTask implements Runnable {
 
         String notificationTopic = buildTopicName(deConfiguration.getDistributionNotifTopicName(), this.envName);
         logger.debug("Going to handle topic {}", notificationTopic);
-
-        boolean status = createTopicIfNotExists(topicsList, notificationTopic);
-        if (false == status) {
+        if (!createNotificationTopicIfNotExists(topicsList, notificationTopic)) {
             return false;
         }
 
@@ -205,8 +202,7 @@ public class DistributionEngineInitTask implements Runnable {
 
         String statusTopic = buildTopicName(deConfiguration.getDistributionStatusTopicName(), this.envName);
         logger.debug("Going to handle topic {}", statusTopic);
-        status = createTopicIfNotExists(topicsList, statusTopic);
-        if (false == status) {
+        if (!createStatusTopicIfNotExists(topicsList, statusTopic)) {
             return false;
         }
 
@@ -234,40 +230,63 @@ public class DistributionEngineInitTask implements Runnable {
         if (componentsUtils != null) {
             Integer httpCode = registerProducerStatus.getHttpCode();
             String httpCodeStr = String.valueOf(httpCode);
-            this.componentsUtils.auditDistributionEngine(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL, this.envName, notificationTopic, role, environmentEntry.getUebApikey(), httpCodeStr);
+            this.componentsUtils.auditDistributionEngine(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL, this.envName,
+                    DistributionTopicData.newBuilder()
+                            .notificationTopic(notificationTopic)
+                            .build(),
+                    role, environmentEntry.getUebApikey(), httpCodeStr);
         }
     }
 
-    private boolean createTopicIfNotExists(Set<String> topicsList, String topicName) {
+    private boolean createStatusTopicIfNotExists(Set<String> topicsList, String topicName) {
+        DistributionTopicData distributionTopicData = DistributionTopicData.newBuilder()
+                .statusTopic(topicName)
+                .build();
+        return createDistributionTopic(topicsList, topicName, distributionTopicData);
+    }
+
+    private boolean createNotificationTopicIfNotExists(Set<String> topicsList, String topicName) {
+
+        DistributionTopicData distributionTopicData = DistributionTopicData.newBuilder()
+                .notificationTopic(topicName)
+                .build();
+        return createDistributionTopic(topicsList, topicName, distributionTopicData);
+    }
+
+    private boolean createDistributionTopic(Set<String> topicsList, String topicName, DistributionTopicData distributionTopicData) {
+
+        boolean isSucceeded = true;
 
         if (topicsList.contains(topicName)) {
             if (componentsUtils != null) {
-                this.componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, topicName, null, null, ALREADY_EXISTS);
+                componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, distributionTopicData, ALREADY_EXISTS);
             }
-            return true;
+            return isSucceeded;
         }
-
         CambriaErrorResponse createDistribTopicStatus = cambriaHandler.createTopic(environmentEntry.getDmaapUebAddress(), environmentEntry.getUebApikey(), environmentEntry.getUebSecretKey(), topicName, deConfiguration.getCreateTopic().getPartitionCount(),
                 deConfiguration.getCreateTopic().getReplicationCount());
 
         CambriaOperationStatus status = createDistribTopicStatus.getOperationStatus();
-        if (status == CambriaOperationStatus.TOPIC_ALREADY_EXIST) {
-            if (componentsUtils != null) {
-                this.componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, topicName, null, null, ALREADY_EXISTS);
-            }
-        } else if (status == CambriaOperationStatus.OK) {
-            if (componentsUtils != null) {
-                this.componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, topicName, null, null, CREATED);
-            }
-        } else {
-            if (componentsUtils != null) {
-                this.componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, topicName, null, null, FAILED);
-            }
-            BeEcompErrorManager.getInstance().logBeUebSystemError(INIT_DISTRIBUTION_ENGINE_FLOW, "try to create topic " + topicName);
-            return false;
+        switch (status) {
+            case OK:
+                if (componentsUtils != null) {
+                    componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, distributionTopicData, CREATED);
+                }
+                break;
+            case TOPIC_ALREADY_EXIST:
+                if (componentsUtils != null) {
+                    componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, distributionTopicData, ALREADY_EXISTS);
+                }
+                break;
+            default:
+                if (componentsUtils != null) {
+                    componentsUtils.auditDistributionEngine(AuditingActionEnum.CREATE_DISTRIBUTION_TOPIC, this.envName, distributionTopicData, FAILED);
+                }
+                BeEcompErrorManager.getInstance().logBeUebSystemError(INIT_DISTRIBUTION_ENGINE_FLOW, "try to create topic " + topicName);
+                isSucceeded = false;
+                break;
         }
-
-        return true;
+        return isSucceeded;
     }
 
     public static String buildTopicName(String topicName, String environment) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTask.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTask.java
index d41d334bff..276ef68b92 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTask.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionEnginePollingTask.java
@@ -20,11 +20,10 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
+import com.att.nsa.cambria.client.CambriaConsumer;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.openecomp.sdc.be.components.distribution.engine.report.DistributionCompleteReporter;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
@@ -32,15 +31,12 @@ import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
 import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionStatusTopicConfig;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import com.att.nsa.cambria.client.CambriaConsumer;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import fj.data.Either;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 public class DistributionEnginePollingTask implements Runnable {
 
@@ -59,7 +55,7 @@ public class DistributionEnginePollingTask implements Runnable {
 
     private ScheduledExecutorService scheduledPollingService = Executors.newScheduledThreadPool(1, new BasicThreadFactory.Builder().namingPattern("TopicPollingThread-%d").build());
 
-    private static final Logger logger = LoggerFactory.getLogger(DistributionEnginePollingTask.class);
+    private static final Logger logger = Logger.getLogger(DistributionEnginePollingTask.class.getName());
 
     ScheduledFuture<?> scheduledFuture = null;
     private CambriaConsumer cambriaConsumer = null;
@@ -111,7 +107,7 @@ public class DistributionEnginePollingTask implements Runnable {
         if (scheduledFuture != null) {
             boolean result = scheduledFuture.cancel(true);
             logger.debug("Stop polling task. result = {}", result);
-            if (false == result) {
+            if (!result) {
                 BeEcompErrorManager.getInstance().logBeUebSystemError(DISTRIBUTION_STATUS_POLLING, "try to stop the polling task");
             }
             scheduledFuture = null;
@@ -177,7 +173,7 @@ public class DistributionEnginePollingTask implements Runnable {
     }
 
     private void handleDistributionNotificationMsg(DistributionStatusNotification notification) {
-        componentUtils.auditDistributionStatusNotification(AuditingActionEnum.DISTRIBUTION_STATUS, notification.getDistributionID(), notification.getConsumerID(), topicName, notification.getArtifactURL(),
+        componentUtils.auditDistributionStatusNotification(notification.getDistributionID(), notification.getConsumerID(), topicName, notification.getArtifactURL(),
                 String.valueOf(notification.getTimestamp()), notification.getStatus().name(), notification.getErrorReason());
         if (notification.isDistributionCompleteNotification()) {
             distributionCompleteReporter.reportDistributionComplete(notification);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionNotificationSender.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionNotificationSender.java
index 62af4b8514..80518c2da4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionNotificationSender.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DistributionNotificationSender.java
@@ -26,9 +26,8 @@ import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
 @Component("distributionNotificationSender")
@@ -36,32 +35,33 @@ public class DistributionNotificationSender {
 
     protected static final String DISTRIBUTION_NOTIFICATION_SENDING = "distributionNotificationSending";
 
-    private static final Logger logger = LoggerFactory.getLogger(DistributionNotificationSender.class);
+    private static final Logger logger = Logger.getLogger(DistributionNotificationSender.class.getName());
 
     @javax.annotation.Resource
     protected ComponentsUtils componentUtils;
     private CambriaHandler cambriaHandler = new CambriaHandler();
     private DistributionEngineConfiguration deConfiguration = ConfigurationManager.getConfigurationManager().getDistributionEngineConfiguration();
 
-    public ActionStatus sendNotification(String topicName, String distributionId, EnvironmentMessageBusData messageBusData, INotificationData notificationData, Service service, String userId, String modifierName) {
+    public ActionStatus sendNotification(String topicName, String distributionId, EnvironmentMessageBusData messageBusData, INotificationData notificationData, Service service, User modifier) {
         long startTime = System.currentTimeMillis();
         CambriaErrorResponse status = cambriaHandler.sendNotificationAndClose(topicName, messageBusData.getUebPublicKey(), messageBusData.getUebPrivateKey(), messageBusData.getDmaaPuebEndpoints(), notificationData,
                 deConfiguration.getDistributionNotificationTopic().getMaxWaitingAfterSendingSeconds());
         logger.info("After publishing service {} of version {}. Status is {}", service.getName(), service.getVersion(), status.getHttpCode());
-        auditDistributionNotification(topicName, distributionId, status, service, messageBusData.getEnvId(), userId, modifierName, notificationData.getWorkloadContext(), messageBusData.getTenant());
+        auditDistributionNotification(topicName, distributionId, status, service, messageBusData.getEnvId(), modifier, notificationData.getWorkloadContext(), messageBusData.getTenant());
         long endTime = System.currentTimeMillis();
         logger.debug("After building and publishing artifacts object. Total took {} milliseconds", (endTime - startTime));
         return convertCambriaResponse(status);
     }
 
-    private void auditDistributionNotification(String topicName, String distributionId, CambriaErrorResponse status, Service service, String envId, String userId, String modifierName, String workloadContext, String tenant) {
+    private void auditDistributionNotification(String topicName, String distributionId, CambriaErrorResponse status, Service service, String envId, User modifier
+            , String workloadContext, String tenant) {
         if (this.componentUtils != null) {
             Integer httpCode = status.getHttpCode();
             String httpCodeStr = String.valueOf(httpCode);
 
             String desc = getDescriptionFromErrorResponse(status);
 
-            this.componentUtils.auditDistributionNotification(AuditingActionEnum.DISTRIBUTION_NOTIFY, service.getUUID(), service.getName(), "Service", service.getVersion(), userId, modifierName, envId, service.getLifecycleState().name(), topicName,
+            this.componentUtils.auditDistributionNotification(service.getUUID(), service.getName(), "Service", service.getVersion(), modifier, envId, service.getLifecycleState().name(), topicName,
                     distributionId, desc, httpCodeStr, workloadContext, tenant);
         }
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java
index 9c4f8e1457..d3df0dc56e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java
@@ -1,27 +1,24 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.io.File;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.Properties;
-
+import com.att.nsa.mr.client.MRClientFactory;
+import com.att.nsa.mr.client.MRConsumer;
+import fj.data.Either;
 import org.openecomp.sdc.be.config.DmaapConsumerConfiguration;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.security.SecurityUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
-
-import fj.data.Either;
+import java.io.File;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.Properties;
 
 /**
  * Allows to create DMAAP client of type MRConsumer according received configuration parameters
  */
 @Component("dmaapClientFactory")
 public class DmaapClientFactory {
-    private static final Logger logger = LoggerFactory.getLogger(DmaapClientFactory.class);
+    private static final Logger logger = Logger.getLogger(DmaapClientFactory.class.getName());
 
     /**
      * Creates DMAAP consumer according to received parameters
@@ -35,7 +32,7 @@ public class DmaapClientFactory {
         return consumer;
     }
 
-    private Properties buildProperties(DmaapConsumerConfiguration parameters) throws Exception{
+    private Properties buildProperties(DmaapConsumerConfiguration parameters) throws GeneralSecurityException, IOException {
         Properties props = new Properties();
         Either<String,String> passkey = SecurityUtil.INSTANCE.decrypt(parameters.getCredential().getPassword() );
         if (passkey.isRight()){
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapConsumer.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapConsumer.java
index ef81b39f24..1f5865f27d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapConsumer.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapConsumer.java
@@ -1,19 +1,17 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
+import com.att.nsa.mr.client.MRConsumer;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.config.DmaapConsumerConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.att.nsa.mr.client.MRConsumer;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 /**
  * Allows consuming DMAAP topic according to received consumer parameters
@@ -23,7 +21,7 @@ import com.att.nsa.mr.client.MRConsumer;
 public class DmaapConsumer {
     private final ExecutorFactory executorFactory;
     private final DmaapClientFactory dmaapClientFactory;
-    private static final Logger logger = LoggerFactory.getLogger(DmaapClientFactory.class);
+    private static final Logger logger = Logger.getLogger(DmaapClientFactory.class.getName());
 
     @Autowired
     private DmaapHealth dmaapHealth;
@@ -68,7 +66,7 @@ public class DmaapConsumer {
                 //successfully fetched
             }
             catch (Exception e) {
-                logger.error("The exception {} occured upon fetching DMAAP message", e);
+                logger.error("The exception occured upon fetching DMAAP message", e);
             }
             dmaapHealth.report( isTopicAvailable );
         }, 0L, dmaapConsumerParams.getPollingInterval(), TimeUnit.SECONDS);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapHealth.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapHealth.java
index a215efd30d..b48ed78190 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapHealth.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapHealth.java
@@ -1,9 +1,16 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import static org.apache.commons.lang3.StringUtils.countMatches;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_DMAAP_ENGINE;
+import org.apache.commons.validator.routines.UrlValidator;
+import org.apache.http.client.utils.URIUtils;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.config.DmaapConsumerConfiguration;
+import org.openecomp.sdc.common.api.HealthCheckInfo;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URI;
@@ -14,27 +21,18 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
-import org.apache.commons.validator.routines.UrlValidator;
-import org.apache.http.client.utils.URIUtils;
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.config.DmaapConsumerConfiguration;
-import org.openecomp.sdc.common.api.HealthCheckInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
+import static org.apache.commons.lang3.StringUtils.countMatches;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_DMAAP_ENGINE;
 
 @Component("dmaapHealth")
 public class DmaapHealth {
 
 
-    protected static final String DMAAP_HEALTH_LOG_CONTEXT = "dmaap.healthcheck";
+    private static final String DMAAP_HEALTH_LOG_CONTEXT = "dmaap.healthcheck";
     private static final String DMAAP_HEALTH_CHECK_STR = "dmaapHealthCheck";
-    private static final Logger log = LoggerFactory.getLogger(DmaapHealth.class);
-    private static final Logger logHealth = LoggerFactory.getLogger(DMAAP_HEALTH_LOG_CONTEXT);
+    private static final Logger log = Logger.getLogger(DmaapHealth.class.getName());
+    private static final Logger logHealth = Logger.getLogger(DMAAP_HEALTH_LOG_CONTEXT);
     private HealthCheckInfo healthCheckInfo = DmaapHealth.HealthCheckInfoResult.UNAVAILABLE.getHealthCheckInfo();
     private long healthCheckReadTimeout = 20;
     private long reconnectInterval = 5;
@@ -110,7 +108,7 @@ public class DmaapHealth {
      *
      * @param startTask
      */
-    public void startHealthCheckTask( boolean startTask ) {
+    private void startHealthCheckTask(boolean startTask) {
         synchronized (DmaapHealth.class){
             if (startTask && this.scheduledFuture == null) {
                 this.scheduledFuture = this.scheduler.scheduleAtFixedRate(this.healthCheckScheduledTask , 0, reconnectInterval, TimeUnit.SECONDS);
@@ -118,27 +116,12 @@ public class DmaapHealth {
         }
     }
 
-    public void report(Boolean isUp){
+    void report(Boolean isUp){
         if (reportedHealthState == null)
             reportedHealthState = new AtomicBoolean(isUp);
         reportedHealthState.set(isUp);
     }
 
-    public void logAlarm(boolean lastHealthState) {
-        try{
-            if ( lastHealthState ) {
-                BeEcompErrorManager.getInstance().logDmaapHealthCheckRecovery( DMAAP_HEALTH_CHECK_STR );
-            } else {
-                BeEcompErrorManager.getInstance().logDmaapHealthCheckError( DMAAP_HEALTH_CHECK_STR );
-            }
-        }catch( Exception e ){
-            log.debug("cannot logAlarm -> {}" ,e );
-        }
-    }
-
-    public DmaapConsumerConfiguration getConfiguration() {
-        return configuration;
-    }
 
     public HealthCheckInfo getHealthCheckInfo() {
         return healthCheckInfo;
@@ -149,16 +132,16 @@ public class DmaapHealth {
      */
     public class HealthCheckScheduledTask implements Runnable {
         private final DmaapConsumerConfiguration config;
-        private static final int timeout = 8192;
+        private static final int TIMEOUT = 8192;
 
-        public HealthCheckScheduledTask(final DmaapConsumerConfiguration config){
+        HealthCheckScheduledTask(final DmaapConsumerConfiguration config){
             this.config = config;
         }
         @Override
         public void run() {
             logHealth.trace("Executing Dmaap Health Check Task - Start");
-            boolean prevIsReachable = false;
-            boolean reachable = false;
+            boolean prevIsReachable;
+            boolean reachable;
             //first try simple ping
             try{
                 if ( reportedHealthState != null ){
@@ -187,12 +170,25 @@ public class DmaapHealth {
         public boolean isICMPReachable( ) throws IOException{
             try{
                 String hostname = getUrlHost(config.getHosts());
-                return InetAddress.getByName( hostname ).isReachable(timeout);
+                return InetAddress.getByName( hostname ).isReachable(TIMEOUT);
             }catch( URISyntaxException e ){
                 log.debug("{} | malformed host configuration -> ",DMAAP_HEALTH_CHECK_STR , e);
             }
             return false;
         }
+
+        private void logAlarm(boolean lastHealthState) {
+            try{
+                if ( lastHealthState ) {
+                    BeEcompErrorManager.getInstance().logDmaapHealthCheckRecovery( DMAAP_HEALTH_CHECK_STR );
+                } else {
+                    BeEcompErrorManager.getInstance().logDmaapHealthCheckError( DMAAP_HEALTH_CHECK_STR );
+                }
+            }catch( Exception e ){
+                log.debug("cannot logAlarm -> {}" ,e );
+            }
+        }
+
     }
 
     public static String getUrlHost(String qualifiedHost) throws URISyntaxException{
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapNotificationDataImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapNotificationDataImpl.java
index 3f86fe73de..208fb84d25 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapNotificationDataImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapNotificationDataImpl.java
@@ -20,14 +20,16 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-/* Example {
-             "operationalEnvironmentId": "28122015552391",
-             "operationalEnvironmentName": "Operational Environment Name",
-             "operationalEnvironmentType": "ECOMP",
-             "tenantContext": "TEST",
-             "workloadContext": "ECOMP_E2E-IST",
-             "action": "Create"
-       }*/
+/**
+ *  Example {
+ *      "operationalEnvironmentId": "28122015552391",
+ *      "operationalEnvironmentName": "Operational Environment Name",
+ *      "operationalEnvironmentType": "ECOMP",
+ *      "tenantContext": "TEST",
+ *      "workloadContext": "ECOMP_E2E-IST",
+ *      "action": "Create"
+ *      }
+ */
 public class DmaapNotificationDataImpl implements IDmaapNotificationData, IDmaapAuditNotificationData {
 
     private String operationalEnvironmentId;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentMessageBusData.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentMessageBusData.java
index d3937a4ed2..67977b6361 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentMessageBusData.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentMessageBusData.java
@@ -1,10 +1,10 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
+import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
-
 /**
  * a pojo which holds all the necessary data to communicate with the message bus
  * this class is a reflection ot the {@link OperationalEnvironmentEntry} class
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngine.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngine.java
index dc83b72101..7eb00ba988 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngine.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/EnvironmentsEngine.java
@@ -1,22 +1,14 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.runMethodWithTimeOut;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.annotation.PostConstruct;
-
+import com.att.aft.dme2.api.DME2Exception;
+import com.att.aft.dme2.iterator.DME2EndpointIterator;
+import com.att.aft.dme2.iterator.domain.DME2EndpointReference;
+import com.att.aft.dme2.manager.registry.DME2Endpoint;
+import com.att.nsa.apiClient.credentials.ApiCredential;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.openecomp.sdc.be.components.distribution.engine.IDmaapNotificationData.DmaapActionEnum;
@@ -35,20 +27,18 @@ import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.common.datastructure.Wrapper;
 import org.openecomp.sdc.common.http.client.api.HttpResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Service;
 
-import com.att.aft.dme2.api.DME2Exception;
-import com.att.aft.dme2.iterator.DME2EndpointIterator;
-import com.att.aft.dme2.iterator.domain.DME2EndpointReference;
-import com.att.aft.dme2.manager.registry.DME2Endpoint;
-import com.att.nsa.apiClient.credentials.ApiCredential;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import javax.annotation.PostConstruct;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.runMethodWithTimeOut;
 
 /**
  * Allows to consume DMAAP topic and handle received notifications
@@ -58,7 +48,7 @@ public class EnvironmentsEngine implements INotificationHandler {
 
     private static final String MESSAGE_BUS = "MessageBus";
     private static final String UNKNOWN = "Unknown";
-    private static final Logger log = LoggerFactory.getLogger(EnvironmentsEngine.class);
+    private static final Logger log = Logger.getLogger(EnvironmentsEngine.class.getName());
     private ConfigurationManager configurationManager = ConfigurationManager.getConfigurationManager();
 
     private Map<String, OperationalEnvironmentEntry> environments;
@@ -93,36 +83,50 @@ public class EnvironmentsEngine implements INotificationHandler {
         try {
             environments = populateEnvironments();
             createUebTopicsForEnvironments();
+            initDmeGlobalConfig();
             dmaapConsumer.consumeDmaapTopic(this::handleMessage,
-                        (t, e) -> log.error("An error occurred upon consuming topic by Dmaap consumer client: ", e));
+                    (t, e) -> log.error("An error occurred upon consuming topic by Dmaap consumer client: ", e));
+        } catch (Exception e) {
+            log.error("An error occurred upon consuming topic by Dmaap consumer client.", e);
         }
-        catch (Exception e) {
-            log.error("An error occurred upon consuming topic by Dmaap consumer client." , e);
+    }
+
+    private void initDmeGlobalConfig() {
+        DmaapConsumerConfiguration dmaapConsumerParams = ConfigurationManager.getConfigurationManager().getConfiguration().getDmaapConsumerConfiguration();
+        if (dmaapConsumerParams == null) {
+            log.warn("cannot read dmaap configuration file,DME might not be initialized properly");
+            return;
         }
+        System.setProperty("AFT_ENVIRONMENT", dmaapConsumerParams.getEnvironment()); // AFTPRD for production
+        System.setProperty("AFT_LATITUDE", dmaapConsumerParams.getLatitude()!=null ? dmaapConsumerParams.getLatitude().toString() : "1.0"); // Replace with actual latitude
+        System.setProperty("AFT_LONGITUDE", dmaapConsumerParams.getLongitude()!=null ? dmaapConsumerParams.getLongitude().toString() : "1.0"); // Replace with actual longitude
     }
+
     public void connectUebTopicTenantIsolation(OperationalEnvironmentEntry opEnvEntry,
-            AtomicBoolean status,
-            Map<String, DistributionEngineInitTask> envNamePerInitTask, Map<String, DistributionEnginePollingTask> envNamePerPollingTask){
+                                               AtomicBoolean status,
+                                               Map<String, DistributionEngineInitTask> envNamePerInitTask, Map<String, DistributionEnginePollingTask> envNamePerPollingTask) {
         connectUebTopic(opEnvEntry, status, envNamePerInitTask, envNamePerPollingTask);
 
     }
 
     public void connectUebTopicForDistributionConfTopic(String envName,
-            AtomicBoolean status,
-            Map<String, DistributionEngineInitTask> envNamePerInitTask, Map<String, DistributionEnginePollingTask> envNamePerPollingTask){
+                                                        AtomicBoolean status,
+                                                        Map<String, DistributionEngineInitTask> envNamePerInitTask, Map<String, DistributionEnginePollingTask> envNamePerPollingTask) {
         connectUebTopic(environments.get(envName), status, envNamePerInitTask, envNamePerPollingTask);
 
     }
+
     /**
      * Allows to create and run UEB initializing and polling tasks
+     *
      * @param status
      * @param envNamePerInitTask
      * @param envNamePerPollingTask
      * @param opEnvEntry
      */
     private void connectUebTopic(OperationalEnvironmentEntry opEnvEntry, AtomicBoolean status,
-            Map<String, DistributionEngineInitTask> envNamePerInitTask,
-            Map<String, DistributionEnginePollingTask> envNamePerPollingTask) {
+                                 Map<String, DistributionEngineInitTask> envNamePerInitTask,
+                                 Map<String, DistributionEnginePollingTask> envNamePerPollingTask) {
 
         String envId = opEnvEntry.getEnvironmentId();
 
@@ -160,7 +164,7 @@ public class EnvironmentsEngine implements INotificationHandler {
     }
 
     public boolean handleMessageLogic(String notification) {
-         Wrapper<Boolean> errorWrapper = new Wrapper<>();
+        Wrapper<Boolean> errorWrapper = new Wrapper<>();
         Wrapper<OperationalEnvironmentEntry> opEnvEntryWrapper = new Wrapper<>();
         try {
 
@@ -173,7 +177,7 @@ public class EnvironmentsEngine implements INotificationHandler {
                     DmaapNotificationDataImpl.class);
 
             AuditingActionEnum actionEnum;
-            switch(notificationData.getAction()) {
+            switch (notificationData.getAction()) {
                 case CREATE:
                     actionEnum = AuditingActionEnum.CREATE_ENVIRONMENT;
                     break;
@@ -214,7 +218,7 @@ public class EnvironmentsEngine implements INotificationHandler {
     }
 
     private void validateNotification(Wrapper<Boolean> errorWrapper, IDmaapNotificationData notificationData,
-                                                    IDmaapAuditNotificationData auditNotificationData) {
+                                      IDmaapAuditNotificationData auditNotificationData) {
         // Check OperationaEnvironmentType
         if (errorWrapper.isEmpty()) {
             validateEnvironmentType(errorWrapper, notificationData, auditNotificationData);
@@ -259,8 +263,7 @@ public class EnvironmentsEngine implements INotificationHandler {
         // Update Environments Map
         if (errorWrapper.isEmpty()) {
             environments.put(opEnvEntry.getEnvironmentId(), opEnvEntry);
-        }
-        else{
+        } else {
             saveEntryWithFailedStatus(errorWrapper, opEnvEntry);
         }
     }
@@ -282,13 +285,12 @@ public class EnvironmentsEngine implements INotificationHandler {
         log.debug("handle message - Get List Of UEB Addresses From AFT_DME");
         try {
             boolean isKeyFieldsValid = !isEmpty(opEnvEntry.getTenant()) && !isEmpty(opEnvEntry.getEcompWorkloadContext());
-            if( isKeyFieldsValid ){
+            if (isKeyFieldsValid) {
                 String opEnvKey = map2OpEnvKey(opEnvEntry);
                 String environmentId = opEnvEntry.getEnvironmentId();
                 List<String> uebHosts = discoverUebHosts(opEnvKey, environmentId);
                 opEnvEntry.setDmaapUebAddress(uebHosts.stream().collect(Collectors.toSet()));
-            }
-            else{
+            } else {
                 errorWrapper.setInnerElement(false);
                 log.debug("Can Not Build AFT DME Key from workLoad & Tenant Fields.");
             }
@@ -444,8 +446,8 @@ public class EnvironmentsEngine implements INotificationHandler {
                 ? distributionEngineConfiguration.getEnvironments().get(0) : UNKNOWN;
         entry.setEnvironmentId(envName);
 
-        if(log.isDebugEnabled()) {
-            log.debug("Enviroment read from configuration: {}", entry.toString());
+        if (log.isDebugEnabled()) {
+            log.debug("Enviroment read from configuration: {}", entry);
         }
 
         return entry;
@@ -456,9 +458,9 @@ public class EnvironmentsEngine implements INotificationHandler {
                 .getByEnvironmentsStatus(EnvironmentStatusEnum.COMPLETED);
 
         if (opEnvResult.isLeft()) {
-            Map<String, OperationalEnvironmentEntry> resultMap =  opEnvResult.left().value().stream()
+            Map<String, OperationalEnvironmentEntry> resultMap = opEnvResult.left().value().stream()
                     .collect(Collectors.toMap(OperationalEnvironmentEntry::getEnvironmentId, Function.identity()));
-            resultMap.forEach( (key, value) -> log.debug("Enviroment loaded from DB: {}", value.toString()) );
+            resultMap.forEach((key, value) -> log.debug("Enviroment loaded from DB: {}", value));
             return resultMap;
         } else {
             CassandraOperationStatus status = opEnvResult.right().value();
@@ -509,7 +511,7 @@ public class EnvironmentsEngine implements INotificationHandler {
         }
     }
 
-    public OperationalEnvironmentEntry getEnvironmentById (String envId) {
+    public OperationalEnvironmentEntry getEnvironmentById(String envId) {
         return environments.get(envId);
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ExecutorFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ExecutorFactory.java
index 43a86ebf71..bfc4471815 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ExecutorFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ExecutorFactory.java
@@ -1,23 +1,22 @@
 package org.openecomp.sdc.be.components.distribution.engine;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 @Component("executorFactory")
 /**
  * Allows to create next kinds of single thread executors: SingleThreadExecutor and SingleThreadScheduledExecutor
  */
 public class ExecutorFactory {
 
-    private static final Logger logger = LoggerFactory.getLogger(EnvironmentsEngine.class);
+    private static final Logger logger = Logger.getLogger(EnvironmentsEngine.class.getName());
 
     public ExecutorService create(String name, UncaughtExceptionHandler exceptionHandler){
         logger.info("Going to create single thread executor. ");
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/IDistributionEngine.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/IDistributionEngine.java
index 96abfe087c..bbc9c3a284 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/IDistributionEngine.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/IDistributionEngine.java
@@ -22,6 +22,7 @@ package org.openecomp.sdc.be.components.distribution.engine;
 
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
 
@@ -29,9 +30,9 @@ public interface IDistributionEngine {
 
     boolean isActive();
 
-    ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envName, String userId, String modifierName);
+    ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envName, User modifier);
 
-    ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envId, String envName, String userId, String modifierName);
+    ActionStatus notifyService(String distributionId, Service service, INotificationData notificationData, String envId, String envName, User modifier);
 
     StorageOperationStatus isEnvironmentAvailable(String envName);
 
@@ -44,11 +45,9 @@ public interface IDistributionEngine {
      */
     void disableEnvironment(String envName);
 
-    StorageOperationStatus isReadyForDistribution(Service service, String envName);
+    StorageOperationStatus isReadyForDistribution(String envName);
 
     INotificationData buildServiceForDistribution(Service service, String distributionId, String workloadContext);
 
-    StorageOperationStatus verifyServiceHasDeploymentArtifacts(Service service);
-
     OperationalEnvironmentEntry getEnvironmentById(String opEnvId);
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java
index a4757300ac..9c478e7d9b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/JsonContainerResourceInstance.java
@@ -20,10 +20,10 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.List;
-
 import org.openecomp.sdc.be.model.ComponentInstance;
 
+import java.util.List;
+
 public class JsonContainerResourceInstance {
     private String resourceInstanceName;
     private String resourceName;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorService.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorService.java
index 4955cf41f8..7f8e814897 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorService.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/NotificationExecutorService.java
@@ -20,21 +20,15 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionNotificationTopicConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.*;
 
 public class NotificationExecutorService {
 
-    private static final Logger logger = LoggerFactory.getLogger(NotificationExecutorService.class);
+    private static final Logger logger = Logger.getLogger(NotificationExecutorService.class.getName());
 
     public ExecutorService createExcecutorService(DistributionNotificationTopicConfig distributionNotificationTopic) {
 
@@ -52,9 +46,7 @@ public class NotificationExecutorService {
         threadFactoryBuilder.setNameFormat("distribution-notification-thread-%d");
         ThreadFactory threadFactory = threadFactoryBuilder.build();
 
-        ExecutorService executorService = new ThreadPoolExecutor(minThreadPoolSize, maxThreadPoolSize, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), threadFactory);
-
-        return executorService;
+        return new ThreadPoolExecutor(minThreadPoolSize, maxThreadPoolSize, 60L, TimeUnit.SECONDS, new SynchronousQueue<>(), threadFactory);
     }
 
     public void shutdownAndAwaitTermination(ExecutorService pool, long maxTimeToWait) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java
index 7ea80263bd..0303b3f5e7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/ServiceDistributionArtifactsBuilder.java
@@ -20,42 +20,35 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.IArtifactOperation;
 import org.openecomp.sdc.be.model.operations.impl.InterfaceLifecycleOperation;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Component("serviceDistributionArtifactsBuilder")
 public class ServiceDistributionArtifactsBuilder {
 
-    private static final Logger logger = LoggerFactory.getLogger(ServiceDistributionArtifactsBuilder.class);
+    private static final Logger logger = Logger.getLogger(ServiceDistributionArtifactsBuilder.class.getName());
 
-    static final String BASE_ARTIFACT_URL = "/sdc/v1/catalog/services/%s/%s/";
-    static final String RESOURCE_ARTIFACT_URL = BASE_ARTIFACT_URL + "resources/%s/%s/artifacts/%s";
-    static final String SERVICE_ARTIFACT_URL = BASE_ARTIFACT_URL + "artifacts/%s";
-    static final String RESOURCE_INSTANCE_ARTIFACT_URL = BASE_ARTIFACT_URL + "resourceInstances/%s/artifacts/%s";
+    private static final String BASE_ARTIFACT_URL = "/sdc/v1/catalog/services/%s/%s/";
+    private static final String SERVICE_ARTIFACT_URL = BASE_ARTIFACT_URL + "artifacts/%s";
+    private static final String RESOURCE_INSTANCE_ARTIFACT_URL = BASE_ARTIFACT_URL + "resourceInstances/%s/artifacts/%s";
 
     @javax.annotation.Resource
     InterfaceLifecycleOperation interfaceLifecycleOperation;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/UebHealthCheckCall.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/UebHealthCheckCall.java
index c962583356..1fcc071f58 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/UebHealthCheckCall.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/UebHealthCheckCall.java
@@ -20,10 +20,9 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.concurrent.Callable;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.concurrent.Callable;
 
 public class UebHealthCheckCall implements Callable<Boolean> {
 
@@ -32,9 +31,9 @@ public class UebHealthCheckCall implements Callable<Boolean> {
     String server;
     String publicApiKey;
 
-    private static final Logger healthLogger = LoggerFactory.getLogger(DistributionEngineClusterHealth.UEB_HEALTH_LOG_CONTEXT);
+    private static final Logger healthLogger = Logger.getLogger(DistributionEngineClusterHealth.UEB_HEALTH_LOG_CONTEXT);
 
-    private static final Logger logger = LoggerFactory.getLogger(UebHealthCheckCall.class);
+    private static final Logger logger = Logger.getLogger(UebHealthCheckCall.class.getName());
 
     public UebHealthCheckCall(String server, String publicApiKey) {
         super();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java
index 7acfa2d7db..2f119c96a4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/VfModuleArtifactPayload.java
@@ -20,19 +20,16 @@
 
 package org.openecomp.sdc.be.components.distribution.engine;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.model.GroupDefinition;
 import org.openecomp.sdc.be.model.GroupInstance;
 import org.openecomp.sdc.be.model.GroupInstanceProperty;
 import org.openecomp.sdc.be.model.GroupProperty;
 import org.openecomp.sdc.common.api.Constants;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 public class VfModuleArtifactPayload {
 
     private String vfModuleModelName, vfModuleModelInvariantUUID, vfModuleModelVersion, vfModuleModelUUID, vfModuleModelCustomizationUUID, vfModuleModelDescription;
@@ -109,7 +106,7 @@ public class VfModuleArtifactPayload {
 
     public void setProperties(List<GroupInstanceProperty> properties) {
         this.properties  = properties.stream().filter(p -> !p.getName().equals(Constants.IS_BASE)).collect(
-                    Collectors.toMap(x -> x.getName(), x -> x.getValue() == null? "":x.getValue() ));
+                    Collectors.toMap(PropertyDataDefinition::getName, x -> x.getValue() == null? "":x.getValue() ));
     }
 
     public static int compareByGroupName(VfModuleArtifactPayload art1, VfModuleArtifactPayload art2) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/report/MsoDistributionCompleteReporter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/report/MsoDistributionCompleteReporter.java
index ef47f5e665..4e06b0ed0e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/report/MsoDistributionCompleteReporter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/report/MsoDistributionCompleteReporter.java
@@ -1,11 +1,11 @@
 package org.openecomp.sdc.be.components.distribution.engine.report;
 
-import javax.annotation.Resource;
-
 import org.openecomp.sdc.be.components.distribution.engine.DistributionStatusNotification;
 import org.openecomp.sdc.be.components.distribution.engine.rest.MSORestClient;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 @Component
 public class MsoDistributionCompleteReporter implements DistributionCompleteReporter {
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/rest/MSORestClient.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/rest/MSORestClient.java
index 27488d6f0e..6d7e784133 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/rest/MSORestClient.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/rest/MSORestClient.java
@@ -1,32 +1,25 @@
 package org.openecomp.sdc.be.components.distribution.engine.rest;
 
-import java.util.Properties;
-
+import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.eclipse.jetty.util.URIUtil;
 import org.openecomp.sdc.be.components.distribution.engine.DistributionStatusNotificationEnum;
 import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.common.http.client.api.HttpExecuteException;
-import org.openecomp.sdc.common.http.client.api.HttpRequest;
-import org.openecomp.sdc.common.http.client.api.HttpResponse;
-import org.openecomp.sdc.common.http.client.api.Responses;
-import org.openecomp.sdc.common.http.client.api.RestUtils;
-import org.openecomp.sdc.common.http.client.api.RetryHandlers;
+import org.openecomp.sdc.common.http.client.api.*;
 import org.openecomp.sdc.common.http.config.BasicAuthorization;
 import org.openecomp.sdc.common.http.config.ExternalServiceConfig;
 import org.openecomp.sdc.common.http.config.HttpClientConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.gson.Gson;
+import java.util.Properties;
 
 @Component
 public class MSORestClient {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MSORestClient.class);
+    private static final Logger logger = Logger.getLogger(MSORestClient.class.getName());
     private static final Gson gson = new Gson();
     @VisibleForTesting
     static final String DISTRIBUTIONS_RESOURCE_CONFIG_PARAM = "distributions";
@@ -46,7 +39,7 @@ public class MSORestClient {
             return doNotifyDistributionComplete(distributionId, distributionStatusEnum, errReason);
         }
         catch(HttpExecuteException e) {
-            LOGGER.debug("The request to mso failed with exception ", e);
+            logger.debug("The request to mso failed with exception ", e);
             return Responses.INTERNAL_SERVER_ERROR;
         }
     }
@@ -54,7 +47,7 @@ public class MSORestClient {
     private HttpResponse<String> doNotifyDistributionComplete(String distributionId, DistributionStatusNotificationEnum distributionStatusEnum, String errReason) throws HttpExecuteException {
         StringEntity entity = new StringEntity(gson.toJson(new DistributionStatusRequest(distributionStatusEnum.name(), errReason)), ContentType.APPLICATION_JSON);
         HttpResponse<String> response = HttpRequest.patch(buildMsoDistributionUrl(distributionId), buildReqHeader(), entity, serviceConfig.getHttpClientConfig());
-        LOGGER.info("response from mso - status code: {}, status description: {}, response: {}, ", response.getStatusCode(), response.getDescription(), response.getResponse());
+        logger.info("response from mso - status code: {}, status description: {}, response: {}, ", response.getStatusCode(), response.getDescription(), response.getResponse());
         return response;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
index adcd31be77..be534f326a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
@@ -20,39 +20,12 @@
 
 package org.openecomp.sdc.be.components.health;
 
-import static java.lang.String.format;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
-import static org.apache.http.HttpStatus.SC_OK;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_BE;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_CASSANDRA;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_DCAE;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_ES;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_ON_BOARDING;
-import static org.openecomp.sdc.common.api.Constants.HC_COMPONENT_TITAN;
-import static org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus.DOWN;
-import static org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus.UP;
-import static org.openecomp.sdc.common.impl.ExternalConfiguration.getAppVersion;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.stream.Collectors;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.openecomp.sdc.be.components.distribution.engine.DistributionEngineClusterHealth;
 import org.openecomp.sdc.be.components.distribution.engine.DmaapHealth;
-import org.openecomp.sdc.be.components.distribution.engine.UebHealthCheckCall;
 import org.openecomp.sdc.be.components.impl.CassandraHealthCheck;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.Configuration;
@@ -66,14 +39,32 @@ import org.openecomp.sdc.common.http.client.api.HttpRequest;
 import org.openecomp.sdc.common.http.client.api.HttpResponse;
 import org.openecomp.sdc.common.http.config.HttpClientConfig;
 import org.openecomp.sdc.common.http.config.Timeouts;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.HealthCheckUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static java.lang.String.format;
+import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
+import static org.apache.http.HttpStatus.SC_INTERNAL_SERVER_ERROR;
+import static org.apache.http.HttpStatus.SC_OK;
+import static org.openecomp.sdc.common.api.Constants.*;
+import static org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus.DOWN;
+import static org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus.UP;
+import static org.openecomp.sdc.common.impl.ExternalConfiguration.getAppVersion;
 
 
 @Component("healthCheckBusinessLogic")
@@ -82,11 +73,10 @@ public class HealthCheckBusinessLogic {
     protected static final String BE_HEALTH_LOG_CONTEXT = "be.healthcheck";
     private static final String BE_HEALTH_CHECK_STR = "beHealthCheck";
     private static final String COMPONENT_CHANGED_MESSAGE = "BE Component %s state changed from %s to %s";
-    private static final Logger healthLogger = LoggerFactory.getLogger(BE_HEALTH_LOG_CONTEXT);
-    private static final Logger log = LoggerFactory.getLogger(HealthCheckBusinessLogic.class.getName());
+    private static final Logger log = Logger.getLogger(HealthCheckBusinessLogic.class.getName());
     private static final HealthCheckUtil healthCheckUtil = new HealthCheckUtil();
-    ScheduledExecutorService healthCheckScheduler = Executors.newSingleThreadScheduledExecutor((Runnable r) -> new Thread(r, "BE-Health-Check-Task"));
-    HealthCheckScheduledTask healthCheckScheduledTask = null;
+    private final ScheduledExecutorService healthCheckScheduler = newSingleThreadScheduledExecutor((Runnable r) -> new Thread(r, "BE-Health-Check-Task"));
+    private HealthCheckScheduledTask healthCheckScheduledTask = null;
     @Resource
     private TitanGenericDao titanGenericDao;
     @Resource
@@ -112,7 +102,7 @@ public class HealthCheckBusinessLogic {
         healthCheckScheduledTask = new HealthCheckScheduledTask();
 
         if (this.scheduledFuture == null) {
-            this.scheduledFuture = this.healthCheckScheduler.scheduleAtFixedRate(healthCheckScheduledTask, 0, 3, SECONDS);
+            this.scheduledFuture = this.healthCheckScheduler.scheduleAtFixedRate(healthCheckScheduledTask, 0, 3, TimeUnit.SECONDS);
         }
 
     }
@@ -172,6 +162,7 @@ public class HealthCheckBusinessLogic {
             healthCheckStatus = DOWN;
             description = "ES cluster error: " + e.getMessage();
             healthCheckInfos.add(new HealthCheckInfo(HC_COMPONENT_ES, healthCheckStatus, appVersion, description));
+            log.error(description, e);
             return healthCheckInfos;
         }
         if (healthCheckStatus.equals(DOWN)) {
@@ -206,8 +197,9 @@ public class HealthCheckBusinessLogic {
         try {
             isTitanUp = titanGenericDao.isGraphOpen();
         } catch (Exception e) {
-            description = "Titan error: " + e.getMessage();
+            description = "Titan error: ";
             healthCheckInfos.add(new HealthCheckInfo(HC_COMPONENT_TITAN, DOWN, null, description));
+            log.error(description, e);
             return healthCheckInfos;
         }
         if (isTitanUp) {
@@ -223,13 +215,13 @@ public class HealthCheckBusinessLogic {
     private List<HealthCheckInfo> getCassandraHealthCheck(List<HealthCheckInfo> healthCheckInfos) {
 
         String description;
-        boolean isCassandraUp;
+        boolean isCassandraUp = false;
 
         try {
             isCassandraUp = cassandraHealthCheck.getCassandraStatus();
         } catch (Exception e) {
-            isCassandraUp = false;
-            log.debug("Cassandra error: " + e.getMessage());
+            description = "Cassandra error: " + e.getMessage();
+            log.error(description, e);
         }
         if (isCassandraUp) {
             description = "OK";
@@ -446,13 +438,10 @@ public class HealthCheckBusinessLogic {
     }
 
     public class HealthCheckScheduledTask implements Runnable {
-
-        List<UebHealthCheckCall> healthCheckCalls = new ArrayList<>();
-
         @Override
         public void run() {
             Configuration config = ConfigurationManager.getConfigurationManager().getConfiguration();
-            healthLogger.trace("Executing BE Health Check Task");
+            log.trace("Executing BE Health Check Task");
 
             List<HealthCheckInfo> currentBeHealthCheckInfos = getBeHealthCheckInfos();
             boolean healthStatus = healthCheckUtil.getAggregateStatus(currentBeHealthCheckInfos, config.getHealthStatusExclude());
@@ -467,7 +456,6 @@ public class HealthCheckBusinessLogic {
                 prevBeHealthCheckInfos = currentBeHealthCheckInfos;
                 logAlarm(healthStatus);
             }
-
         }
 
         private void logAlarm(boolean prevHealthState) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java
index 90f2148195..7f6565c88e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AdditionalInformationBusinessLogic.java
@@ -20,10 +20,7 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -31,27 +28,24 @@ import org.openecomp.sdc.be.dao.graph.datatype.AdditionalInformationEnum;
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.api.IAdditionalInformationOperation;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
-import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.model.tosca.converters.StringConvertor;
 import org.openecomp.sdc.be.model.tosca.validators.StringValidator;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.WebApplicationContext;
 
-import fj.data.Either;
+import javax.servlet.ServletContext;
+import java.util.List;
 
 @Component("additionalInformationBusinessLogic")
 public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
@@ -64,17 +58,12 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
 
     private static final String GET_ADDITIONAL_INFORMATION = "GetAdditionalInformation";
 
-    private static final Logger log = LoggerFactory.getLogger(AdditionalInformationBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(AdditionalInformationBusinessLogic.class.getName());
+    private static final String FAILED_TO_LOCK_COMPONENT_ERROR = "Failed to lock component {} error - {}";
 
     @javax.annotation.Resource
     private IAdditionalInformationOperation additionalInformationOperation = null;
 
-    @javax.annotation.Resource
-    private IGraphLockOperation graphLockOperation;
-
-    @javax.annotation.Resource
-    private ComponentsUtils componentsUtils;
-
     protected static IElementOperation getElementDao(Class<IElementOperation> class1, ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
 
@@ -85,19 +74,15 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
 
     /**
      * Create new additional information on resource/service on graph
-     *
+     * @param nodeType
      * @param resourceId
-     * @param propertyName
-     * @param newPropertyDefinition
+     * @param additionalInfoParameterInfo
      * @param userId
-     * @return Either<PropertyDefinition, ActionStatus>
+     * @return Either<AdditionalInfoParameterInfo, ResponseFormat>
      */
-    public Either<AdditionalInfoParameterInfo, ResponseFormat> createAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String additionalInformationUid, String userId) {
+    public Either<AdditionalInfoParameterInfo, ResponseFormat> createAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Additional Information", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Additional Information", false);
         Either<AdditionalInfoParameterInfo, ResponseFormat> result = null;
 
         ResponseFormat responseFormat = verifyCanWorkOnComponent(nodeType, resourceId, userId);
@@ -110,7 +95,7 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, nodeType);
         if (!lockResult.equals(StorageOperationStatus.OK)) {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(CREATE_ADDITIONAL_INFORMATION, nodeType.getName(), resourceId);
-            log.info("Failed to lock component {} error - {}", resourceId, lockResult);
+            log.info(FAILED_TO_LOCK_COMPONENT_ERROR, resourceId, lockResult);
             result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
             return result;
         }
@@ -180,7 +165,7 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
         } else {
             String newValue = valueValidRes.left().value();
             if (log.isTraceEnabled()) {
-                if (value != null && false == value.equals(newValue)) {
+                if (value != null && !value.equals(newValue)) {
                     log.trace("The additional information value was normalized from {} to {}", value, newValue);
                 }
             }
@@ -209,10 +194,8 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
         } else {
             String convertedKey = validateKeyRes.left().value();
 
-            if (log.isTraceEnabled()) {
-                if (key != null && false == key.equals(convertedKey)) {
-                    log.trace("The additional information key {} was normalized to {}", key, convertedKey);
-                }
+            if (log.isTraceEnabled() && key != null && !key.equals(convertedKey)) {
+                log.trace("The additional information key {} was normalized to {}", key, convertedKey);
             }
             additionalInfoParameterInfo.setKey(convertedKey);
         }
@@ -259,12 +242,12 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
     private Either<String, ResponseFormat> validateValue(String value) {
 
         boolean isNonEmptyString = ValidationUtils.validateStringNotEmpty(value);
-        if (false == isNonEmptyString) {
+        if (!isNonEmptyString) {
             return Either.right(componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED));
         }
 
         boolean valid = StringValidator.getInstance().isValid(value, null);
-        if (false == valid) {
+        if (!valid) {
             return Either.right(componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.ADDITIONAL_INFORMATION_VALUE_NOT_ALLOWED_CHARACTERS, new AdditionalInfoParameterInfo(null, value), null, AdditionalInformationEnum.Value));
         }
 
@@ -285,29 +268,28 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
 
     /**
      * validate and normalize the key
-     *
-     * @param additionalInfoParameterInfo
-     * @return
+     * @param key
+     * @return Either<String, ResponseFormat>
      */
     private Either<String, ResponseFormat> validateAndNormalizeKey(String key) {
 
         AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo();
         additionalInfoParameterInfo.setKey(key);
 
-        key = ValidationUtils.normalizeAdditionalInformation(key);
-        boolean isNonEmptyString = ValidationUtils.validateStringNotEmpty(key);
-        if (false == isNonEmptyString) {
+        String normKey = ValidationUtils.normalizeAdditionalInformation(key);
+        boolean isNonEmptyString = ValidationUtils.validateStringNotEmpty(normKey);
+        if (!isNonEmptyString) {
             return Either.right(componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED, null, null, AdditionalInformationEnum.Label));
         }
-        boolean isValidString = ValidationUtils.validateAdditionalInformationKeyName(key);
-        if (false == isValidString) {
-            if (false == ValidationUtils.validateLength(key, ValidationUtils.ADDITIONAL_INFORMATION_KEY_MAX_LENGTH)) {
+        boolean isValidString = ValidationUtils.validateAdditionalInformationKeyName(normKey);
+        if (!isValidString) {
+            if (!ValidationUtils.validateLength(normKey, ValidationUtils.ADDITIONAL_INFORMATION_KEY_MAX_LENGTH)) {
                 return Either.right(componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.ADDITIONAL_INFORMATION_EXCEEDS_LIMIT, additionalInfoParameterInfo, null, AdditionalInformationEnum.Label));
             }
             return Either.right(componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.ADDITIONAL_INFORMATION_KEY_NOT_ALLOWED_CHARACTERS, additionalInfoParameterInfo, null, AdditionalInformationEnum.Label));
         }
 
-        return Either.left(key);
+        return Either.left(normKey);
     }
 
     /**
@@ -316,17 +298,12 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
      * @param nodeType
      * @param resourceId
      * @param additionalInfoParameterInfo
-     * @param additionalInformationUid
-     *            - Future use
      * @param userId
      * @return
      */
-    public Either<AdditionalInfoParameterInfo, ResponseFormat> updateAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String additionalInformationUid, String userId) {
+    public Either<AdditionalInfoParameterInfo, ResponseFormat> updateAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Additional Information", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Additional Information", false);
         Either<AdditionalInfoParameterInfo, ResponseFormat> result = null;
 
         ResponseFormat responseFormat = verifyCanWorkOnComponent(nodeType, resourceId, userId);
@@ -338,7 +315,7 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, nodeType);
         if (!lockResult.equals(StorageOperationStatus.OK)) {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(UPDATE_ADDITIONAL_INFORMATION, nodeType.getName(), resourceId);
-            log.info("Failed to lock component {} error - {}", resourceId, lockResult);
+            log.info(FAILED_TO_LOCK_COMPONENT_ERROR, resourceId, lockResult);
             result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
             return result;
         }
@@ -387,17 +364,12 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
      * @param nodeType
      * @param resourceId
      * @param additionalInfoParameterInfo
-     * @param additionalInformationUid
-     *            - Null. Future use.
      * @param userId
      * @return
      */
-    public Either<AdditionalInfoParameterInfo, ResponseFormat> deleteAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String additionalInformationUid, String userId) {
+    public Either<AdditionalInfoParameterInfo, ResponseFormat> deleteAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Additional Information", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Additional Information", false);
         Either<AdditionalInfoParameterInfo, ResponseFormat> result = null;
 
         ResponseFormat responseFormat = verifyCanWorkOnComponent(nodeType, resourceId, userId);
@@ -408,7 +380,7 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, nodeType);
         if (!lockResult.equals(StorageOperationStatus.OK)) {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(DELETE_ADDITIONAL_INFORMATION, nodeType.getName(), resourceId);
-            log.info("Failed to lock component {} error - {}", resourceId, lockResult);
+            log.info(FAILED_TO_LOCK_COMPONENT_ERROR, resourceId, lockResult);
             result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
             return result;
         }
@@ -453,16 +425,12 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
      * @param nodeType
      * @param resourceId
      * @param additionalInfoParameterInfo
-     * @param additionalInformationUid
      * @param userId
      * @return
      */
-    public Either<AdditionalInfoParameterInfo, ResponseFormat> getAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String additionalInformationUid, String userId) {
+    public Either<AdditionalInfoParameterInfo, ResponseFormat> getAdditionalInformation(NodeTypeEnum nodeType, String resourceId, AdditionalInfoParameterInfo additionalInfoParameterInfo, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Additional Information", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get Additional Information", false);
         Either<AdditionalInfoParameterInfo, ResponseFormat> result = null;
 
         try {
@@ -492,17 +460,12 @@ public class AdditionalInformationBusinessLogic extends BaseBusinessLogic {
      *
      * @param nodeType
      * @param resourceId
-     * @param additionalInformationUid
-     *            - Future use
      * @param userId
      * @return
      */
-    public Either<AdditionalInformationDefinition, ResponseFormat> getAllAdditionalInformation(NodeTypeEnum nodeType, String resourceId, String additionalInformationUid, String userId) {
+    public Either<AdditionalInformationDefinition, ResponseFormat> getAllAdditionalInformation(NodeTypeEnum nodeType, String resourceId, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get All Additional Information", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get All Additional Information", false);
 
         Either<AdditionalInformationDefinition, ResponseFormat> result = null;
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AnnotationBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AnnotationBusinessLogic.java
new file mode 100644
index 0000000000..c73f168c9a
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AnnotationBusinessLogic.java
@@ -0,0 +1,68 @@
+package org.openecomp.sdc.be.components.impl;
+
+import org.openecomp.sdc.be.components.validation.AnnotationValidator;
+import org.openecomp.sdc.be.dao.utils.MapUtil;
+import org.openecomp.sdc.be.datatypes.elements.Annotation;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.model.AnnotationTypeDefinition;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.operations.impl.AnnotationTypeOperations;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+
+@Component
+public class AnnotationBusinessLogic {
+
+    private final AnnotationTypeOperations annotationTypeOperations;
+
+    private final AnnotationValidator annotationValidator;
+
+    public AnnotationBusinessLogic(AnnotationTypeOperations annotationTypeOperations,
+                                   AnnotationValidator annotationValidator){
+        this.annotationTypeOperations = annotationTypeOperations;
+        this.annotationValidator = annotationValidator;
+    }
+
+    public void validateAndMergeAnnotationsAndAssignToInput(Map<String, InputDefinition> inputs) {
+        if (!inputs.isEmpty()){
+            for (InputDefinition input : inputs.values()) {
+                List<Annotation> inputAnnotationList = input.getAnnotations();
+                if (isNotEmpty(inputAnnotationList)) {
+                    for (Annotation annotation : inputAnnotationList) {
+                        AnnotationTypeDefinition dbAnnotationTypeDefinition = annotationTypeOperations.getLatestType(annotation.getType());
+                        validateMergeAndSetAnnoProps(annotation, dbAnnotationTypeDefinition);
+                    }
+                }
+                input.setAnnotations(inputAnnotationList);
+            }
+        }
+    }
+
+    public AnnotationTypeOperations getAnnotationTypeOperations() {
+        return annotationTypeOperations;
+    }
+
+    private void validateMergeAndSetAnnoProps(Annotation annotation, AnnotationTypeDefinition dbAnnotationTypeDefinition) {
+        annotationValidator.validateAnnotationsProperties(annotation, dbAnnotationTypeDefinition);
+        List<PropertyDataDefinition> mergedPropertiesList = mergePropsOfAnnoDataTypeWithParsedAnnoProps(annotation.getProperties(), dbAnnotationTypeDefinition.getProperties());
+        annotation.setProperties(mergedPropertiesList);
+    }
+
+    private List<PropertyDataDefinition> mergePropsOfAnnoDataTypeWithParsedAnnoProps(List<PropertyDataDefinition> annoProperties, List<PropertyDefinition> typePropertiesList) {
+        Set<PropertyDataDefinition> mergedPropertiesSet = new HashSet<>(typePropertiesList);
+        Map<String, PropertyDefinition> typePropsMap = MapUtil.toMap(typePropertiesList, PropertyDefinition::getName);
+        for (PropertyDataDefinition propertyDataDefinitionObject : annoProperties) {
+            PropertyDefinition foundTypePropertyDefinitionObject = typePropsMap.get(propertyDataDefinitionObject.getName());
+            //The case of unexisting property was already handled in the validation process (result: failure)
+            PropertyDataDefinition modifiedPropertyDataObject = new PropertyDataDefinition(foundTypePropertyDefinitionObject);
+            modifiedPropertyDataObject.setValue(propertyDataDefinitionObject.getValue());
+            mergedPropertiesSet.add(modifiedPropertyDataObject);
+        }
+        return new ArrayList<>(mergedPropertiesSet);
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArchiveBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArchiveBusinessLogic.java
new file mode 100644
index 0000000000..70898fbec2
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArchiveBusinessLogic.java
@@ -0,0 +1,156 @@
+package org.openecomp.sdc.be.components.impl;
+
+import com.google.common.annotations.VisibleForTesting;
+import fj.data.Either;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.components.validation.AccessValidations;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentParametersView;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.catalog.CatalogComponent;
+import org.openecomp.sdc.be.model.jsontitan.operations.ArchiveOperation;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@org.springframework.stereotype.Component
+public class ArchiveBusinessLogic {
+
+    private static final Logger log = Logger.getLogger(ArchiveBusinessLogic.class.getName());
+
+    private final TitanDao titanDao;
+    private final AccessValidations accessValidations;
+    private final ArchiveOperation archiveOperation;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentUtils;
+
+    public ArchiveBusinessLogic(TitanDao titanDao, AccessValidations accessValidations, ArchiveOperation archiveOperation, ToscaOperationFacade tof, ComponentsUtils componentsUtils) {
+        this.titanDao = titanDao;
+        this.accessValidations = accessValidations;
+        this.archiveOperation = archiveOperation;
+        this.toscaOperationFacade = tof;
+        this.componentUtils = componentsUtils;
+    }
+
+    public void archiveComponent(String containerComponentType, String userId, String componentId) {
+        User user = accessValidations.userIsAdminOrDesigner(userId, containerComponentType + "_ARCHIVE");
+        Either<List<String>, ActionStatus> result = this.archiveOperation.archiveComponent(componentId);
+
+        if (result.isRight()){
+            throw new ComponentException(result.right().value(), componentId);
+        }
+        this.auditAction(ArchiveOperation.Action.ARCHIVE, result.left().value(), user, containerComponentType);
+    }
+
+    public void restoreComponent(String containerComponentType, String userId, String componentId) {
+        User user = accessValidations.userIsAdminOrDesigner(userId, containerComponentType + "_RESTORE");
+        Either<List<String>, ActionStatus> result = this.archiveOperation.restoreComponent(componentId);
+        if (result.isRight()){
+            throw new ComponentException(result.right().value(), componentId);
+        }
+        this.auditAction(ArchiveOperation.Action.RESTORE, result.left().value(), user, containerComponentType);
+    }
+
+    public List<String> onVspArchive(String userId, List<String> csarUuids){
+        return this.onVspArchiveOrRestore(userId, csarUuids, ArchiveOperation.Action.ARCHIVE);
+    }
+
+    public List<String> onVspRestore(String userId, List<String> csarUuids){
+        return this.onVspArchiveOrRestore(userId, csarUuids, ArchiveOperation.Action.RESTORE);
+    }
+
+    private List<String> onVspArchiveOrRestore(String userId, List<String> csarUuids, ArchiveOperation.Action action) {
+
+        accessValidations.userIsAdminOrDesigner(userId, action.name() + "_VSP");
+
+        ActionStatus actionStatus;
+        List<String> failedCsarIDs = new LinkedList<>();
+
+        for (String csarUuid : csarUuids) {
+            try {
+
+                if (action.equals(ArchiveOperation.Action.ARCHIVE)) {
+                    actionStatus = this.archiveOperation.onVspArchived(csarUuid);
+                } else {
+                    actionStatus = this.archiveOperation.onVspRestored(csarUuid);
+                }
+
+                //If not found VFs with this CSAR ID we still want a success (nothing is actually done)
+                if (actionStatus == ActionStatus.RESOURCE_NOT_FOUND) {
+                    actionStatus = ActionStatus.OK;
+                }
+
+                if (actionStatus != ActionStatus.OK) {
+                    failedCsarIDs.add(csarUuid);
+                }
+
+            } catch (Exception e) {
+                log.error("Failed to handle notification: {} on VSP for csarUuid: {}", action.name(), csarUuid);
+                log.error("Exception Thrown:", e);
+                failedCsarIDs.add(csarUuid);
+            }
+        }
+
+        return failedCsarIDs;
+    }
+
+    public Map<String, List<CatalogComponent>> getArchiveComponents(String userId, List<OriginTypeEnum> excludeTypes) {
+        try {
+
+            accessValidations.validateUserExist(userId, "GET ARCHIVED COMPONENTS");
+
+            Either<List<CatalogComponent>, StorageOperationStatus> components = toscaOperationFacade.getCatalogOrArchiveComponents(false, excludeTypes);
+            if (components.isLeft()) {
+                List<CatalogComponent> comps = components.left().value();
+                return comps.stream().collect(Collectors.groupingBy(cmpt -> ComponentTypeEnum.findParamByType(cmpt.getComponentType())));
+            } else {
+                log.info("No components found");
+                return new HashMap();
+            }
+        } catch (Exception e){
+            log.error("Error fetching archived elements", e);
+            throw e;
+        }
+        finally {
+            titanDao.commit();
+        }
+    }
+
+
+    @VisibleForTesting
+    void auditAction(ArchiveOperation.Action action, List<String> affectedCompIds, User user, String containerComponentType) {
+        String comment = String.format("All versions of this component were %s", action == ArchiveOperation.Action.ARCHIVE ? "archived" : "restored");
+        HashSet<String> auditDoneUUIDs = new HashSet<>();
+        for (String componentId : affectedCompIds){
+            Either<Component, StorageOperationStatus> result = toscaOperationFacade.getToscaElement(componentId, new ComponentParametersView());
+            if (result.isRight()) {
+                log.error(EcompLoggerErrorCode.DATA_ERROR, null, "GetToscaElement",
+                        result.right().value().name() + "for component with id {}", componentId);
+                continue;
+            }
+            if (auditDoneUUIDs.add(result.left().value().getUUID())) {
+                //a component with this UUID is not added to audit DB/log for current archive/restore operation yet - add to audit DB now
+                AuditingActionEnum auditAction = action == ArchiveOperation.Action.ARCHIVE ? AuditingActionEnum.ARCHIVE_COMPONENT : AuditingActionEnum.RESTORE_COMPONENT; //The audit Action
+                result.left().foreachDoEffect(
+                    c -> {
+                        // The archive/restore records have been retrieved from Cassandra using the separate queries.
+                        // Setting current version as null allows to avoid appearing same records in ActivityLog twice:
+                        // - first time as per current version query
+                        //- second type as per archive/restore query
+                        c.setVersion(null);
+                        componentUtils.auditComponentAdmin(componentUtils.getResponseFormat(ActionStatus.OK), user, c, auditAction, ComponentTypeEnum.findByParamName(containerComponentType), comment);
+                    });
+            }
+        }
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
index b7dfabf071..c7f92d2184 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactResolverImpl.java
@@ -20,23 +20,13 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import org.apache.commons.collections.MapUtils;
 import org.openecomp.sdc.be.components.ArtifactsResolver;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 @org.springframework.stereotype.Component("artifact-resolver")
 public class ArtifactResolverImpl implements ArtifactsResolver {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
index b7c4b924c2..f104079e21 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
@@ -20,28 +20,10 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
+import com.google.common.annotations.VisibleForTesting;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -50,7 +32,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.elasticsearch.common.Strings;
 import org.openecomp.sdc.be.components.ArtifactsResolver;
 import org.openecomp.sdc.be.components.impl.ImportUtils.ResultStatusEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction.LifecycleChanceActionEnum;
@@ -65,41 +47,24 @@ import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.GroupInstanceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.info.ArtifactTemplateInfo;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.ArtifactType;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.GroupDefinition;
-import org.openecomp.sdc.be.model.GroupInstance;
-import org.openecomp.sdc.be.model.HeatParameterDefinition;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.heat.HeatParameterType;
 import org.openecomp.sdc.be.model.jsontitan.operations.InterfaceOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.NodeTemplateOperation;
 import org.openecomp.sdc.be.model.jsontitan.utils.InterfaceUtils;
-import org.openecomp.sdc.be.model.operations.api.IElementOperation;
-import org.openecomp.sdc.be.model.operations.api.IHeatParametersOperation;
-import org.openecomp.sdc.be.model.operations.api.IInterfaceLifecycleOperation;
-import org.openecomp.sdc.be.model.operations.api.IUserAdminOperation;
-import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.api.*;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.resources.data.ComponentMetadataData;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.be.servlets.RepresentationUtils;
 import org.openecomp.sdc.be.tosca.CsarUtils;
 import org.openecomp.sdc.be.tosca.ToscaError;
@@ -108,10 +73,10 @@ import org.openecomp.sdc.be.tosca.ToscaRepresentation;
 import org.openecomp.sdc.be.user.IUserBusinessLogic;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
+import org.openecomp.sdc.be.utils.TypeUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
 import org.openecomp.sdc.common.datastructure.Wrapper;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.common.util.ValidationUtils;
@@ -120,18 +85,21 @@ import org.openecomp.sdc.exception.ResponseFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
+import org.xml.sax.*;
 import org.yaml.snakeyaml.Yaml;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import fj.data.Either;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.XMLConstants;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 @org.springframework.stereotype.Component("artifactBusinessLogic")
 public class ArtifactsBusinessLogic extends BaseBusinessLogic {
@@ -152,6 +120,21 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
     private static final String ARTIFACT_PLACEHOLDER_FILE_EXTENSION = "fileExtension";
 
     private static final Logger log = LoggerFactory.getLogger(ArtifactsBusinessLogic.class);
+    public static final String FAILED_UPDATE_GROUPS = "Failed to update groups of the component {}. ";
+    public static final String FAILED_UPDATE_ARTIFACT = "Failed to delete or update the artifact {}. Parent uniqueId is {}";
+    public static final String FAILED_SAVE_ARTIFACT = "Failed to save the artifact.";
+    public static final String UPDATE_ARTIFACT_LOCK = "Update Artifact - lock ";
+    public static final String FAILED_DOWNLOAD_ARTIFACT = "Download artifact {} failed";
+    public static final String FAILED_UPLOAD_ARTIFACT_TO_COMPONENT = "Failed to upload artifact to component with type {} and uuid {}. Status is {}. ";
+    public static final String FAILED_UPLOAD_ARTIFACT_TO_INSTANCE = "Failed to upload artifact to component instance {} of component with type {} and uuid {}. Status is {}. ";
+    public static final String FAILED_FETCH_COMPONENT = "Could not fetch component with type {} and uuid {}. Status is {}. ";
+    public static final String NULL_PARAMETER = "One of the function parameteres is null";
+    public static final String COMPONENT_INSTANCE_NOT_FOUND = "Component instance {} was not found for component {}";
+    public static final String ROLLBACK = "all changes rollback";
+    public static final String COMMIT = "all changes committed";
+    public static final String ARTIFACT_SAVED = "Artifact saved into ES - {}";
+    public static final String UPDATE_ARTIFACT = "Update Artifact";
+    public static final String FOUND_DEPLOYMENT_ARTIFACT = "Found deployment artifact {}";
     private Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
     @javax.annotation.Resource
@@ -555,7 +538,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                 }
             }
         }
-        Either<List<GroupInstance>, StorageOperationStatus> status = toscaOperationFacade.updateGroupInstancesOnComponent(parent, componentType, parentId, updatedGroupInstances);
+        Either<List<GroupInstance>, StorageOperationStatus> status = toscaOperationFacade.updateGroupInstancesOnComponent(parent, parentId, updatedGroupInstances);
         if (status.isRight()) {
             log.debug("Failed to update groups of the component {}. ", parent.getUniqueId());
             return componentsUtils.convertFromStorageResponse(status.right().value());
@@ -713,15 +696,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         // step 4
         // check user's role
 
-        Either<User, ResponseFormat> userResult = validateUserExists(userId, "get artifacts", false);
-        if (userResult.isRight()) {
-
-            resultOp = Either.right(userResult.right().value());
-            return resultOp;
-        }
-
-        userResult.left().value();
-
+        validateUserExists(userId, "get artifacts", false);
         // steps 5 - 6 - 7
         // 5. check service/resource existence
         // 6. check service/resource check out
@@ -1002,16 +977,18 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
     public void handleAuditing(AuditingActionEnum auditingActionEnum, Component component, String componentId, User user, ArtifactDefinition artifactDefinition, String prevArtifactUuid, String currentArtifactUuid, ResponseFormat responseFormat,
                                ComponentTypeEnum componentTypeEnum, String resourceInstanceName) {
 
-        if (auditingActionEnum != null && auditingActionEnum.getAuditingEsType()
-                                                            .equals(AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE)) {
+        if (componentsUtils.isExternalApiEvent(auditingActionEnum)) {
             return;
         }
-        String artifactData = buildAuditingArtifactData(artifactDefinition);
 
         if (user == null) {
             user = new User();
             user.setUserId("UNKNOWN");
         }
+        handleInternalAuditEvent(auditingActionEnum, component, componentId, user, artifactDefinition, prevArtifactUuid, currentArtifactUuid, responseFormat, componentTypeEnum, resourceInstanceName);
+    }
+
+    private void handleInternalAuditEvent(AuditingActionEnum auditingActionEnum, Component component, String componentId, User user, ArtifactDefinition artifactDefinition, String prevArtifactUuid, String currentArtifactUuid, ResponseFormat responseFormat, ComponentTypeEnum componentTypeEnum, String resourceInstanceName) {
         switch (componentTypeEnum) {
             case RESOURCE:
                 Resource resource = (Resource) component;
@@ -1021,9 +998,9 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                     resource.setName(componentId);
                 }
                 componentsUtils.auditResource(responseFormat, user, resource, resource.getName(), auditingActionEnum,
-                        ResourceAuditData.newBuilder()
-                                         .artifactUuid(prevArtifactUuid)
-                                         .build(), currentArtifactUuid, artifactData);
+                        ResourceVersionInfo.newBuilder()
+                                .artifactUuid(prevArtifactUuid)
+                                .build(), currentArtifactUuid, artifactDefinition);
                 break;
 
             case SERVICE:
@@ -1033,20 +1010,29 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                     service = new Service();
                     service.setName(componentId);
                 }
-                componentsUtils.auditComponent(responseFormat, user, service, auditingActionEnum, ComponentTypeEnum.SERVICE,
-                        ResourceAuditData.newBuilder().artifactUuid(prevArtifactUuid).build(),
-                        ResourceAuditData.newBuilder().artifactUuid(currentArtifactUuid).build(),
-                        null, null, artifactData, null);
+                componentsUtils.auditComponent(responseFormat, user, service, auditingActionEnum, new ResourceCommonInfo(ComponentTypeEnum.SERVICE.getValue()),
+                        ResourceVersionInfo.newBuilder()
+                                .artifactUuid(prevArtifactUuid)
+                                .build(),
+                        ResourceVersionInfo.newBuilder()
+                                .artifactUuid(currentArtifactUuid)
+                                .build(),
+                        null, artifactDefinition, null);
                 break;
 
             case RESOURCE_INSTANCE:
                 if (resourceInstanceName == null) {
                     resourceInstanceName = getResourceInstanceNameFromComponent(component, componentId);
                 }
-                componentsUtils.auditComponent(responseFormat, user, component, auditingActionEnum, ComponentTypeEnum.RESOURCE_INSTANCE,
-                        ResourceAuditData.newBuilder().artifactUuid(prevArtifactUuid).build(),
-                        ResourceAuditData.newBuilder().artifactUuid(currentArtifactUuid).build(),
-                        resourceInstanceName, null, artifactData, null);
+                componentsUtils.auditComponent(responseFormat, user, component, auditingActionEnum,
+                        new ResourceCommonInfo(resourceInstanceName, ComponentTypeEnum.RESOURCE_INSTANCE.getValue()),
+                        ResourceVersionInfo.newBuilder()
+                                .artifactUuid(prevArtifactUuid)
+                                .build(),
+                        ResourceVersionInfo.newBuilder()
+                                .artifactUuid(currentArtifactUuid)
+                                .build(),
+                        null, artifactDefinition, null);
                 break;
             default:
                 break;
@@ -1066,18 +1052,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         return resourceInstanceName;
     }
 
-    public Map<AuditingFieldsKeysEnum, Object> createArtifactAuditingFields(ArtifactDefinition artifactDefinition, String prevArtifactUuid, String currentArtifactUuid) {
-        Map<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        // Putting together artifact info
-        String artifactData = buildAuditingArtifactData(artifactDefinition);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA, artifactData);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID, prevArtifactUuid);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, currentArtifactUuid);
-        return auditingFields;
-    }
-
-    // -----
-
     private String buildAuditingArtifactData(ArtifactDefinition artifactDefinition) {
         StringBuilder sb = new StringBuilder();
         if (artifactDefinition != null) {
@@ -1444,7 +1418,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                         .getRight()
                         .getGroupInstances());
                 if (CollectionUtils.isNotEmpty(updatedGroupInstances)) {
-                    Either<List<GroupInstance>, StorageOperationStatus> status = toscaOperationFacade.updateGroupInstancesOnComponent(fetchedContainerComponent, componentType, parentId, updatedGroupInstances);
+                    Either<List<GroupInstance>, StorageOperationStatus> status = toscaOperationFacade.updateGroupInstancesOnComponent(fetchedContainerComponent, parentId, updatedGroupInstances);
                     if (status.isRight()) {
                         log.debug("Failed to update groups of the component {}. ", fetchedContainerComponent.getUniqueId());
                         responseFormat = componentsUtils.getResponseFormatByArtifactId(componentsUtils.convertFromStorageResponse(status
@@ -1598,7 +1572,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         }
         else if (cloneIsNeeded) {
             log.debug("Going to clone artifacts and to delete the artifact {} from the component {}", artifactId, parentId);
-            result = artifactToscaOperation.deleteArtifactWithClonnigOnGraph(componentId, foundArtifact, parentType, instanceId, false);
+            result = artifactToscaOperation.deleteArtifactWithCloningOnGraph(componentId, foundArtifact, parentType, instanceId, false);
         }
         else {
             log.debug("Going to delete the artifact {} from the component {}", artifactId, parentId);
@@ -1836,6 +1810,84 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         return isUnique;
     }
 
+    boolean validateArtifactNameUniqueness(String componentId, Component parentComponent, ArtifactDefinition artifactInfo,
+                                           ComponentTypeEnum componentType) {
+        Either<Map<String, ArtifactDefinition>, StorageOperationStatus> artifacts = getArtifacts(componentType,
+                parentComponent, componentId, artifactInfo.getArtifactGroupType());
+        String artifactName = artifactInfo.getArtifactName();
+        if (artifacts.isLeft() && Objects.nonNull(artifacts.left().value())){
+            if (artifacts.left().value().values().stream()
+                    .anyMatch(ad -> artifactName.equals(ad.getArtifactName())
+                            //check whether it is the same artifact we hold (by label)
+                            && !artifactInfo.getArtifactLabel().equals(ad.getArtifactLabel()))){
+                return false;
+            }
+        }
+        if (ComponentTypeEnum.RESOURCE.equals(componentType)) {
+            return isUniqueArtifactNameInResourceInterfaces(componentId, artifactName, artifactInfo.getArtifactLabel());
+        }
+        return true;
+    }
+
+    private boolean isUniqueArtifactNameInResourceInterfaces(String componentId, String artifactName, String artifactLabel) {
+        Either<Map<String, InterfaceDefinition>, StorageOperationStatus> allInterfacesOfResource = interfaceLifecycleOperation
+                .getAllInterfacesOfResource(componentId, true, true);
+
+        if (allInterfacesOfResource.isLeft() && Objects.nonNull(allInterfacesOfResource)){
+            return !allInterfacesOfResource.left().value()
+                    .values()
+                    .stream().map(InterfaceDefinition :: getOperationsMap)
+                    .flatMap(map -> map.values().stream())
+                    .map(OperationDataDefinition::getImplementation)
+                    .filter(Objects::nonNull)
+                    .anyMatch(add -> artifactName.equals(add.getArtifactName())
+                            && !artifactLabel.equals(add.getArtifactLabel()));
+        }
+        return true;
+    }
+
+    private boolean isUniqueLabelInResourceInterfaces(String componentId, String artifactLabel) {
+        Either<Map<String, InterfaceDefinition>, StorageOperationStatus> allInterfacesOfResource = interfaceLifecycleOperation
+                .getAllInterfacesOfResource(componentId, true, true);
+
+        if (allInterfacesOfResource.isLeft()){
+            return !allInterfacesOfResource.left().value()
+                    .values()
+                    .stream().map(InterfaceDefinition :: getOperationsMap)
+                    .flatMap(map -> map.values().stream())
+                    .map(OperationDataDefinition::getImplementation)
+                    .filter(Objects::nonNull)
+                    .anyMatch(add -> artifactLabel.equals(add.getArtifactLabel()));
+        }
+        return true;
+    }
+
+    private Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getArtifacts(ComponentTypeEnum componentType, Component parentComponent,
+                                                                                         String componentId, ArtifactGroupTypeEnum artifactGroupType) {
+        Either<Map<String, ArtifactDefinition>, StorageOperationStatus> artifactsResponse;
+        if (componentType.equals(ComponentTypeEnum.RESOURCE_INSTANCE)) {
+            artifactsResponse = artifactToscaOperation.getAllInstanceArtifacts(parentComponent.getUniqueId(), componentId);
+        }
+        else {
+            artifactsResponse = artifactToscaOperation.getArtifacts(componentId);
+        }
+        if (artifactsResponse.isRight() && artifactsResponse.right().value().equals(StorageOperationStatus.NOT_FOUND)) {
+            log.debug("failed to retrieve artifacts for {} ", componentId);
+            return Either.right(artifactsResponse.right().value());
+        }
+        return Either.left(artifactsResponse.left().value().entrySet()
+                .stream()
+                .filter(x -> artifactGroupType.equals(x.getValue().getArtifactGroupType()))
+                .collect(Collectors.toMap(Entry::getKey, Entry::getValue)));
+    }
+
+    private List<String> getListOfArtifactName(Map<String, ArtifactDefinition> artifacts) {
+        return artifacts.entrySet()
+                .stream()
+                .map(x -> x.getValue().getArtifactName())
+                .collect(Collectors.toList());
+    }
+
     // ***************************************************************
 
     private Either<Either<ArtifactDefinition, Operation>, ResponseFormat> createAndLinkArtifact(org.openecomp.sdc.be.model.Component parent, String parentId, ArtifactDefinition artifactInfo, User user,
@@ -2292,8 +2344,8 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         String heatDecodedPayload = new String(Base64.decodeBase64(heatPayloadData));
         Map<String, Object> heatToscaJson = (Map<String, Object>) new Yaml().load(heatDecodedPayload);
 
-        Either<Map<String, Object>, ResultStatusEnum> eitherHeatEnvProperties = ImportUtils.findFirstToscaMapElement(heatEnvToscaJson, ToscaTagNamesEnum.PARAMETERS);
-        Either<Map<String, Object>, ResultStatusEnum> eitherHeatProperties = ImportUtils.findFirstToscaMapElement(heatToscaJson, ToscaTagNamesEnum.PARAMETERS);
+        Either<Map<String, Object>, ResultStatusEnum> eitherHeatEnvProperties = ImportUtils.findFirstToscaMapElement(heatEnvToscaJson, TypeUtils.ToscaTagNamesEnum.PARAMETERS);
+        Either<Map<String, Object>, ResultStatusEnum> eitherHeatProperties = ImportUtils.findFirstToscaMapElement(heatToscaJson, TypeUtils.ToscaTagNamesEnum.PARAMETERS);
         if (eitherHeatEnvProperties.isRight()) {
             ResponseFormat responseFormat = ResponseFormatManager.getInstance()
                                                                  .getResponseFormat(ActionStatus.CORRUPTED_FORMAT, "Heat Env");
@@ -3703,16 +3755,18 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
     }
 
     private Either<User, ResponseFormat> validateUserExists(String userId, AuditingActionEnum auditingAction, String componentId, String artifactId, ComponentTypeEnum componentType, boolean inTransaction) {
-        Either<User, ResponseFormat> validateUserExists = validateUserExists(userId, auditingAction.getName(), inTransaction);
-
-        if (validateUserExists.isRight()) {
-            User user = new User();
+        User user;
+        try{
+            user = validateUserExists(userId, auditingAction.getName(), inTransaction);
+        } catch(ComponentException e){
+            user = new User();
             user.setUserId(userId);
-            handleAuditing(auditingAction, null, componentId, user, null, null, artifactId, validateUserExists.right()
-                                                                                                              .value(), componentType, null);
-            return Either.right(validateUserExists.right().value());
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat() :
+                    componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
+            handleAuditing(auditingAction, null, componentId, user, null, null, artifactId, responseFormat, componentType, null);
+            throw e;
         }
-        return Either.left(validateUserExists.left().value());
+        return Either.left(user);
     }
 
     protected AuditingActionEnum detectAuditingType(ArtifactOperationInfo operation, String origMd5) {
@@ -3907,7 +3961,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                             gi.getGroupInstanceArtifacts().add(updatedArtDef.getUniqueId());
                             gi.getGroupInstanceArtifactsUuid().add(updatedArtDef.getArtifactUUID());
                         });
-                        Either<List<GroupInstance>, StorageOperationStatus> status = toscaOperationFacade.updateGroupInstancesOnComponent(component, componentType, instanceId, updatedGroupInstances);
+                        Either<List<GroupInstance>, StorageOperationStatus> status = toscaOperationFacade.updateGroupInstancesOnComponent(component, instanceId, updatedGroupInstances);
                         if (status.isRight()) {
                             log.debug("Failed to update groups of the component {}. ", component.getUniqueId());
                             ResponseFormat responseFormat = componentsUtils.getResponseFormatByArtifactId(componentsUtils
@@ -4638,16 +4692,16 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentType
      * @param componentUuid
      * @param artifactUUID
-     * @param auditAdditionalParam
+     * @param resourceCommonInfo
      * @return
      */
-    public Either<byte[], ResponseFormat> downloadComponentArtifactByUUIDs(ComponentTypeEnum componentType, String componentUuid, String artifactUUID, Map<AuditingFieldsKeysEnum, Object> auditAdditionalParam) {
+    public Either<byte[], ResponseFormat> downloadComponentArtifactByUUIDs(ComponentTypeEnum componentType, String componentUuid, String artifactUUID, ResourceCommonInfo resourceCommonInfo) {
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<byte[], ResponseFormat> result;
         byte[] downloadedArtifact = null;
         Component component = getComponentByUuid(componentType, componentUuid, errorWrapper);
-        if (errorWrapper.isEmpty()) {
-            auditAdditionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, component.getName());
+        if (errorWrapper.isEmpty() && component != null) {
+            resourceCommonInfo.setResourceName(component.getName());
             downloadedArtifact = downloadArtifact(component.getAllArtifacts(), artifactUUID, errorWrapper, component.getName());
         }
         if (errorWrapper.isEmpty()) {
@@ -4666,10 +4720,9 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentUuid
      * @param resourceInstanceName
      * @param artifactUUID
-     * @param auditAdditionalParam
      * @return
      */
-    public Either<byte[], ResponseFormat> downloadResourceInstanceArtifactByUUIDs(ComponentTypeEnum componentType, String componentUuid, String resourceInstanceName, String artifactUUID, Map<AuditingFieldsKeysEnum, Object> auditAdditionalParam) {
+    public Either<byte[], ResponseFormat> downloadResourceInstanceArtifactByUUIDs(ComponentTypeEnum componentType, String componentUuid, String resourceInstanceName, String artifactUUID) {
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<byte[], ResponseFormat> result;
         byte[] downloadedArtifact = null;
@@ -4694,12 +4747,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param request
      * @param componentType
      * @param componentUuid
-     * @param additionalParams
+     * @param resourceCommonInfo
      * @param operation
      * @return
      */
-    public Either<ArtifactDefinition, ResponseFormat> uploadArtifactToComponentByUUID(String data, HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, Map<AuditingFieldsKeysEnum, Object> additionalParams,
-                                                                                      ArtifactOperationInfo operation) {
+    public Either<ArtifactDefinition, ResponseFormat> uploadArtifactToComponentByUUID(String data, HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, ResourceCommonInfo resourceCommonInfo,ArtifactOperationInfo operation) {
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<Either<ArtifactDefinition, Operation>, ResponseFormat> actionResult = null;
         Either<ArtifactDefinition, ResponseFormat> uploadArtifactResult;
@@ -4713,7 +4765,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         Either<ComponentMetadataData, StorageOperationStatus> getComponentRes = toscaOperationFacade.getLatestComponentMetadataByUuid(componentUuid, JsonParseFlagEnum.ParseMetadata, true);
         if (getComponentRes.isRight()) {
             StorageOperationStatus status = getComponentRes.right().value();
-            log.debug("Could not fetch component with type {} and uuid {}. Status is {}. ", componentType, componentUuid, status);
+            log.debug(FAILED_FETCH_COMPONENT, componentType, componentUuid, status);
             errorWrapper.setInnerElement(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status, componentType), componentUuid));
         }
         if (errorWrapper.isEmpty()) {
@@ -4721,22 +4773,22 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
             String componentName = getComponentRes.left().value().getMetadataDataDefinition().getName();
 
             if (!getComponentRes.left()
-                                .value()
-                                .getMetadataDataDefinition()
-                                .getState()
-                                .equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name())) {
+                    .value()
+                    .getMetadataDataDefinition()
+                    .getState()
+                    .equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name())) {
                 component = checkoutParentComponent(componentType, componentId, userId, errorWrapper);
                 if (component != null) {
                     componentId = component.getUniqueId();
                     componentName = component.getName();
                 }
             }
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, componentName);
+            resourceCommonInfo.setResourceName(componentName);
         }
         if (errorWrapper.isEmpty()) {
             actionResult = handleArtifactRequest(componentId, userId, componentType, operation, null, artifactInfo, origMd5, data, null, null, null, null);
             if (actionResult.isRight()) {
-                log.debug("Failed to upload artifact to component with type {} and uuid {}. Status is {}. ", componentType, componentUuid, actionResult
+                log.debug(FAILED_UPLOAD_ARTIFACT_TO_COMPONENT, componentType, componentUuid, actionResult
                         .right()
                         .value());
                 errorWrapper.setInnerElement(actionResult.right().value());
@@ -4749,10 +4801,8 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         else {
             uploadArtifactResult = Either.right(errorWrapper.getInnerElement());
         }
-        updateAuditParametersWithArtifactDefinition(additionalParams, uploadArtifact);
         return uploadArtifactResult;
     }
-
     /**
      * upload an artifact to a resource instance by UUID
      *
@@ -4761,12 +4811,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentType
      * @param componentUuid
      * @param resourceInstanceName
-     * @param additionalParams
      * @param operation
      * @return
      */
     public Either<ArtifactDefinition, ResponseFormat> uploadArtifactToRiByUUID(String data, HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, String resourceInstanceName,
-                                                                               Map<AuditingFieldsKeysEnum, Object> additionalParams, ArtifactOperationInfo operation) {
+                                                                                ArtifactOperationInfo operation) {
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<ArtifactDefinition, ResponseFormat> uploadArtifactResult;
         Either<Either<ArtifactDefinition, Operation>, ResponseFormat> actionResult = null;
@@ -4823,7 +4872,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         else {
             uploadArtifactResult = Either.right(errorWrapper.getInnerElement());
         }
-        updateAuditParametersWithArtifactDefinition(additionalParams, uploadArtifact);
         return uploadArtifactResult;
     }
 
@@ -4835,12 +4883,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentType
      * @param componentUuid
      * @param artifactUUID
-     * @param additionalParams
-     * @param operation        TODO
+     * @param operation
      * @return
      */
     public Either<ArtifactDefinition, ResponseFormat> updateArtifactOnComponentByUUID(String data, HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, String artifactUUID,
-                                                                                      Map<AuditingFieldsKeysEnum, Object> additionalParams, ArtifactOperationInfo operation) {
+                                                                                      ResourceCommonInfo resourceCommonInfo, ArtifactOperationInfo operation) {
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<ArtifactDefinition, ResponseFormat> updateArtifactResult;
         Either<Either<ArtifactDefinition, Operation>, ResponseFormat> actionResult = null;
@@ -4873,7 +4920,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                     componentName = component.getName();
                 }
             }
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, componentName);
+            resourceCommonInfo.setResourceName(componentName);
         }
         if (errorWrapper.isEmpty()) {
             artifactId = getLatestParentArtifactDataIdByArtifactUUID(artifactUUID, errorWrapper, componentId, componentType);
@@ -4895,7 +4942,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         else {
             updateArtifactResult = Either.right(errorWrapper.getInnerElement());
         }
-        updateAuditParametersWithArtifactDefinition(additionalParams, updateArtifact);
         return updateArtifactResult;
     }
 
@@ -4908,12 +4954,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentUuid
      * @param resourceInstanceName
      * @param artifactUUID
-     * @param additionalParams
      * @param operation            TODO
      * @return
      */
     public Either<ArtifactDefinition, ResponseFormat> updateArtifactOnRiByUUID(String data, HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, String resourceInstanceName, String artifactUUID,
-                                                                               Map<AuditingFieldsKeysEnum, Object> additionalParams, ArtifactOperationInfo operation) {
+                                                                                ArtifactOperationInfo operation) {
 
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<ArtifactDefinition, ResponseFormat> updateArtifactResult;
@@ -4975,7 +5020,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         else {
             updateArtifactResult = Either.right(errorWrapper.getInnerElement());
         }
-        updateAuditParametersWithArtifactDefinition(additionalParams, updateArtifact);
         return updateArtifactResult;
     }
 
@@ -4987,14 +5031,13 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentType
      * @param componentUuid
      * @param artifactUUID
-     * @param additionalParams
      * @param operation        TODO
      * @return
      */
     public Either<ArtifactDefinition, ResponseFormat> updateArtifactOnInterfaceOperationByResourceUUID(
             String data, HttpServletRequest request, ComponentTypeEnum componentType,
             String componentUuid, String artifactUUID, String operationUUID,
-            Map<AuditingFieldsKeysEnum, Object> additionalParams, ArtifactOperationInfo operation) {
+            ResourceCommonInfo resourceCommonInfo,ArtifactOperationInfo operation) {
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<ArtifactDefinition, ResponseFormat> updateArtifactResult;
         Either<Either<ArtifactDefinition, Operation>, ResponseFormat> actionResult = null;
@@ -5023,8 +5066,9 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                     componentId = component.getUniqueId();
                     componentName = component.getName();
                 }
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, componentName);
+
             }
+            resourceCommonInfo.setResourceName(componentName);
         }
         if (errorWrapper.isEmpty()) {
             Either<String, ResponseFormat> interfaceName = fetchInterfaceName(componentId);
@@ -5051,7 +5095,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         else {
             updateArtifactResult = Either.right(errorWrapper.getInnerElement());
         }
-        updateAuditParametersWithArtifactDefinition(additionalParams, updateArtifact);
         return updateArtifactResult;
     }
 
@@ -5078,11 +5121,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentType
      * @param componentUuid
      * @param artifactUUID
-     * @param additionalParams
+     * @param resourceCommonInfo
      * @param operation        TODO
      * @return
      */
-    public Either<ArtifactDefinition, ResponseFormat> deleteArtifactOnComponentByUUID(HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, String artifactUUID, Map<AuditingFieldsKeysEnum, Object> additionalParams,
+    public Either<ArtifactDefinition, ResponseFormat> deleteArtifactOnComponentByUUID(HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, String artifactUUID, ResourceCommonInfo resourceCommonInfo,
                                                                                       ArtifactOperationInfo operation) {
 
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
@@ -5115,7 +5158,7 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
                     componentName = component.getName();
                 }
             }
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, componentName);
+            resourceCommonInfo.setResourceName(componentName);
         }
         if (errorWrapper.isEmpty()) {
             artifactId = getLatestParentArtifactDataIdByArtifactUUID(artifactUUID, errorWrapper, componentId, componentType);
@@ -5136,7 +5179,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         else {
             deleteArtifactResult = Either.right(errorWrapper.getInnerElement());
         }
-        updateAuditParametersWithArtifactDefinition(additionalParams, deleteArtifact);
         return deleteArtifactResult;
     }
 
@@ -5148,12 +5190,11 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
      * @param componentUuid
      * @param resourceInstanceName
      * @param artifactUUID
-     * @param additionalParams
      * @param operation            TODO
      * @return
      */
     public Either<ArtifactDefinition, ResponseFormat> deleteArtifactOnRiByUUID(HttpServletRequest request, ComponentTypeEnum componentType, String componentUuid, String resourceInstanceName, String artifactUUID,
-                                                                               Map<AuditingFieldsKeysEnum, Object> additionalParams, ArtifactOperationInfo operation) {
+                                                                               ArtifactOperationInfo operation) {
 
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         Either<ArtifactDefinition, ResponseFormat> deleteArtifactResult;
@@ -5214,7 +5255,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         else {
             deleteArtifactResult = Either.right(errorWrapper.getInnerElement());
         }
-        updateAuditParametersWithArtifactDefinition(additionalParams, deleteArtifact);
         return deleteArtifactResult;
     }
 
@@ -5296,15 +5336,16 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
             artifactToscaOperation.generateUUID(heatEnvPlaceholder, heatEnvPlaceholder.getArtifactVersion());
             setHeatCurrentValuesOnHeatEnvDefaultValues(heatArtifact, heatEnvPlaceholder);
         }
-        String artifactData = buildAuditingArtifactData(heatEnvPlaceholder);
+
         ComponentTypeEnum componentType = component.getComponentType();
         if (parentType == NodeTypeEnum.ResourceInstance) {
             componentType = ComponentTypeEnum.RESOURCE_INSTANCE;
         }
-        componentsUtils.auditComponent(componentsUtils.getResponseFormat(ActionStatus.OK), user, component, AuditingActionEnum.ARTIFACT_UPLOAD, componentType,
-                ResourceAuditData.newBuilder().build(),
-                ResourceAuditData.newBuilder().artifactUuid(heatEnvPlaceholder.getUniqueId()).build(),
-                parentName, null, artifactData, null);
+        componentsUtils.auditComponent(componentsUtils.getResponseFormat(ActionStatus.OK), user, component, AuditingActionEnum.ARTIFACT_UPLOAD,
+                new ResourceCommonInfo(parentName, componentType.getValue()),
+                ResourceVersionInfo.newBuilder().build(),
+                ResourceVersionInfo.newBuilder().artifactUuid(heatEnvPlaceholder.getUniqueId()).build(),
+                null, heatEnvPlaceholder, null);
         return Either.left(heatEnvPlaceholder);
     }
 
@@ -5608,21 +5649,6 @@ public class ArtifactsBusinessLogic extends BaseBusinessLogic {
         return component;
     }
 
-    private void updateAuditParametersWithArtifactDefinition(Map<AuditingFieldsKeysEnum, Object> additionalParams, ArtifactDefinition artifact) {
-        if (artifact == null) {
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA, "");
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, "");
-            if (!additionalParams.containsKey(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID)) {
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, "");
-            }
-        }
-        else {
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifact.getArtifactUUID());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_ARTIFACT_DATA, buildAuditingArtifactData(artifact));
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, artifact.getUpdaterFullName());
-        }
-    }
-
     private String buildJsonStringForCsarVfcArtifact(ArtifactDefinition artifact) {
         Map<String, Object> json = new HashMap<>();
         String artifactName = artifact.getArtifactName();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java
index bc813b9abb..ef0cd463db 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java
@@ -20,26 +20,23 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * This class holds the business logic relevant for attributes manipulation.
@@ -54,7 +51,8 @@ public class AttributeBusinessLogic extends BaseBusinessLogic {
     private static final String UPDATE_ATTRIBUTE = "UpdateAttribute";
     private static final String DELETE_ATTRIBUTE = "DeleteAttribute";
 
-    private static final Logger log = LoggerFactory.getLogger(AttributeBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(AttributeBusinessLogic.class.getName());
+    private static final String FAILED_TO_LOCK_COMPONENT_ERROR = "Failed to lock component {}. Error - {}";
 
     /**
      * Created attribute on the resource with resourceId
@@ -66,15 +64,12 @@ public class AttributeBusinessLogic extends BaseBusinessLogic {
      */
     public Either<PropertyDefinition, ResponseFormat> createAttribute(String resourceId, PropertyDefinition newAttributeDef, String userId) {
         Either<PropertyDefinition, ResponseFormat> result = null;
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Attribute", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Attribute", false);
 
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, NodeTypeEnum.Resource);
         if (lockResult != StorageOperationStatus.OK) {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(CREATE_ATTRIBUTE, NodeTypeEnum.Resource.name().toLowerCase(), resourceId);
-            log.info("Failed to lock component {}. Error - {}", resourceId, lockResult);
+            log.info(FAILED_TO_LOCK_COMPONENT_ERROR, resourceId, lockResult);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
@@ -128,7 +123,7 @@ public class AttributeBusinessLogic extends BaseBusinessLogic {
     private boolean isAttributeExist(List<PropertyDefinition> attributes, String resourceUid, String propertyName) {
         boolean isExist = false;
         if (attributes != null) {
-            isExist = attributes.stream().filter(p -> Objects.equals(p.getName(), propertyName) && Objects.equals(p.getParentUniqueId(), resourceUid)).findAny().isPresent();
+            isExist = attributes.stream().anyMatch(p -> Objects.equals(p.getName(), propertyName) && Objects.equals(p.getParentUniqueId(), resourceUid));
         }
         return isExist;
 
@@ -142,10 +137,7 @@ public class AttributeBusinessLogic extends BaseBusinessLogic {
      */
     public Either<PropertyDefinition, ResponseFormat> getAttribute(String resourceId, String attributeId, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Attribute", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get Attribute", false);
 
         // Get the resource from DB
         Either<Resource, StorageOperationStatus> status = toscaOperationFacade.getToscaElement(resourceId);
@@ -158,16 +150,9 @@ public class AttributeBusinessLogic extends BaseBusinessLogic {
         if (attributes == null) {
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.ATTRIBUTE_NOT_FOUND, ""));
         } else {
-            Either<PropertyDefinition, ResponseFormat> result;
             // verify attribute exist in resource
             Optional<PropertyDefinition> optionalAtt = attributes.stream().filter(att -> att.getUniqueId().equals(attributeId) && att.getParentUniqueId().equals(resourceId)).findAny();
-
-            if (optionalAtt.isPresent()) {
-                result = Either.left(optionalAtt.get());
-            } else {
-                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.ATTRIBUTE_NOT_FOUND, ""));
-            }
-            return result;
+            return optionalAtt.<Either<PropertyDefinition, ResponseFormat>>map(Either::left).orElseGet(() -> Either.right(componentsUtils.getResponseFormat(ActionStatus.ATTRIBUTE_NOT_FOUND, "")));
         }
 
     }
@@ -187,7 +172,7 @@ public class AttributeBusinessLogic extends BaseBusinessLogic {
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, NodeTypeEnum.Resource);
         if (lockResult != StorageOperationStatus.OK) {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(UPDATE_ATTRIBUTE, NodeTypeEnum.Resource.name().toLowerCase(), resourceId);
-            log.info("Failed to lock component {}. Error - {}", resourceId, lockResult);
+            log.info(FAILED_TO_LOCK_COMPONENT_ERROR, resourceId, lockResult);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
         try {
@@ -256,15 +241,12 @@ public class AttributeBusinessLogic extends BaseBusinessLogic {
 
         Either<PropertyDefinition, ResponseFormat> result = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Attribute", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Attribute", false);
 
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, NodeTypeEnum.Resource);
         if (lockResult != StorageOperationStatus.OK) {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(DELETE_ATTRIBUTE, NodeTypeEnum.Resource.name().toLowerCase(), resourceId);
-            log.info("Failed to lock component {}. Error - {}", resourceId, lockResult);
+            log.info(FAILED_TO_LOCK_COMPONENT_ERROR, resourceId, lockResult);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/BaseBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/BaseBusinessLogic.java
index 4b15081968..e7ae0612f4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/BaseBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/BaseBusinessLogic.java
@@ -20,16 +20,10 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.StringUtils;
+import com.google.gson.JsonElement;
+import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.validation.UserValidations;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
@@ -43,26 +37,12 @@ import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.GroupProperty;
-import org.openecomp.sdc.be.model.IComplexDefaultValue;
-import org.openecomp.sdc.be.model.IPropertyInputCommon;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
 import org.openecomp.sdc.be.model.jsontitan.operations.ArtifactsOperations;
-import org.openecomp.sdc.be.model.jsontitan.operations.ForwardingPathOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.operations.api.IElementOperation;
-import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
-import org.openecomp.sdc.be.model.operations.api.IGroupInstanceOperation;
-import org.openecomp.sdc.be.model.operations.api.IGroupOperation;
-import org.openecomp.sdc.be.model.operations.api.IGroupTypeOperation;
-import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.be.model.operations.api.*;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.PolicyTypeOperation;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
@@ -71,27 +51,29 @@ import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.model.tosca.converters.PropertyValueConverter;
 import org.openecomp.sdc.be.model.tosca.validators.DataTypeValidatorConverter;
 import org.openecomp.sdc.be.model.tosca.validators.PropertyTypeValidator;
-import org.openecomp.sdc.be.resources.data.PropertyValueData;
 import org.openecomp.sdc.be.user.IUserBusinessLogic;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
-import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.openecomp.sdc.common.util.ValidationUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.google.gson.JsonElement;
-
-import fj.data.Either;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 
 public abstract class BaseBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(BaseBusinessLogic.class);
+    private static final String FAILED_TO_LOCK_COMPONENT_ERROR = "Failed to lock component {} error - {}";
+
+	private static final Logger log = Logger.getLogger(BaseBusinessLogic.class.getName());
 
     private static final String EMPTY_VALUE = null;
+    private static final String SCHEMA_DOESN_T_EXISTS_FOR_PROPERTY_OF_TYPE = "Schema doesn't exists for property of type {}";
+    private static final String PROPERTY_IN_SCHEMA_DEFINITION_INSIDE_PROPERTY_OF_TYPE_DOESN_T_EXIST = "Property in Schema Definition inside property of type {} doesn't exist";
+    private static final String ADD_PROPERTY_VALUE = "Add property value";
     @Autowired
     protected ComponentsUtils componentsUtils;
 
@@ -114,7 +96,7 @@ public abstract class BaseBusinessLogic {
     protected IGroupOperation groupOperation;
 
     @Autowired
-    protected IGroupInstanceOperation groupInstanceOperation;
+    IGroupInstanceOperation groupInstanceOperation;
 
     @Autowired
     protected IGroupTypeOperation groupTypeOperation;
@@ -123,7 +105,7 @@ public abstract class BaseBusinessLogic {
     protected GroupBusinessLogic groupBusinessLogic;
 
     @Autowired
-    protected PolicyTypeOperation policyTypeOperation;
+    PolicyTypeOperation policyTypeOperation;
 
     @javax.annotation.Resource
     protected ArtifactsOperations artifactToscaOperation;
@@ -140,13 +122,10 @@ public abstract class BaseBusinessLogic {
     @Autowired
     protected ApplicationDataTypeCache dataTypeCache;
 
-    @Autowired
-    protected ForwardingPathOperation forwardingPathOperation;
-
     @javax.annotation.Resource
     private UserValidations userValidations;
 
-    protected DataTypeValidatorConverter dataTypeValidatorConverter = DataTypeValidatorConverter.getInstance();
+    DataTypeValidatorConverter dataTypeValidatorConverter = DataTypeValidatorConverter.getInstance();
 
 
     public void setUserAdmin(UserBusinessLogic userAdmin) {
@@ -169,15 +148,6 @@ public abstract class BaseBusinessLogic {
         this.toscaOperationFacade = toscaOperationFacade;
     }
 
-    public void setForwardingPathOperation(ForwardingPathOperation forwardingPathOperation){
-        this.forwardingPathOperation = forwardingPathOperation;
-    }
-
-    public void setPolicyTypeOperation(PolicyTypeOperation policyTypeOperation) {
-        this.policyTypeOperation = policyTypeOperation;
-    }
-
-
     public void setDataTypeCache(ApplicationDataTypeCache dataTypeCache) {
         this.dataTypeCache = dataTypeCache;
     }
@@ -186,28 +156,28 @@ public abstract class BaseBusinessLogic {
         this.propertyOperation = propertyOperation;
     }
 
-      protected Either<User, ResponseFormat> validateUserNotEmpty(User user, String ecompErrorContext) {
+    User validateUserNotEmpty(User user, String ecompErrorContext) {
         return userValidations.validateUserNotEmpty(user, ecompErrorContext);
     }
 
-    protected Either<User, ResponseFormat> validateUserExists(User user, String ecompErrorContext, boolean inTransaction) {
+    protected User validateUserExists(User user, String ecompErrorContext, boolean inTransaction) {
         return userValidations.validateUserExists(user.getUserId(), ecompErrorContext, inTransaction);
     }
 
-    protected void validateUserExist(String userId, String ecompErrorContext, Wrapper<ResponseFormat> errorWrapper) {
-        userValidations.validateUserExist(userId, ecompErrorContext, errorWrapper);
+    void validateUserExist(String userId, String ecompErrorContext) {
+        userValidations.validateUserExist(userId, ecompErrorContext);
     }
 
-    public Either<User, ActionStatus> validateUserExistsActionStatus(String userId, String ecompErrorContext) {
+    Either<User, ActionStatus> validateUserExistsActionStatus(String userId, String ecompErrorContext) {
         return userValidations.validateUserExistsActionStatus(userId, ecompErrorContext);
     }
 
-    public Either<User, ResponseFormat> validateUserExists(String userId, String ecompErrorContext, boolean inTransaction) {
+    public User validateUserExists(String userId, String ecompErrorContext, boolean inTransaction) {
         return userValidations.validateUserExists(userId, ecompErrorContext, inTransaction);
     }
 
-    protected Either<Boolean, ResponseFormat> validateUserRole(User user, List<Role> roles) {
-        return userValidations.validateUserRole(user, roles);
+    protected void validateUserRole(User user, List<Role> roles) {
+        userValidations.validateUserRole(user, roles);
     }
 
     protected Either<Boolean, ResponseFormat> lockComponent(Component component, String ecompErrorContext) {
@@ -220,6 +190,31 @@ public abstract class BaseBusinessLogic {
     }
 
     protected Either<Boolean, ResponseFormat> lockComponent(String componentId, Component component, String ecompErrorContext) {
+        return lockElement( componentId,  component,  ecompErrorContext)
+                .right()
+                .map(r -> logAndConvertError(r, component.getUniqueId(), component.getName()) );
+    }
+
+    protected void lockComponent(String componentId, Component component, boolean needLock, String ecompErrorContext) {
+        if (needLock){
+            lockElement( componentId,  component,  ecompErrorContext)
+                   .left()
+                   .on(r -> logAndThrowException(r, component.getUniqueId(), component.getName()) );
+        }
+    }
+
+    private Boolean logAndThrowException(ActionStatus status, String componentId, String name){
+        log.debug(FAILED_TO_LOCK_COMPONENT_ERROR, componentId, status);
+        throw new ComponentException(status, name);
+    }
+
+    private ResponseFormat logAndConvertError(ActionStatus status, String componentId, String name){
+        ResponseFormat responseFormat = componentsUtils.getResponseFormat(status, name);
+        log.debug(FAILED_TO_LOCK_COMPONENT_ERROR, componentId, status);
+        return responseFormat;
+    }
+
+    private Either<Boolean, ActionStatus> lockElement(String componentId, Component component, String ecompErrorContext) {
         ComponentTypeEnum componentType = component.getComponentType();
         NodeTypeEnum nodeType = componentType.getNodeType();
         StorageOperationStatus lockResourceStatus = graphLockOperation.lockComponent(componentId, nodeType);
@@ -229,9 +224,7 @@ public abstract class BaseBusinessLogic {
         } else {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(ecompErrorContext, nodeType.getName(), componentId);
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(lockResourceStatus, componentType);
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus, component.getName());
-            log.debug("Failed to lock component {} error - {}", componentId, actionStatus);
-            return Either.right(responseFormat);
+            return Either.right(actionStatus);
         }
     }
 
@@ -252,14 +245,14 @@ public abstract class BaseBusinessLogic {
     protected void unlockComponent(Either<?, ?> either, Component component) {
         unlockComponent(either, component, false);
     }
-    protected void unlockComponentById(Either<?, ?> either, String componentId) {
+    void unlockComponentById(Either<?, ?> either, String componentId) {
         Either<Component, StorageOperationStatus> component = toscaOperationFacade.getToscaElement(componentId);
-        if(component.isLeft() && component != null) {
+        if(component.isLeft()) {
             unlockComponent(either, component.left().value(), false);
         }
     }
 
-    protected <T> Either<Boolean, ResponseFormat> validateJsonBody(T bodyObject, Class<T> clazz) {
+    <T> Either<Boolean, ResponseFormat> validateJsonBody(T bodyObject, Class<T> clazz) {
         if (bodyObject == null) {
             log.debug("Invalid JSON received for object of type {}", clazz.getSimpleName());
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
@@ -268,7 +261,7 @@ public abstract class BaseBusinessLogic {
         }
     }
 
-    protected Either<ComponentTypeEnum, ResponseFormat> validateComponentType(String componentType) {
+    Either<ComponentTypeEnum, ResponseFormat> validateComponentType(String componentType) {
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
         if (componentTypeEnum == null) {
             log.debug("Invalid component type {}", componentType);
@@ -279,10 +272,7 @@ public abstract class BaseBusinessLogic {
     }
 
     protected Either<Component, ResponseFormat> validateComponentExists(String componentId, ComponentTypeEnum componentType, ComponentParametersView filter) {
-        if (filter == null) {
-            filter = new ComponentParametersView();
-        }
-        return toscaOperationFacade.getToscaElement(componentId, filter)
+        return toscaOperationFacade.getToscaElement(componentId, filter == null ? new ComponentParametersView() : filter)
                 .right()
                 .map(err -> handleGetComponentError(componentId, componentType, err))
                 .left()
@@ -298,7 +288,7 @@ public abstract class BaseBusinessLogic {
         return Either.left(cmpt);
     }
 
-    protected <T extends PropertyDataDefinition> Either<String, ResponseFormat> updatePropertyObjectValue(T property, boolean isInput) {
+    <T extends PropertyDataDefinition> Either<String, ResponseFormat> updateInputPropertyObjectValue(T property) {
         Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypesEither = dataTypeCache.getAll();
         if (allDataTypesEither.isRight()) {
             TitanOperationStatus status = allDataTypesEither.right().value();
@@ -306,24 +296,8 @@ public abstract class BaseBusinessLogic {
             return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(status))));
         }
         Map<String, DataTypeDefinition> allDataTypes = allDataTypesEither.left().value();
-        String innerType = null;
         String propertyType = property.getType();
-        ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
-        log.debug("The type of the property {} is {}", property.getUniqueId(), propertyType);
-
-        if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
-            SchemaDefinition def = property.getSchema();
-            if (def == null) {
-                log.debug("Schema doesn't exists for property of type {}", type);
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
-            }
-            PropertyDataDefinition propDef = def.getProperty();
-            if (propDef == null) {
-                log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
-            }
-            innerType = propDef.getType();
-        }
+        String innerType = getInnerType(property);
         // Specific Update Logic
         Either<Object, Boolean> isValid = propertyOperation.validateAndUpdatePropertyValue(propertyType, property.getValue(), true, innerType, allDataTypes);
         String newValue = property.getValue();
@@ -338,14 +312,26 @@ public abstract class BaseBusinessLogic {
                 newValue = object.toString();
             }
         }
-        if (!isInput) {
-            ImmutablePair<String, Boolean> pair = propertyOperation.validateAndUpdateRules(propertyType, ((ComponentInstanceProperty) property).getRules(), innerType, allDataTypes, true);
-            if (Boolean.FALSE.equals(pair.getRight())) {
-                BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), property.getName(), propertyType);
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT))));
+        return Either.left(newValue);
+    }
+
+    private <T extends PropertyDataDefinition> String getInnerType(T property){
+        ToscaPropertyType type = ToscaPropertyType.isValidType(property.getType());
+        log.debug("#getInnerType - The type of the property {} is {}", property.getUniqueId(), property.getType());
+        String innerType = null;
+        if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
+            if (property.getSchema() == null) {
+                log.debug(SCHEMA_DOESN_T_EXISTS_FOR_PROPERTY_OF_TYPE, type);
+                throw new ComponentException(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE));
             }
+            PropertyDataDefinition innerProperty = property.getSchema().getProperty();
+            if (innerProperty == null) {
+                log.debug(PROPERTY_IN_SCHEMA_DEFINITION_INSIDE_PROPERTY_OF_TYPE_DOESN_T_EXIST, type);
+                throw new ComponentException(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE));
+            }
+            innerType = innerProperty.getType();
         }
-        return Either.left(newValue);
+        return innerType;
     }
 
     public Either<Boolean, ResponseFormat> validateCanWorkOnComponent(Component component, String userId) {
@@ -377,7 +363,7 @@ public abstract class BaseBusinessLogic {
         return Either.left(true);
     }
 
-    public ComponentTypeEnum getComponentTypeByParentComponentType(ComponentTypeEnum parentComponentType) {
+    ComponentTypeEnum getComponentTypeByParentComponentType(ComponentTypeEnum parentComponentType) {
         switch (parentComponentType) {
             case SERVICE:
                 return ComponentTypeEnum.RESOURCE;
@@ -411,8 +397,8 @@ public abstract class BaseBusinessLogic {
         return Either.left(allDataTypes.left().value());
     }
 
-    protected Either<Boolean, ResponseFormat> validatePropertyDefaultValue(IComplexDefaultValue property, Map<String, DataTypeDefinition> dataTypes) {
-        String type = null;
+    Either<Boolean, ResponseFormat> validatePropertyDefaultValue(IComplexDefaultValue property, Map<String, DataTypeDefinition> dataTypes) {
+        String type;
         String innerType = null;
         if (!propertyOperation.isPropertyTypeValid(property)) {
             log.info("Invalid type for property {} type {}", property.getName(), property.getType());
@@ -423,7 +409,7 @@ public abstract class BaseBusinessLogic {
         if (type.equals(ToscaPropertyType.LIST.getType()) || type.equals(ToscaPropertyType.MAP.getType())) {
             ImmutablePair<String, Boolean> propertyInnerTypeValid = propertyOperation.isPropertyInnerTypeValid(property, dataTypes);
             innerType = propertyInnerTypeValid.getLeft();
-            if (!propertyInnerTypeValid.getRight().booleanValue()) {
+            if (!propertyInnerTypeValid.getRight()) {
                 log.info("Invalid inner type for property {} type {}", property.getName(), property.getType());
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_PROPERTY_INNER_TYPE, innerType, property.getName());
                 return Either.right(responseFormat);
@@ -444,30 +430,28 @@ public abstract class BaseBusinessLogic {
     }
 
 
-    protected void handleDefaultValue(IComplexDefaultValue newAttributeDef, Map<String, DataTypeDefinition> dataTypes) {
+    void handleDefaultValue(IComplexDefaultValue newAttributeDef, Map<String, DataTypeDefinition> dataTypes) {
         // convert property
         ToscaPropertyType type = ToscaPropertyType.isValidType(newAttributeDef.getType());
         PropertyValueConverter converter = type.getConverter();
         // get inner type
         String innerType = null;
 
-        if (newAttributeDef != null) {
-            SchemaDefinition schema = newAttributeDef.getSchema();
-            if (schema != null) {
-                PropertyDataDefinition prop = schema.getProperty();
-                if (schema.getProperty() != null) {
-                    innerType = prop.getType();
-                }
-            }
-            String convertedValue = null;
-            if (newAttributeDef.getDefaultValue() != null) {
-                convertedValue = converter.convert(newAttributeDef.getDefaultValue(), innerType, dataTypes);
-                newAttributeDef.setDefaultValue(convertedValue);
+        SchemaDefinition schema = newAttributeDef.getSchema();
+        if (schema != null) {
+            PropertyDataDefinition prop = schema.getProperty();
+            if (schema.getProperty() != null) {
+                innerType = prop.getType();
             }
         }
+        String convertedValue;
+        if (newAttributeDef.getDefaultValue() != null) {
+            convertedValue = converter.convert(newAttributeDef.getDefaultValue(), innerType, dataTypes);
+            newAttributeDef.setDefaultValue(convertedValue);
+        }
     }
 
-    protected void validateComponentTypeEnum(ComponentTypeEnum componentTypeEnum, String errorContext, Wrapper<ResponseFormat> errorWrapper) {
+    void validateComponentTypeEnum(ComponentTypeEnum componentTypeEnum, String errorContext, Wrapper<ResponseFormat> errorWrapper) {
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError(errorContext, "invalid component type", ErrorSeverity.INFO);
             errorWrapper.setInnerElement(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
@@ -483,7 +467,7 @@ public abstract class BaseBusinessLogic {
 
     }
 
-    protected void validateComponentLock(String componentId, ComponentTypeEnum componentTypeEnum, Wrapper<ResponseFormat> errorWrapper) {
+    void validateComponentLock(String componentId, ComponentTypeEnum componentTypeEnum, Wrapper<ResponseFormat> errorWrapper) {
         StorageOperationStatus lockStatus = graphLockOperation.lockComponent(componentId, componentTypeEnum.getNodeType());
         if (lockStatus != StorageOperationStatus.OK) {
             log.debug("Failed to lock {} {}", componentTypeEnum.getValue(), componentId);
@@ -496,7 +480,7 @@ public abstract class BaseBusinessLogic {
         return ToscaPropertyType.isValidType(propertyType);
     }
 
-    protected void commitOrRollback(Either<? extends Object, ResponseFormat> result) {
+    void commitOrRollback(Either<?, ResponseFormat> result) {
         if (result == null || result.isRight()) {
             log.warn("operation failed. do rollback");
             titanDao.rollback();
@@ -517,7 +501,7 @@ public abstract class BaseBusinessLogic {
             BeEcompErrorManager.getInstance().logBeFailedLockObjectError(ecompErrorContext, nodeType.getName(), name);
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(lockResourceStatus, componentType);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus, component.getName());
-            log.debug("Failed to lock component {} error - {}", name, actionStatus);
+            log.debug(FAILED_TO_LOCK_COMPONENT_ERROR, name, actionStatus);
             return Either.right(responseFormat);
         }
     }
@@ -531,66 +515,26 @@ public abstract class BaseBusinessLogic {
 
     private ResponseFormat handleGetComponentError(String componentId, ComponentTypeEnum componentType, StorageOperationStatus getComponentError) {
         ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentError, componentType);
-        ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus, Constants.EMPTY_STRING);
+        ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus, componentId);
         log.debug("error fetching component with id {}. error status: {}", componentId, getComponentError);
         return responseFormat;
     }
 
-    protected Either<GroupProperty, ResponseFormat> validateFreeText(GroupProperty groupPropertyToUpdate) {
-
-        Either<GroupProperty, ResponseFormat> ret;
-        final String groupTypeValue = groupPropertyToUpdate.getValue();
-        if (!StringUtils.isEmpty(groupTypeValue)) {
-            if (!ValidationUtils.validateDescriptionLength(groupTypeValue)) {
-                ret = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_DESCRIPTION_EXCEEDS_LIMIT,
-                        NodeTypeEnum.Property.getName(),
-                        String.valueOf(ValidationUtils.COMPONENT_DESCRIPTION_MAX_LENGTH)));
-            } else if (!ValidationUtils.validateIsEnglish(groupTypeValue)) {
-                ret = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_DESCRIPTION,
-                        NodeTypeEnum.Property.getName()));
-            } else {
-                ret = Either.left(groupPropertyToUpdate);
-            }
-
-        } else {
-            ret = Either.left(groupPropertyToUpdate);
-        }
-        return ret;
-    }
-
-
     @SafeVarargs
     static <T extends Enum<T>> boolean enumHasValueFilter(String name, Function<String, T> enumGetter, T... enumValues) {
         T enumFound = enumGetter.apply(name);
         return Arrays.asList(enumValues).contains(enumFound);
     }
 
-    Either<String, StorageOperationStatus> validatePropValueBeforeCreate(IPropertyInputCommon property, String value, boolean isValidate, String innerType, Map<String, DataTypeDefinition> allDataTypes) {
+    String validatePropValueBeforeCreate(IPropertyInputCommon property, String value, boolean isValidate, String innerType, Map<String, DataTypeDefinition> allDataTypes) {
         String propertyType = property.getType();
-        ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
-
-        if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
-            SchemaDefinition def = property.getSchema();
-            if (def == null) {
-                log.debug("Schema doesn't exists for property of type {}", type);
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
-            }
-            PropertyDataDefinition propDef = def.getProperty();
-            if (propDef == null) {
-                log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
-            }
-            innerType = propDef.getType();
-        }
-
-        Either<Object, Boolean> isValid = validateAndUpdatePropertyValue(propertyType, value, isValidate, innerType, allDataTypes);
-
+        String updatedInnerType = updateInnerType(property, innerType);
+        Either<Object, Boolean> isValid = validateAndUpdatePropertyValue(propertyType, value, isValidate, updatedInnerType, allDataTypes);
         String newValue = value;
         if (isValid.isRight()) {
             Boolean res = isValid.right().value();
             if (Boolean.FALSE.equals(res)) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
+                throw new StorageException(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
             }
         } else {
             Object object = isValid.left().value();
@@ -598,59 +542,37 @@ public abstract class BaseBusinessLogic {
                 newValue = object.toString();
             }
         }
-
-        ImmutablePair<String, Boolean> pair = validateAndUpdateRules(propertyType, property.getRules(), innerType, allDataTypes, isValidate);
+        ImmutablePair<String, Boolean> pair = validateAndUpdateRules(propertyType, property.getRules(), updatedInnerType, allDataTypes, isValidate);
         log.trace("After validateAndUpdateRules. pair = {}", pair);
         if (Boolean.FALSE.equals(pair.getRight())) {
-            BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), property.getName(), propertyType);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
+            BeEcompErrorManager.getInstance().logBeInvalidValueError(ADD_PROPERTY_VALUE, pair.getLeft(), property.getName(), propertyType);
+            throw new StorageException(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
         }
-
-        return Either.left(newValue);
+        return newValue;
     }
 
-    protected Either<String, StorageOperationStatus> validateInputValueBeforeCreate(ComponentInstanceInput property, String value, boolean isValidate, String innerType, Map<String, DataTypeDefinition> allDataTypes) {
-        String propertyType = property.getType();
-        ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
-
+    private String updateInnerType(IPropertyInputCommon property, String innerType) {
+        ToscaPropertyType type = ToscaPropertyType.isValidType(property.getType());
         if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
             SchemaDefinition def = property.getSchema();
             if (def == null) {
-                log.debug("Schema doesn't exists for property of type {}", type);
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
+                log.debug(SCHEMA_DOESN_T_EXISTS_FOR_PROPERTY_OF_TYPE, type);
+                failOnIllegalArgument();
             }
             PropertyDataDefinition propDef = def.getProperty();
             if (propDef == null) {
-                log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
-            }
-            innerType = propDef.getType();
-        }
-
-        Either<Object, Boolean> isValid = validateAndUpdatePropertyValue(propertyType, value, isValidate, innerType, allDataTypes);
-
-        String newValue = value;
-        if (isValid.isRight()) {
-            Boolean res = isValid.right().value();
-            if (Boolean.FALSE.equals(res)) {
-                return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
-            }
-        } else {
-            Object object = isValid.left().value();
-            if (object != null) {
-                newValue = object.toString();
+                log.debug(PROPERTY_IN_SCHEMA_DEFINITION_INSIDE_PROPERTY_OF_TYPE_DOESN_T_EXIST, type);
+                failOnIllegalArgument();
             }
+            return propDef.getType();
         }
+        return innerType;
+    }
 
-        ImmutablePair<String, Boolean> pair = validateAndUpdateRules(propertyType, property.getRules(), innerType, allDataTypes, isValidate);
-        log.debug("After validateAndUpdateRules. pair = {}", pair);
-        if (Boolean.FALSE.equals(pair.getRight())) {
-            BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), property.getName(), propertyType);
-            return Either.right(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT));
-        }
-
-        return Either.left(newValue);
+    private void failOnIllegalArgument() {
+        throw new ComponentException(
+                componentsUtils.convertFromStorageResponse(
+                        DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT)));
     }
 
     public Either<Object, Boolean> validateAndUpdatePropertyValue(String propertyType, String value, boolean isValidate, String innerType, Map<String, DataTypeDefinition> dataTypes) {
@@ -685,7 +607,7 @@ public abstract class BaseBusinessLogic {
         return Either.left(convertedValue);
     }
 
-    public ImmutablePair<String, Boolean> validateAndUpdateRules(String propertyType, List<PropertyRule> rules, String innerType, Map<String, DataTypeDefinition> dataTypes, boolean isValidate) {
+    private ImmutablePair<String, Boolean> validateAndUpdateRules(String propertyType, List<PropertyRule> rules, String innerType, Map<String, DataTypeDefinition> dataTypes, boolean isValidate) {
 
         if (rules == null || rules.isEmpty()) {
             return ImmutablePair.of(null, true);
@@ -723,72 +645,21 @@ public abstract class BaseBusinessLogic {
     }
 
     public boolean isEmptyValue(String value) {
-        if (value == null) {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isNullParam(String value) {
-        if (value == null) {
-            return true;
-        }
-        return false;
-    }
-
-    public void addRulesToNewPropertyValue(PropertyValueData propertyValueData, ComponentInstanceProperty resourceInstanceProperty, String resourceInstanceId) {
-
-        List<PropertyRule> rules = resourceInstanceProperty.getRules();
-        if (rules == null) {
-            PropertyRule propertyRule = buildRuleFromPath(propertyValueData, resourceInstanceProperty, resourceInstanceId);
-            rules = new ArrayList<>();
-            rules.add(propertyRule);
-        } else {
-            rules = sortRules(rules);
-        }
-
-        propertyValueData.setRules(rules);
-    }
-
-    private PropertyRule buildRuleFromPath(PropertyValueData propertyValueData, ComponentInstanceProperty resourceInstanceProperty, String resourceInstanceId) {
-        List<String> path = resourceInstanceProperty.getPath();
-        // FOR BC. Since old Property values on VFC/VF does not have rules on
-        // graph.
-        // Update could be done on one level only, thus we can use this
-        // operation to avoid migration.
-        if (isEmpty(path)) {
-            path = new ArrayList<>();
-            path.add(resourceInstanceId);
-        }
-        PropertyRule propertyRule = new PropertyRule();
-        propertyRule.setRule(path);
-        propertyRule.setValue(propertyValueData.getValue());
-        return propertyRule;
-    }
-
-    private List<PropertyRule> sortRules(List<PropertyRule> rules) {
-
-        // TODO: sort the rules by size and binary representation.
-        // (x, y, .+) --> 110 6 priority 1
-        // (x, .+, z) --> 101 5 priority 2
-
-        return rules;
+        return value == null;
     }
 
     protected String getValueFromJsonElement(JsonElement jsonElement) {
-        String value = null;
-
         if (jsonElement == null || jsonElement.isJsonNull()) {
-            value = EMPTY_VALUE;
-        } else {
-            if (jsonElement.toString().isEmpty()) {
-                value = "";
-            } else {
-                value = jsonElement.toString();
-            }
+            return EMPTY_VALUE;
         }
-
-        return value;
+        if (jsonElement.toString().isEmpty()) {
+            return "";
+        }
+        return jsonElement.toString();
+    }
+    
+    protected void rollbackWithException(ActionStatus actionStatus, String... params) {
+        titanDao.rollback();
+        throw new ComponentException(actionStatus, params);
     }
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilityTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilityTypeImportManager.java
index b350c7b4c9..b54a8050ce 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilityTypeImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CapabilityTypeImportManager.java
@@ -20,85 +20,65 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import javax.annotation.Resource;
-
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import fj.data.Either;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.CapabilityTypeOperation;
+import org.openecomp.sdc.be.model.utils.TypeCompareUtils;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Map;
 
 @Component("capabilityTypeImportManager")
 public class CapabilityTypeImportManager {
 
-    private static final Logger log = LoggerFactory.getLogger(CapabilityTypeImportManager.class);
-    @Resource
-    private CapabilityTypeOperation capabilityTypeOperation;
-    @Resource
-    private ComponentsUtils componentsUtils;
-    @Resource
-    private CommonImportManager commonImportManager;
-
-    public Either<List<CapabilityTypeDefinition>, ResponseFormat> createCapabilityTypes(String capabilityYml) {
-        Either<List<CapabilityTypeDefinition>, ActionStatus> capabilityTypes = createCapabilityTypesFromYml(capabilityYml);
-        if (capabilityTypes.isRight()) {
-            ActionStatus status = capabilityTypes.right().value();
-            ResponseFormat responseFormat = componentsUtils.getResponseFormatByCapabilityType(status, null);
-            return Either.right(responseFormat);
-        }
-        return createCapabilityTypesByDao(capabilityTypes.left().value());
+    private static final Logger log = Logger.getLogger(CapabilityTypeImportManager.class.getName());
+    private final CapabilityTypeOperation capabilityTypeOperation;
+    private final CommonImportManager commonImportManager;
+
+    public CapabilityTypeImportManager(CapabilityTypeOperation capabilityTypeOperation, CommonImportManager commonImportManager) {
+        this.capabilityTypeOperation = capabilityTypeOperation;
+        this.commonImportManager = commonImportManager;
 
     }
 
-    private Either<List<CapabilityTypeDefinition>, ActionStatus> createCapabilityTypesFromYml(String capabilityYml) {
-        return commonImportManager.createElementTypesFromYml(capabilityYml, (capTypeName, capTypeJsonData) -> createCapabilityType(capTypeName, capTypeJsonData));
+    public Either<List<ImmutablePair<CapabilityTypeDefinition, Boolean>>, ResponseFormat> createCapabilityTypes(String capabilityTypesYml) {
+        return  commonImportManager.createElementTypes(capabilityTypesYml, this::createCapabilityTypesFromYml, this::upsertCapabilityTypesByDao, CommonImportManager.ElementTypeEnum.CAPABILITY_TYPE);
 
     }
 
-    private Either<List<CapabilityTypeDefinition>, ResponseFormat> createCapabilityTypesByDao(List<CapabilityTypeDefinition> capabilityTypesToCreate) {
-        List<CapabilityTypeDefinition> createdCapabilities = new ArrayList<>();
-        Either<List<CapabilityTypeDefinition>, ResponseFormat> eitherResult = Either.left(createdCapabilities);
-        Iterator<CapabilityTypeDefinition> capTypeItr = capabilityTypesToCreate.iterator();
-        boolean stopDao = false;
-        while (capTypeItr.hasNext() && !stopDao) {
-            CapabilityTypeDefinition capabilityType = capTypeItr.next();
-
-            log.info("send capabilityType {} to dao for create", capabilityType.getType());
-            Either<CapabilityTypeDefinition, StorageOperationStatus> dataModelResponse = capabilityTypeOperation.addCapabilityType(capabilityType);
-            if (dataModelResponse.isRight()) {
-                BeEcompErrorManager.getInstance().logBeFailedAddingNodeTypeError("Create CapabilityTypes", "capability type");
-                log.debug("failed to create capabilityType: {}", capabilityType.getType());
-                if (dataModelResponse.right().value() != StorageOperationStatus.SCHEMA_VIOLATION) {
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormatByCapabilityType(componentsUtils.convertFromStorageResponseForCapabilityType(dataModelResponse.right().value()), capabilityType);
-                    eitherResult = Either.right(responseFormat);
-                    stopDao = true;
-                }
-
-            } else {
-                createdCapabilities.add(capabilityType);
-            }
-            if (!capTypeItr.hasNext()) {
-                log.info("capabilityTypes were created successfully!!!");
-            }
-
-        }
+    private Either<List<CapabilityTypeDefinition>, ActionStatus> createCapabilityTypesFromYml(String capabilityTypesYml) {
+        return commonImportManager.createElementTypesFromYml(capabilityTypesYml, this::createCapabilityType);
 
-        return eitherResult;
+    }
 
+    private Either<List<ImmutablePair<CapabilityTypeDefinition, Boolean>>, ResponseFormat> upsertCapabilityTypesByDao(List<CapabilityTypeDefinition> capabilityTypesToCreate) {
+        return commonImportManager.createElementTypesByDao(capabilityTypesToCreate,
+                capabilityType -> Either.left(ActionStatus.OK),
+                capabilityType -> new ImmutablePair<>(CommonImportManager.ElementTypeEnum.CAPABILITY_TYPE, capabilityType.getType()),
+                capabilityTypeOperation::getCapabilityType,
+                capabilityTypeOperation::addCapabilityType,
+                this::updateCapabilityType);
+    }
+    
+    private Either<CapabilityTypeDefinition, StorageOperationStatus> updateCapabilityType(CapabilityTypeDefinition newCapabilityType, CapabilityTypeDefinition oldCapabilityType) {
+        Either<CapabilityTypeDefinition, StorageOperationStatus> validationRes = capabilityTypeOperation.validateUpdateProperties(newCapabilityType);
+        if (validationRes.isRight()) {
+            log.error("#updateCapabilityType - One or all properties of capability type {} not valid. status is {}", newCapabilityType, validationRes.right().value());
+            return validationRes;
+        }
+        
+        if (TypeCompareUtils.isCapabilityTypesEquals(newCapabilityType, oldCapabilityType)) {
+            return TypeCompareUtils.typeAlreadyExists();
+        }
+        
+        return capabilityTypeOperation.updateCapabilityType(newCapabilityType, oldCapabilityType);
     }
 
     private CapabilityTypeDefinition createCapabilityType(String capabilityTypeName, Map<String, Object> toscaJson) {
@@ -107,13 +87,11 @@ public class CapabilityTypeImportManager {
         capabilityType.setType(capabilityTypeName);
 
         // Description
-        final Consumer<String> descriptionSetter = description -> capabilityType.setDescription(description);
-        commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DESCRIPTION.getElementName(), descriptionSetter);
+        commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DESCRIPTION.getElementName(), capabilityType::setDescription);
         // Derived From
-        final Consumer<String> derivedFromSetter = derivedFrom -> capabilityType.setDerivedFrom(derivedFrom);
-        commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DERIVED_FROM.getElementName(), derivedFromSetter);
+        commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DERIVED_FROM.getElementName(), capabilityType::setDerivedFrom);
         // Properties
-        commonImportManager.setPropertiesMap(toscaJson, (values) -> capabilityType.setProperties(values));
+        commonImportManager.setPropertiesMap(toscaJson, capabilityType::setProperties);
 
         return capabilityType;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java
index b4147b8fc5..05a0eb52ef 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CassandraHealthCheck.java
@@ -1,39 +1,30 @@
 package org.openecomp.sdc.be.components.impl;
 
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.annotation.PostConstruct;
-
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.KeyspaceMetadata;
+import com.datastax.driver.core.Metadata;
+import com.datastax.driver.core.Session;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.cassandra.schema.SdcSchemaUtils;
 import org.openecomp.sdc.be.dao.cassandra.schema.Table;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.KeyspaceMetadata;
-import com.datastax.driver.core.Metadata;
-import com.datastax.driver.core.Session;
+import javax.annotation.PostConstruct;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.*;
 
 @Component("cassandra-health-check")
 public class CassandraHealthCheck {
 
 
-    private static final Logger log = LoggerFactory.getLogger(CassandraHealthCheck.class);
+    private static final Logger log = Logger.getLogger(CassandraHealthCheck.class.getName());
 
     private String localDataCenterName = null;
 
-    private Set<String> sdcKeyspaces = new HashSet<String>();
+    private Set<String> sdcKeyspaces = new HashSet<>();
 
     private int HC_FormulaNumber;
 
@@ -92,7 +83,7 @@ public class CassandraHealthCheck {
 
             log.info("Cluster Metadata: {}", metadata);
             List<KeyspaceMetadata> keyspaces = metadata.getKeyspaces();
-            List<Integer> replactionFactorList = new ArrayList<Integer>();
+            List<Integer> replactionFactorList = new ArrayList<>();
 
             //Collect the keyspaces Replication Factor of current localDataCenter
             for (KeyspaceMetadata keyspace : keyspaces) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
index dc836611ff..0df7c7066d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
@@ -20,13 +20,7 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.api.CategoryTypeEnum;
 import org.openecomp.sdc.be.datamodel.utils.NodeTypeConvertUtils;
@@ -38,14 +32,14 @@ import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.Map.Entry;
 
 @Component("categoriesImportManager")
 public class CategoriesImportManager {
@@ -56,7 +50,7 @@ public class CategoriesImportManager {
     @javax.annotation.Resource
     private ComponentsUtils componentsUtils;
 
-    private static final Logger log = LoggerFactory.getLogger(CategoriesImportManager.class);
+    private static final Logger log = Logger.getLogger(CategoriesImportManager.class.getName());
 
     public Either<Map<String, List<CategoryDefinition>>, ResponseFormat> createCategories(String categoriesTypesYml) {
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CommonImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CommonImportManager.java
index 88e5853489..b60b5c7e09 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CommonImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CommonImportManager.java
@@ -20,60 +20,60 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
+import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.ImportUtils.ResultStatusEnum;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.components.impl.model.ToscaTypeImportData;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.ToscaTypeDataDefinition;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.GroupTypeDefinition;
-import org.openecomp.sdc.be.model.PolicyTypeDefinition;
-import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.normatives.ToscaTypeMetadata;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.api.TypeOperations;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toList;
 
 @Component("commonImportManager")
 public class CommonImportManager {
 
-    private static final Logger log = LoggerFactory.getLogger(CommonImportManager.class);
+    private static final Logger log = Logger.getLogger(CommonImportManager.class.getName());
 
-    @Resource
-    private ComponentsUtils componentsUtils;
-    @Resource
-    private PropertyOperation propertyOperation;
+    private final ComponentsUtils componentsUtils;
+    private final PropertyOperation propertyOperation;
 
-    protected void setProperties(Map<String, Object> toscaJson, Consumer<List<PropertyDefinition>> consumer) {
+    public CommonImportManager(ComponentsUtils componentsUtils, PropertyOperation propertyOperation) {
+        this.componentsUtils = componentsUtils;
+        this.propertyOperation = propertyOperation;
+    }
+
+    public static void setProperties(Map<String, Object> toscaJson, Consumer<List<PropertyDefinition>> consumer) {
         consumer.accept(getProperties(toscaJson));
     }
 
-    private List<PropertyDefinition> getProperties(Map<String, Object> toscaJson) {
+    private static List<PropertyDefinition> getProperties(Map<String, Object> toscaJson) {
         List<PropertyDefinition> values = null;
         Either<Map<String, PropertyDefinition>, ResultStatusEnum> properties = ImportUtils.getProperties(toscaJson);
 
         if (properties.isLeft()) {
             values = new ArrayList<>();
             Map<String, PropertyDefinition> propertiesMap = properties.left().value();
-            if (propertiesMap != null && propertiesMap.isEmpty() == false) {
+            if (propertiesMap != null && !propertiesMap.isEmpty()) {
 
                 for (Entry<String, PropertyDefinition> entry : propertiesMap.entrySet()) {
                     String propName = entry.getKey();
@@ -91,75 +91,104 @@ public class CommonImportManager {
     protected void setPropertiesMap(Map<String, Object> toscaJson, Consumer<Map<String, PropertyDefinition>> consumer) {
         final List<PropertyDefinition> properties = getProperties(toscaJson);
         if (properties != null) {
-            Map<String, PropertyDefinition> collect = properties.stream().collect(Collectors.toMap(e -> e.getName(), e -> e));
+            Map<String, PropertyDefinition> collect = properties.stream()
+                                                        .collect(Collectors.toMap(PropertyDefinition::getName, Function.identity()));
             consumer.accept(collect);
         }
-
     }
 
-    interface ICreateElementType<T1, T2, ElementType> {
-        ElementType createElement(T1 firstArg, T2 secondArg);
+    public interface ICreateElementType<T1, T2, T3> {
+        T3 createElement(T1 firstArg, T2 secondArg);
     }
 
-    protected <ElementDefinition> Either<List<ElementDefinition>, ActionStatus> createElementTypesFromYml(String elementTypesYml, ICreateElementType<String, Map<String, Object>, ElementDefinition> createApi) {
+    protected <T> Either<List<T>, ActionStatus> createElementTypesFromYml(String elementTypesYml, ICreateElementType<String, Map<String, Object>, T> createApi) {
 
-        List<ElementDefinition> elementTypes = new ArrayList<>();
-        try {
-            Map<String, Object> toscaJson = (Map<String, Object>) new Yaml().load(elementTypesYml);
+        List<T> elementTypes;
+        Map<String, Object> toscaJson = convertToFieldMap(elementTypesYml);
+        if (toscaJson==null) {
+            return Either.right(ActionStatus.INVALID_YAML_FILE);
+        }
+        elementTypes = createElementTypesFromToscaJsonMap(createApi, toscaJson);
+        return Either.left(elementTypes);
+    }
 
-            elementTypes = createElementTypesFromToscaJsonMap(createApi, toscaJson);
+    @SuppressWarnings("unchecked")
+    private Map<String, Object> convertToFieldMap(String elementTypesYml) {
+        Map<String, Object> toscaJson = null;
+        try {
+            toscaJson = (Map<String, Object>) new Yaml().load(elementTypesYml);
         } catch (Exception e) {
             log.debug("Failed to yaml file {}", elementTypesYml, e);
-            return Either.right(ActionStatus.INVALID_YAML_FILE);
         }
-        return Either.left(elementTypes);
+        return toscaJson;
+    }
+
+
+    protected <T extends ToscaDataDefinition> List<T> createTypesFromToscaJsonMap(
+            BiFunction<String, Map<String, Object>, T> createApi, Map<String, Object> toscaJson) {
+        List<T> elementTypes = new ArrayList<>();
+
+        for (Entry<String, Object> elementTypeNameDataEntry : toscaJson.entrySet()) {
+            String elementTypeName = elementTypeNameDataEntry.getKey();
+            Map<String, Object> elementTypeJsonData = (Map<String, Object>) elementTypeNameDataEntry.getValue();
+            T elementDefinition = createApi.apply(elementTypeName, elementTypeJsonData);
+            elementTypes.add(elementDefinition);
+        }
+        return elementTypes;
     }
 
-        /**
-         * @param createApi * @param createApi
-         * @param elementTypes
-         * @param toscaJson
-         */
-    protected <ElementDefinition> List<ElementDefinition> createElementTypesFromToscaJsonMap(
-                ICreateElementType<String, Map<String, Object>, ElementDefinition> createApi, Map<String, Object> toscaJson) {
-        List<ElementDefinition> elementTypes = new ArrayList<>();
+    protected <T> List<T> createElementTypesFromToscaJsonMap(
+                ICreateElementType<String, Map<String, Object>, T> createApi, Map<String, Object> toscaJson) {
+        List<T> elementTypes = new ArrayList<>();
+
+        for (Entry<String, Object> elementTypeNameDataEntry : toscaJson.entrySet()) {
+            String elementTypeName = elementTypeNameDataEntry.getKey();
+            Map<String, Object> elementTypeJsonData = (Map<String, Object>) elementTypeNameDataEntry.getValue();
+            T elementDefinition = createApi.createElement(elementTypeName, elementTypeJsonData);
+            elementTypes.add(elementDefinition);
+        }
+        return elementTypes;
+    }
+
+    protected <T> Map<String, T> createElementTypesMapFromToscaJsonMap(
+                ICreateElementType<String, Map<String, Object>, T> createApi, Map<String, Object> toscaJson) {
+        Map<String, T> elementTypesMap = new HashMap<>();
         
         Iterator<Entry<String, Object>> elementTypesEntryItr = toscaJson.entrySet().iterator();
         while (elementTypesEntryItr.hasNext()) {
             Entry<String, Object> elementTypeNameDataEntry = elementTypesEntryItr.next();
             String elementTypeName = elementTypeNameDataEntry.getKey();
             Map<String, Object> elementTypeJsonData = (Map<String, Object>) elementTypeNameDataEntry.getValue();
-            ElementDefinition elementDefinition = createApi.createElement(elementTypeName, elementTypeJsonData);
-            elementTypes.add(elementDefinition);
+            T elementDefinition = createApi.createElement(elementTypeName, elementTypeJsonData);
+            elementTypesMap.put(elementTypeName, elementDefinition);
         }
-        return elementTypes;
+        return elementTypesMap;
     }
 
-    protected <FieldType> void setField(Map<String, Object> toscaJson, String fieldName, Consumer<FieldType> setter) {
+    protected <F> void setField(Map<String, Object> toscaJson, String fieldName, Consumer<F> setter) {
         if (toscaJson.containsKey(fieldName)) {
-            FieldType fieldValue = (FieldType) toscaJson.get(fieldName);
+            F fieldValue = (F) toscaJson.get(fieldName);
             setter.accept(fieldValue);
         }
-
     }
 
     public enum ElementTypeEnum {
-        PolicyType, GroupType, DataType, CapabilityType, InterfaceLifecycleType
-    };
+        POLICY_TYPE, GROUP_TYPE, DATA_TYPE, CAPABILITY_TYPE, INTERFACE_LIFECYCLE_TYPE
+    }
 
     private ActionStatus convertFromStorageResponseForElementType(StorageOperationStatus status, ElementTypeEnum elementTypeEnum) {
         ActionStatus ret;
         switch (elementTypeEnum) {
-        case GroupType:
+        case GROUP_TYPE:
             ret = componentsUtils.convertFromStorageResponseForGroupType(status);
             break;
-        case DataType:
+        case DATA_TYPE:
             ret = componentsUtils.convertFromStorageResponseForDataType(status);
             break;
-        case CapabilityType:
+        case CAPABILITY_TYPE:
             ret = componentsUtils.convertFromStorageResponseForCapabilityType(status);
             break;
-        case InterfaceLifecycleType:
+        case INTERFACE_LIFECYCLE_TYPE:
             ret = componentsUtils.convertFromStorageResponseForLifecycleType(status);
             break;
         default:
@@ -169,19 +198,19 @@ public class CommonImportManager {
         return ret;
     }
 
-    private <ElementTypeDefinition> ResponseFormat getResponseFormatForElementType(ActionStatus actionStatus, ElementTypeEnum elementTypeEnum, ElementTypeDefinition elementTypeDefinition) {
+    private <T> ResponseFormat getResponseFormatForElementType(ActionStatus actionStatus, ElementTypeEnum elementTypeEnum, T elementTypeDefinition) {
         ResponseFormat ret;
         switch (elementTypeEnum) {
-        case GroupType:
+        case GROUP_TYPE:
             ret = componentsUtils.getResponseFormatByGroupType(actionStatus, (GroupTypeDefinition) elementTypeDefinition);
             break;
-        case PolicyType:
+        case POLICY_TYPE:
             ret = componentsUtils.getResponseFormatByPolicyType(actionStatus, (PolicyTypeDefinition) elementTypeDefinition);
             break;
-        case DataType:
+        case DATA_TYPE:
             ret = componentsUtils.getResponseFormatByDataType(actionStatus, (DataTypeDefinition) elementTypeDefinition, null);
             break;
-        case CapabilityType:
+        case CAPABILITY_TYPE:
             ret = componentsUtils.getResponseFormatByCapabilityType(actionStatus, (CapabilityTypeDefinition) elementTypeDefinition);
             break;
 
@@ -192,122 +221,209 @@ public class CommonImportManager {
         return ret;
     }
 
-    protected <ElementTypeDefinition> Either<List<ImmutablePair<ElementTypeDefinition, Boolean>>, ResponseFormat> createElementTypesByDao(List<ElementTypeDefinition> elementTypesToCreate,
-            Function<ElementTypeDefinition, Either<ActionStatus, ResponseFormat>> validator, Function<ElementTypeDefinition, ImmutablePair<ElementTypeEnum, String>> elementInfoGetter,
-            Function<String, Either<ElementTypeDefinition, StorageOperationStatus>> elementFetcher, Function<ElementTypeDefinition, Either<ElementTypeDefinition, StorageOperationStatus>> elementAdder,
-            BiFunction<ElementTypeDefinition, ElementTypeDefinition, Either<ElementTypeDefinition, StorageOperationStatus>> elementUpgrader) {
+    private <T extends ToscaDataDefinition> List<ImmutablePair<T, Boolean>> createTypesByDao(List<T> elementTypesToCreate,
+                                                                                             TypeOperations<T> typeOperations) {
+        List<ImmutablePair<T, Boolean>> createdElementTypes = new ArrayList<>();
+        for (T newTypeDefinition : elementTypesToCreate) {
+            try {
+                String typeName = newTypeDefinition.getType();
+                T existingDefinition = typeOperations.getLatestType(typeName);
+                if (existingDefinition == null /*new type*/) {
+                    typeOperations.addType(newTypeDefinition);
+                } else {
+                    if (typeOperations.isSameType(newTypeDefinition, existingDefinition)) {
+                        propertyOperation.getTitanGenericDao().rollback();
+                        createdElementTypes.add(new ImmutablePair<>(newTypeDefinition, null));
+                        continue;
+                    } else {
+                        typeOperations.updateType(existingDefinition, newTypeDefinition);
+                    }
+                }
+                propertyOperation.getTitanGenericDao().commit();
+                createdElementTypes.add(new ImmutablePair<>(newTypeDefinition, true));
+            } catch (Exception e) {
+                propertyOperation.getTitanGenericDao().rollback();
+                createdElementTypes.add(new ImmutablePair<>(newTypeDefinition, false));
+            }
 
-        List<ImmutablePair<ElementTypeDefinition, Boolean>> createdElementTypes = new ArrayList<>();
+        }
+        return createdElementTypes;
+    }
+    
+    protected <T> Either<List<ImmutablePair<T, Boolean>>, ResponseFormat> createElementTypesByDao(List<T> elementTypesToCreate,
+            Function<T, Either<ActionStatus, ResponseFormat>> validator, Function<T, ImmutablePair<ElementTypeEnum, String>> elementInfoGetter,
+            Function<String, Either<T, StorageOperationStatus>> elementFetcher, Function<T, Either<T, StorageOperationStatus>> elementAdder,
+            BiFunction<T, T, Either<T, StorageOperationStatus>> elementUpgrader) {
 
-        Either<List<ImmutablePair<ElementTypeDefinition, Boolean>>, ResponseFormat> eitherResult = Either.left(createdElementTypes);
+        List<ImmutablePair<T, Boolean>> createdElementTypes = new ArrayList<>();
 
-        Iterator<ElementTypeDefinition> elementTypeItr = elementTypesToCreate.iterator();
+        Either<List<ImmutablePair<T, Boolean>>, ResponseFormat> eitherResult = Either.left(createdElementTypes);
+        Iterator<T> elementTypeItr = elementTypesToCreate.iterator();
 
         try {
-
             while (elementTypeItr.hasNext()) {
-                ElementTypeDefinition elementType = elementTypeItr.next();
-                final ImmutablePair<ElementTypeEnum, String> elementInfo = elementInfoGetter.apply(elementType);
-                ElementTypeEnum elementTypeEnum = elementInfo.left;
-                String elementName = elementInfo.right;
-
-                Either<ActionStatus, ResponseFormat> validateElementType = validator.apply(elementType);
-                if (validateElementType.isRight()) {
-                    ResponseFormat responseFormat = validateElementType.right().value();
-                    log.debug("Failed in validation of element type: {}. Response is {}", elementType, responseFormat.getFormattedMessage());
-                    eitherResult = Either.right(responseFormat);
+                T elementType = elementTypeItr.next();
+                eitherResult = handleType(elementType, validator, elementInfoGetter, elementFetcher, elementAdder, elementUpgrader)
+                                            .left()
+                                            .map(elem -> append(createdElementTypes, elem));
+                
+                if (eitherResult.isRight()) {
                     break;
                 }
+                
+                if(!elementTypeItr.hasNext()) {
+                    log.info("all {} were created successfully!!!", elementType);
+                }
+            }
+        }
+        catch(Exception e) {
+            eitherResult = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+            throw e;
+        } 
+        finally {
+            if (eitherResult.isLeft()) {
+                propertyOperation.getTitanGenericDao().commit();
+            }
+            else {
+                propertyOperation.getTitanGenericDao().rollback();
+            }
+        }
 
-                log.info("send {} : {} to dao for create", elementTypeEnum, elementName);
-
-                Either<ElementTypeDefinition, StorageOperationStatus> findElementType = elementFetcher.apply(elementName);
-                if (findElementType.isRight()) {
-                    StorageOperationStatus status = findElementType.right().value();
-                    log.debug("searched {} finished with result:{}", elementTypeEnum, status.name());
-                    if (status != StorageOperationStatus.NOT_FOUND) {
-                        ResponseFormat responseFormat = getResponseFormatForElementType(convertFromStorageResponseForElementType(status, elementTypeEnum), elementTypeEnum, elementType);
-                        eitherResult = Either.right(responseFormat);
-                        break;
-                    } else {
-                        Either<ElementTypeDefinition, StorageOperationStatus> dataModelResponse = elementAdder.apply(elementType);
-
-                        if (dataModelResponse.isRight()) {
-                            try {
-                                BeEcompErrorManager.getInstance().logBeFailedAddingNodeTypeError("Create {}", elementTypeEnum.name());
-                                log.debug("failed to create {}: {}", elementTypeEnum, elementName);
-                                if (dataModelResponse.right().value() != StorageOperationStatus.SCHEMA_VIOLATION) {
-                                    ResponseFormat responseFormat = getResponseFormatForElementType(convertFromStorageResponseForElementType(dataModelResponse.right().value(), elementTypeEnum), elementTypeEnum, elementType);
-
-                                    eitherResult = Either.right(responseFormat);
-                                    break;
-                                } else {
-                                    createdElementTypes.add(new ImmutablePair<ElementTypeDefinition, Boolean>(elementType, false));
-                                }
-                            } finally {
-                                propertyOperation.getTitanGenericDao().rollback();
-                            }
-                        } else {
-                            propertyOperation.getTitanGenericDao().commit();
-                            createdElementTypes.add(new ImmutablePair<ElementTypeDefinition, Boolean>(elementType, true));
-                            log.debug("{} : {}  was created successfully.", elementTypeEnum, elementName);
-                        }
-                        if (!elementTypeItr.hasNext()) {
-                            log.info("all {} were created successfully!!!", elementTypeEnum);
-                        }
+        return eitherResult;
+    }
+    
+    private static <T> List<T> append(List<T> list, T value) {
+        list.add(value);
+        return list;
+    }
+    
+    
+    private <T> Either<ImmutablePair<T, Boolean>, ResponseFormat> handleType(T elementType, 
+            Function<T, Either<ActionStatus, ResponseFormat>> validator, Function<T, ImmutablePair<ElementTypeEnum, String>> elementInfoGetter,
+            Function<String, Either<T, StorageOperationStatus>> elementFetcher, Function<T, Either<T, StorageOperationStatus>> elementAdder,
+            BiFunction<T, T, Either<T, StorageOperationStatus>> elementUpgrader) {
+        
+        final ImmutablePair<ElementTypeEnum, String> elementInfo = elementInfoGetter.apply(elementType);
+        ElementTypeEnum elementTypeEnum = elementInfo.left;
+        String elementName = elementInfo.right;
+        
+        Either<ActionStatus, ResponseFormat> validateElementType = validator.apply(elementType);
+        if (validateElementType.isRight()) {
+            ResponseFormat responseFormat = validateElementType.right().value();
+            log.debug("Failed in validation of element type: {}. Response is {}", elementType, responseFormat.getFormattedMessage());
+            return Either.right(responseFormat);
+        }
 
-                    }
-                } else {
+        log.info("send {} : {} to dao for create", elementTypeEnum, elementName);
+
+        Either<T, StorageOperationStatus> findElementType = elementFetcher.apply(elementName);
+        if (findElementType.isRight()) {
+            StorageOperationStatus status = findElementType.right().value();
+            log.debug("searched {} finished with result:{}", elementTypeEnum, status);
+            if (status != StorageOperationStatus.NOT_FOUND) {
+                ResponseFormat responseFormat = getResponseFormatForElementType(convertFromStorageResponseForElementType(status, elementTypeEnum), elementTypeEnum, elementType);
+                return Either.right(responseFormat);
+            } else {
+                return addElementType(elementType, elementAdder, elementTypeEnum, elementName);
+            }
+        } else {
 
-                    if (elementUpgrader != null) {
-                        Either<ElementTypeDefinition, StorageOperationStatus> upgradeResponse = null;
-                        try {
-                            upgradeResponse = elementUpgrader.apply(elementType, findElementType.left().value());
-                            if (upgradeResponse.isRight()) {
-                                StorageOperationStatus status = upgradeResponse.right().value();
-                                if (status == StorageOperationStatus.OK) {
-                                    createdElementTypes.add(new ImmutablePair<ElementTypeDefinition, Boolean>(elementType, false));
-                                } else {
-                                    ResponseFormat responseFormat = getResponseFormatForElementType(convertFromStorageResponseForElementType(upgradeResponse.right().value(), elementTypeEnum), elementTypeEnum, elementType);
-                                    eitherResult = Either.right(responseFormat);
-                                    break;
-                                }
-                            } else {
-                                log.debug("{} : {}  was upgraded successfully.", elementTypeEnum, elementName);
-                                createdElementTypes.add(new ImmutablePair<ElementTypeDefinition, Boolean>(elementType, true));
-                            }
-                        } finally {
-                            if (upgradeResponse == null || upgradeResponse.isRight()) {
-                                propertyOperation.getTitanGenericDao().rollback();
-                            } else {
-                                propertyOperation.getTitanGenericDao().commit();
-                            }
-                        }
+            if (elementUpgrader != null) {
+                return updateElementType(elementType, elementUpgrader, elementTypeEnum, elementName, findElementType.left().value());
 
-                    } else {
-                        // mshitrit Once GroupType Versions are supported add
-                        // code here
-                        createdElementTypes.add(new ImmutablePair<ElementTypeDefinition, Boolean>(elementType, false));
-                        log.debug("{} : {} already exists.", elementTypeEnum, elementName);
-                    }
+            } else {
+                // mshitrit Once GroupType Versions are supported add
+                // code here
+                log.debug("{} : {} already exists.", elementTypeEnum, elementName);
+                return Either.left(new ImmutablePair<>(elementType, false));
+            }
 
-                }
+        }
+    }
 
+    private <T> Either<ImmutablePair<T, Boolean>, ResponseFormat> addElementType(T elementType, Function<T, Either<T, StorageOperationStatus>> elementAdder, ElementTypeEnum elementTypeEnum, String elementName) {
+        Either<T, StorageOperationStatus> dataModelResponse = elementAdder.apply(elementType);
+        
+        if (dataModelResponse.isRight()) {
+            BeEcompErrorManager.getInstance().logBeFailedAddingNodeTypeError("Create {}", elementTypeEnum.name());
+            log.debug("failed to create {}: {}", elementTypeEnum, elementName);
+            if (dataModelResponse.right().value() != StorageOperationStatus.OK) {
+                ResponseFormat responseFormat = getResponseFormatForElementType(convertFromStorageResponseForElementType(dataModelResponse.right().value(), elementTypeEnum), elementTypeEnum, elementType);
+                
+                return Either.right(responseFormat);
+            } else {
+                return Either.left(new ImmutablePair<>(elementType, false));
             }
-        } finally {
-            if (eitherResult.isRight()) {
-                propertyOperation.getTitanGenericDao().rollback();
+        } else {
+            log.debug("{} : {}  was created successfully.", elementTypeEnum, elementName);
+            return Either.left(new ImmutablePair<>(elementType, true));
+        }
+    }
+    
+    
+    private <T> Either<ImmutablePair<T, Boolean>, ResponseFormat> updateElementType(T elementType, BiFunction<T, T, Either<T, StorageOperationStatus>> elementUpgrader, 
+                                                        ElementTypeEnum elementTypeEnum, String elementName, T existingElementType) {
+        Either<T, StorageOperationStatus> upgradeResponse = elementUpgrader.apply(elementType, existingElementType);
+        if (upgradeResponse.isRight()) {
+            StorageOperationStatus status = upgradeResponse.right().value();
+            if (status == StorageOperationStatus.OK) {
+                return Either.left(new ImmutablePair<>(elementType, false));
+            } else {
+                ResponseFormat responseFormat = getResponseFormatForElementType(convertFromStorageResponseForElementType(upgradeResponse.right().value(), elementTypeEnum), elementTypeEnum, elementType);
+                return Either.right(responseFormat);
             }
+        } else {
+            log.debug("{} : {}  was upgraded successfully.", elementTypeEnum, elementName);
+            return Either.left(new ImmutablePair<>(elementType, true));
         }
+    }
 
-        return eitherResult;
+    
+    public <T extends ToscaTypeDataDefinition> Either<List<ImmutablePair<T, Boolean>>, ResponseFormat> createElementTypes(ToscaTypeImportData toscaTypeImportData, Function<String, Either<List<T>, ActionStatus>> elementTypeFromYmlCreater,
+                                                                                                                          Function<List<T>, Either<List<ImmutablePair<T, Boolean>>, ResponseFormat>> elementTypeDaoCreater) {
+        Either<List<T>, ActionStatus> elementTypes = elementTypeFromYmlCreater.apply(toscaTypeImportData.getToscaTypesYml());
+        return elementTypes
+                .right()
+                .map(err -> componentsUtils.getResponseFormat(err, ""))
+                .left()
+                .map(toscaTypes -> enrichTypesWithNonToscaMetadata(toscaTypes, toscaTypeImportData.getToscaTypeMetadata()))
+                .left()
+                .bind(elementTypeDaoCreater::apply);
+    }
 
+    public <T extends ToscaDataDefinition> List<ImmutablePair<T, Boolean>> createElementTypes(String toscaTypesYml,
+                                                                                              BiFunction<String, Map<String, Object>, T> createApi,
+                                                                                              TypeOperations<T> typeOperations) {
+        Map<String, Object> fieldMap = convertToFieldMap(toscaTypesYml);
+        if (fieldMap==null) {
+            throw new ComponentException(ActionStatus.INVALID_YAML_FILE);
+        }
+        List<T> elementTypes = createTypesFromToscaJsonMap(createApi, fieldMap);
+        return createTypesByDao(elementTypes, typeOperations);
+    }
+
+    private <T extends ToscaTypeDataDefinition> List<T> enrichTypesWithNonToscaMetadata(List<T> toscaTypes, Map<String, ToscaTypeMetadata> toscaTypeMetadata) {
+        return toscaTypes.stream()
+                  .map(toscaType -> setNonToscaMetaDataOnType(toscaTypeMetadata, toscaType))
+                  .collect(toList());
+    }
+
+    private <T extends ToscaTypeDataDefinition> T setNonToscaMetaDataOnType(Map<String, ToscaTypeMetadata> toscaTypeMetadata, T toscaTypeDefinition) {
+        String toscaType = toscaTypeDefinition.getType();
+        ToscaTypeMetadata typeMetaData = toscaTypeMetadata.get(toscaType);
+        if (typeMetaData == null) {
+            log.debug("failing while trying to associate metadata for type {}. type not exist", toscaType);
+            throw new ComponentException(ActionStatus.GENERAL_ERROR);
+        }
+        toscaTypeDefinition.setIcon(typeMetaData.getIcon());
+        toscaTypeDefinition.setName(typeMetaData.getDisplayName());
+        return toscaTypeDefinition;
     }
 
-    public <ElementTypeDefinition> Either<List<ImmutablePair<ElementTypeDefinition, Boolean>>, ResponseFormat> createElementTypes(String elementTypesYml, Function<String, Either<List<ElementTypeDefinition>, ActionStatus>> elementTypeFromYmlCreater,
-            Function<List<ElementTypeDefinition>, Either<List<ImmutablePair<ElementTypeDefinition, Boolean>>, ResponseFormat>> elementTypeDaoCreater, ElementTypeEnum elementTypeEnum) {
+    public <T> Either<List<ImmutablePair<T, Boolean>>, ResponseFormat> createElementTypes(String elementTypesYml, Function<String, Either<List<T>, ActionStatus>> elementTypeFromYmlCreater,
+            Function<List<T>, Either<List<ImmutablePair<T, Boolean>>, ResponseFormat>> elementTypeDaoCreater, ElementTypeEnum elementTypeEnum) {
 
-        Either<List<ElementTypeDefinition>, ActionStatus> elementTypes = elementTypeFromYmlCreater.apply(elementTypesYml);
+        Either<List<T>, ActionStatus> elementTypes = elementTypeFromYmlCreater.apply(elementTypesYml);
         if (elementTypes.isRight()) {
             ActionStatus status = elementTypes.right().value();
             ResponseFormat responseFormat = getResponseFormatForElementType(status, elementTypeEnum, null);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
index deb6c3de2f..6b17d1c8e9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogic.java
@@ -20,17 +20,11 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.impl.generic.GenericTypeBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.ConfigurationManager;
@@ -40,46 +34,32 @@ import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.datamodel.api.HighestFilterEnum;
 import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum;
-import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.*;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.CapReqDef;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.IComponentInstanceConnectedElement;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.cache.ComponentCache;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.resources.data.ComponentMetadataData;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.utils.CommonBeUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
 
@@ -96,7 +76,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         this.genericTypeBusinessLogic = genericTypeBusinessLogic;
     }
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ComponentBusinessLogic.class.getName());
 
     private static final String TAG_FIELD_LABEL = "tag";
 
@@ -104,7 +84,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
 
     public abstract ComponentInstanceBusinessLogic getComponentInstanceBL();
 
-    public abstract Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(String componentId, ComponentTypeEnum componentTypeEnum, String userId, String searchText);
+    public abstract Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(String componentId, String userId);
 
     /**
      *
@@ -114,31 +94,32 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
      */
     public abstract  Either<UiComponentDataTransfer, ResponseFormat> getUiComponentDataTransferByComponentId(String componentId, List<String> dataParamsToReturn);
 
-    protected Either<User, ResponseFormat> validateUser(User user, String ecompErrorContext, Component component, AuditingActionEnum auditAction, boolean inTransaction) {
-        Either<User, ResponseFormat> userValidationResult = validateUserNotEmpty(user, ecompErrorContext);
+    protected User validateUser(User user, String ecompErrorContext, Component component, AuditingActionEnum auditAction, boolean inTransaction) {
+        User validatedUser;
         ResponseFormat responseFormat;
-        if (userValidationResult.isRight()) {
-            user.setUserId("UNKNOWN");
-            responseFormat = userValidationResult.right().value();
-            componentsUtils.auditComponentAdmin(responseFormat, user, component, auditAction, component.getComponentType());
-            return Either.right(responseFormat);
-        }
-        Either<User, ResponseFormat> userResult = validateUserExists(user, ecompErrorContext, inTransaction);
-        if (userResult.isRight()) {
-            responseFormat = userResult.right().value();
+        try{
+            validateUserNotEmpty(user, ecompErrorContext);
+            validatedUser = validateUserExists(user, ecompErrorContext, inTransaction);
+        } catch(ComponentException e){
+            if(e.getActionStatus()== ActionStatus.MISSING_INFORMATION){
+                user.setUserId("UNKNOWN");
+            }
+            responseFormat = e.getResponseFormat() != null ? e.getResponseFormat()
+                    : componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
             componentsUtils.auditComponentAdmin(responseFormat, user, component, auditAction, component.getComponentType());
-            return Either.right(responseFormat);
+            throw e;
         }
-        return userResult;
+        return validatedUser;
     }
 
-    protected Either<Boolean, ResponseFormat> validateUserRole(User user, Component component, List<Role> roles, AuditingActionEnum auditAction, String comment) {
+    protected void validateUserRole(User user, Component component, List<Role> roles, AuditingActionEnum auditAction, String comment) {
         if (roles != null && roles.isEmpty()) {
             roles.add(Role.ADMIN);
             roles.add(Role.DESIGNER);
         }
-        Either<Boolean, ResponseFormat> validationResult = validateUserRole(user, roles);
-        if (validationResult.isRight()) {
+        try{
+            validateUserRole(user, roles);
+        } catch(ComponentException e){
             String commentStr = null;
             String distrStatus = null;
             ComponentTypeEnum componentType = component.getComponentType();
@@ -146,80 +127,78 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
                 distrStatus = ((ServiceMetadataDataDefinition) component.getComponentMetadataDefinition().getMetadataDataDefinition()).getDistributionStatus();
                 commentStr = comment;
             }
-            componentsUtils.auditComponent(validationResult.right().value(), user, component, auditAction, componentType,
-                    ResourceAuditData.newBuilder().distributionStatus(distrStatus).build(),
-                    ResourceAuditData.newBuilder().distributionStatus(distrStatus).build(),
-                    null, commentStr, null, null);
-
-
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat()
+                    : componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
+            componentsUtils.auditComponent(responseFormat, user, component, auditAction, new ResourceCommonInfo(componentType.getValue()),
+                    ResourceVersionInfo.newBuilder().distributionStatus(distrStatus).build(),
+                    ResourceVersionInfo.newBuilder().distributionStatus(distrStatus).build(),
+                    commentStr, null, null);
+            throw e;
         }
-        return validationResult;
     }
 
-    protected Either<Boolean, ResponseFormat> validateComponentName(User user, Component component, AuditingActionEnum actionEnum) {
+    protected void validateComponentName(User user, Component component, AuditingActionEnum actionEnum) {
         ComponentTypeEnum type = component.getComponentType();
         String componentName = component.getName();
         if (!ValidationUtils.validateStringNotEmpty(componentName)) {
             log.debug("component name is empty");
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.MISSING_COMPONENT_NAME, type.getValue());
             componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, type);
-            return Either.right(errorResponse);
+            throw new ComponentException(ActionStatus.MISSING_COMPONENT_NAME, type.getValue());
         }
 
         if (!ValidationUtils.validateComponentNameLength(componentName)) {
             log.debug("Component name exceeds max length {} ", ValidationUtils.COMPONENT_NAME_MAX_LENGTH);
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NAME_EXCEEDS_LIMIT, type.getValue(), "" + ValidationUtils.COMPONENT_NAME_MAX_LENGTH);
             componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, type);
-            return Either.right(errorResponse);
+            throw new ComponentException(ActionStatus.COMPONENT_NAME_EXCEEDS_LIMIT,type.getValue(), "" + ValidationUtils.COMPONENT_NAME_MAX_LENGTH);
         }
 
         if (!validateTagPattern(componentName)) {
             log.debug("Component name {} has invalid format", componentName);
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_COMPONENT_NAME, type.getValue());
             componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, type);
-            return Either.right(errorResponse);
+            throw new ComponentException(ActionStatus.INVALID_COMPONENT_NAME, type.getValue());
         }
         component.setNormalizedName(ValidationUtils.normaliseComponentName(componentName));
         component.setSystemName(ValidationUtils.convertToSystemName(componentName));
-
-        return Either.left(true);
     }
 
-    protected Either<Boolean, ResponseFormat> validateDescriptionAndCleanup(User user, Component component, AuditingActionEnum actionEnum) {
+    protected void validateDescriptionAndCleanup(User user, Component component, AuditingActionEnum actionEnum) {
         ComponentTypeEnum type = component.getComponentType();
         String description = component.getDescription();
         if (!ValidationUtils.validateStringNotEmpty(description)) {
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_DESCRIPTION, type.getValue());
             componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, type);
-            return Either.right(errorResponse);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_DESCRIPTION, type.getValue());
         }
 
         description = cleanUpText(description);
-        Either<Boolean, ResponseFormat> validatDescription = validateComponentDescription(description, type);
-        if (validatDescription.isRight()) {
-            ResponseFormat responseFormat = validatDescription.right().value();
+        try{
+            validateComponentDescription(description, type);
+        } catch(ComponentException e){
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat()
+                    : componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
             componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, type);
-            return Either.right(responseFormat);
+            throw e;
         }
         component.setDescription(description);
-        return Either.left(true);
     }
 
-    public Either<Boolean, ResponseFormat> validateComponentDescription(String description, ComponentTypeEnum type) {
+    private void validateComponentDescription(String description, ComponentTypeEnum type) {
         if (description != null) {
             if (!ValidationUtils.validateDescriptionLength(description)) {
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_DESCRIPTION_EXCEEDS_LIMIT, type.getValue(), "" + ValidationUtils.COMPONENT_DESCRIPTION_MAX_LENGTH));
+                throw new ComponentException(ActionStatus.COMPONENT_DESCRIPTION_EXCEEDS_LIMIT, type.getValue(), "" + ValidationUtils.COMPONENT_DESCRIPTION_MAX_LENGTH);
             }
 
             if (!ValidationUtils.validateIsEnglish(description)) {
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_DESCRIPTION, type.getValue()));
+                throw new ComponentException(ActionStatus.COMPONENT_INVALID_DESCRIPTION, type.getValue());
             }
-            return Either.left(true);
         }
-        return Either.left(false);
     }
 
     protected Either<Boolean, ResponseFormat> validateComponentNameUnique(User user, Component component, AuditingActionEnum actionEnum) {
+        log.debug("validate component name uniqueness for: {}", component.getName());
         ComponentTypeEnum type = component.getComponentType();
         ResourceTypeEnum resourceType = null;
         if(component instanceof Resource){
@@ -244,7 +223,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         return Either.right(errorResponse);
     }
 
-    protected Either<Boolean, ResponseFormat> validateContactId(User user, Component component, AuditingActionEnum actionEnum) {
+    protected void validateContactId(User user, Component component, AuditingActionEnum actionEnum) {
         log.debug("validate component contactId");
         ComponentTypeEnum type = component.getComponentType();
         String contactId = component.getContactId();
@@ -253,27 +232,18 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
             log.info("contact is missing.");
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_CONTACT, type.getValue());
             componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, type);
-            return Either.right(errorResponse);
-        }
-
-        Either<Boolean, ResponseFormat> validateContactIdResponse = validateContactId(contactId, type);
-        if (validateContactIdResponse.isRight()) {
-            ResponseFormat responseFormat = validateContactIdResponse.right().value();
-            componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, type);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_CONTACT, type.getValue());
         }
-        return validateContactIdResponse;
+       validateContactId(contactId, user, component, actionEnum, type);
     }
 
-    private Either<Boolean, ResponseFormat> validateContactId(String contactId, ComponentTypeEnum type) {
-        if (contactId != null) {
-            if (!ValidationUtils.validateContactId(contactId)) {
-                log.info("contact is invalid.");
-                ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_CONTACT, type.getValue());
-                return Either.right(errorResponse);
-            }
-            return Either.left(true);
+    private void validateContactId(String contactId, User user, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum type) {
+        if (contactId != null && !ValidationUtils.validateContactId(contactId)) {
+            log.info("contact is invalid.");
+            ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_CONTACT, type.getValue());
+            componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, type);
+            throw new ComponentException(ActionStatus.COMPONENT_INVALID_CONTACT, type.getValue());
         }
-        return Either.left(false);
     }
 
 
@@ -286,11 +256,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
             return Either.right(errorResponse);
         }
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "validateConformanceLevel", false);
-        if (resp.isRight()) {
-            log.error("can't validate conformance level, user is not validated, uuid {}, userId {}", componentUuid, userId);
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "validateConformanceLevel", false);
 
         Either<ComponentMetadataData, StorageOperationStatus> eitherComponent = toscaOperationFacade.getLatestComponentMetadataByUuid(componentUuid, JsonParseFlagEnum.ParseMetadata, null);
         if (eitherComponent.isRight()) {
@@ -321,7 +287,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         return Either.left(result);
     }
 
-    protected Either<Boolean, ResponseFormat> validateIcon(User user, Component component, AuditingActionEnum actionEnum) {
+    protected void validateIcon(User user, Component component, AuditingActionEnum actionEnum) {
         log.debug("validate Icon");
         ComponentTypeEnum type = component.getComponentType();
         String icon = component.getIcon();
@@ -329,56 +295,57 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
             log.info("icon is missing.");
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_ICON, type.getValue());
             componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, type);
-            return Either.right(errorResponse);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_ICON, type.getValue());
         }
-
-        Either<Boolean, ResponseFormat> validateIcon = validateIcon(icon, type);
-        if (validateIcon.isRight()) {
-            ResponseFormat responseFormat = validateIcon.right().value();
+        try {
+            validateIcon(icon, type);
+        } catch(ComponentException e){
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat()
+                    : componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
             componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, type);
+            throw e;
         }
-        return validateIcon;
     }
 
-    private Either<Boolean, ResponseFormat> validateIcon(String icon, ComponentTypeEnum type) {
+    private void validateIcon(String icon, ComponentTypeEnum type) {
         if (icon != null) {
             if (!ValidationUtils.validateIconLength(icon)) {
                 log.debug("icon exceeds max length");
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_ICON_EXCEEDS_LIMIT, type.getValue(), "" + ValidationUtils.ICON_MAX_LENGTH));
+                throw new ComponentException(ActionStatus.COMPONENT_ICON_EXCEEDS_LIMIT, type.getValue(), "" + ValidationUtils.ICON_MAX_LENGTH);
             }
 
             if (!ValidationUtils.validateIcon(icon)) {
                 log.info("icon is invalid.");
-                ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_ICON, type.getValue());
-                return Either.right(errorResponse);
+                throw new ComponentException(ActionStatus.COMPONENT_INVALID_ICON, type.getValue());
             }
-            return Either.left(true);
         }
-        return Either.left(false);
     }
 
-    protected Either<Boolean, ResponseFormat> validateTagsListAndRemoveDuplicates(User user, Component component, AuditingActionEnum actionEnum) {
+    protected void validateTagsListAndRemoveDuplicates(User user, Component component, AuditingActionEnum actionEnum) {
         List<String> tagsList = component.getTags();
-
-        Either<Boolean, ResponseFormat> validateTags = validateComponentTags(tagsList, component.getName(), component.getComponentType());
-        if (validateTags.isRight()) {
-            ResponseFormat responseFormat = validateTags.right().value();
+        try {
+            validateComponentTags(tagsList, component.getName(), component.getComponentType(), user, component, actionEnum);
+        } catch(ComponentException e){
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat()
+                    : componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
             componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, component.getComponentType());
-            return Either.right(responseFormat);
+            throw e;
         }
         ValidationUtils.removeDuplicateFromList(tagsList);
-        return Either.left(true);
     }
 
-    protected Either<Boolean, ResponseFormat> validateComponentTags(List<String> tags, String name, ComponentTypeEnum componentType) {
+    protected void validateComponentTags(List<String> tags, String name, ComponentTypeEnum componentType, User user, Component component, AuditingActionEnum action) {
         log.debug("validate component tags");
         boolean includesComponentName = false;
         int tagListSize = 0;
+        ResponseFormat responseFormat;
         if (tags != null && !tags.isEmpty()) {
             for (String tag : tags) {
                 if (!ValidationUtils.validateTagLength(tag)) {
                     log.debug("tag length exceeds limit {}", ValidationUtils.TAG_MAX_LENGTH);
-                    return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_SINGLE_TAG_EXCEED_LIMIT, "" + ValidationUtils.TAG_MAX_LENGTH));
+                    responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_SINGLE_TAG_EXCEED_LIMIT, "" + ValidationUtils.TAG_MAX_LENGTH);
+                    componentsUtils.auditComponentAdmin(responseFormat, user, component, action, componentType);
+                    throw new ComponentException(ActionStatus.COMPONENT_SINGLE_TAG_EXCEED_LIMIT, "" + ValidationUtils.TAG_MAX_LENGTH);
                 }
                 if (validateTagPattern(tag)) {
                     if (!includesComponentName) {
@@ -386,7 +353,9 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
                     }
                 } else {
                     log.debug("invalid tag {}", tag);
-                    return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_FIELD_FORMAT, componentType.getValue(), TAG_FIELD_LABEL));
+                    responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_FIELD_FORMAT, componentType.getValue(), TAG_FIELD_LABEL);
+                    componentsUtils.auditComponentAdmin(responseFormat, user, component, action, componentType);
+                    throw new ComponentException(ActionStatus.INVALID_FIELD_FORMAT, componentType.getValue(), TAG_FIELD_LABEL);
                 }
                 tagListSize += tag.length() + 1;
             }
@@ -396,15 +365,21 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
 
             if (!includesComponentName) {
                 log.debug("tags must include component name");
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_TAGS_NO_COMP_NAME));
+                responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_TAGS_NO_COMP_NAME);
+                componentsUtils.auditComponentAdmin(responseFormat, user, component, action, componentType);
+                throw new ComponentException(ActionStatus.COMPONENT_INVALID_TAGS_NO_COMP_NAME);
             }
             if (!ValidationUtils.validateTagListLength(tagListSize)) {
                 log.debug("overall tags length exceeds limit {}", ValidationUtils.TAG_LIST_MAX_LENGTH);
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_TAGS_EXCEED_LIMIT, "" + ValidationUtils.TAG_LIST_MAX_LENGTH));
+                responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_TAGS_EXCEED_LIMIT, "" + ValidationUtils.TAG_LIST_MAX_LENGTH);
+                componentsUtils.auditComponentAdmin(responseFormat, user, component, action, componentType);
+                throw new ComponentException(ActionStatus.COMPONENT_TAGS_EXCEED_LIMIT, "" + ValidationUtils.TAG_LIST_MAX_LENGTH);
             }
-            return Either.left(true);
+        } else {
+            responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_TAGS);
+            componentsUtils.auditComponentAdmin(responseFormat, user, component, action, componentType);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_TAGS);
         }
-        return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_TAGS));
     }
 
     protected boolean validateTagPattern(String tag) {
@@ -421,14 +396,18 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         if (!ValidationUtils.validateStringNotEmpty(projectCode)) {
             log.info("projectCode is missing.");
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.MISSING_PROJECT_CODE);
-            componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, component.getComponentType(), ResourceAuditData.newBuilder().build());
+            componentsUtils.auditComponentAdmin(errorResponse, user, component, actionEnum, component.getComponentType(),
+                    ResourceVersionInfo.newBuilder()
+                            .build());
             return Either.right(errorResponse);
         }
 
         Either<Boolean, ResponseFormat> validateProjectCodeResponse = validateProjectCode(projectCode);
         if (validateProjectCodeResponse.isRight()) {
             ResponseFormat responseFormat = validateProjectCodeResponse.right().value();
-            componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, component.getComponentType(), ResourceAuditData.newBuilder().build());
+            componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, component.getComponentType(),
+                    ResourceVersionInfo.newBuilder()
+                            .build());
         }
         return validateProjectCodeResponse;
 
@@ -480,50 +459,27 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         }
     }
 
-    protected Either<Boolean, ResponseFormat> validateComponentFieldsBeforeCreate(User user, Component component, AuditingActionEnum actionEnum) {
+    protected void validateComponentFieldsBeforeCreate(User user, Component component, AuditingActionEnum actionEnum) {
         // validate component name uniqueness
         log.debug("validate component name ");
-        Either<Boolean, ResponseFormat> componentNameValidation = validateComponentName(user, component, actionEnum);
-        if (componentNameValidation.isRight()) {
-            return componentNameValidation;
-        }
-
+        validateComponentName(user, component, actionEnum);
         // validate description
         log.debug("validate description");
-        Either<Boolean, ResponseFormat> descValidation = validateDescriptionAndCleanup(user, component, actionEnum);
-        if (descValidation.isRight()) {
-            return descValidation;
-        }
-
+        validateDescriptionAndCleanup(user, component, actionEnum);
         // validate tags
         log.debug("validate tags");
-        Either<Boolean, ResponseFormat> tagsValidation = validateTagsListAndRemoveDuplicates(user, component, actionEnum);
-        if (tagsValidation.isRight()) {
-            return tagsValidation;
-        }
-
+        validateTagsListAndRemoveDuplicates(user, component, actionEnum);
         // validate contact info
         log.debug("validate contact info");
-        Either<Boolean, ResponseFormat> contactIdValidation = validateContactId(user, component, actionEnum);
-        if (contactIdValidation.isRight()) {
-            return contactIdValidation;
-        }
-
+        validateContactId(user, component, actionEnum);
         // validate icon
         log.debug("validate icon");
-        Either<Boolean, ResponseFormat> iconValidation = validateIcon(user, component, actionEnum);
-        if (iconValidation.isRight()) {
-            return iconValidation;
-        }
-        return Either.left(true);
+        validateIcon(user, component, actionEnum);
     }
 
     public Either<CapReqDef, ResponseFormat> getRequirementsAndCapabilities(String componentId, ComponentTypeEnum componentTypeEnum, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Component Instance", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Component Instance", false);
         Either<CapReqDef, ResponseFormat> eitherRet = null;
         ComponentParametersView filter = new ComponentParametersView(true);
         filter.setIgnoreCapabilities(false);
@@ -539,38 +495,29 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         return eitherRet;
     }
 
-    public Either<List<Component>, ResponseFormat> getLatestVersionNotAbstractComponents(boolean isAbstractAbstract, HighestFilterEnum highestFilter, ComponentTypeEnum componentTypeEnum, String internalComponentType, List<String> componentUids,
-            String userId) {
-        ResponseFormat responseFormat = null;
+    public Either<List<Component>, ResponseFormat> getLatestVersionNotAbstractComponents(boolean isAbstractAbstract, ComponentTypeEnum componentTypeEnum, String internalComponentType, List<String> componentUids,
+                                                                                         String userId) {
         try{
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "get Latest Version Not Abstract Components", false);
-
-            if (resp.isLeft()) {
-                List<Component> result = new ArrayList<>();
-                List<String> componentsUidToFetch = new ArrayList<>();
-                componentsUidToFetch.addAll(componentUids);
-
-                if (!componentsUidToFetch.isEmpty()) {
-                    log.debug("Number of Components to fetch from graph is {}", componentsUidToFetch.size());
-                    Boolean isHighest = isHighest(highestFilter);
-                    Either<List<Component>, StorageOperationStatus> nonCheckoutCompResponse = toscaOperationFacade.getLatestVersionNotAbstractComponents(isAbstractAbstract, isHighest, componentTypeEnum, internalComponentType, componentsUidToFetch);
-
-                    if (nonCheckoutCompResponse.isLeft()) {
-                        log.debug("Retrived Resource successfully.");
-                        result.addAll(nonCheckoutCompResponse.left().value());
-                    } else {
-                        responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(nonCheckoutCompResponse.right().value()));
-                    }
+            validateUserExists(userId, "get Latest Version Not Abstract Components", false);
+            List<Component> result = new ArrayList<>();
+            List<String> componentsUidToFetch = new ArrayList<>();
+            componentsUidToFetch.addAll(componentUids);
+            if (!componentsUidToFetch.isEmpty()) {
+                log.debug("Number of Components to fetch from graph is {}", componentsUidToFetch.size());
+                Either<List<Component>, StorageOperationStatus> nonCheckoutCompResponse = toscaOperationFacade.getLatestVersionNotAbstractComponents(isAbstractAbstract, componentTypeEnum, internalComponentType, componentsUidToFetch);
+
+                if (nonCheckoutCompResponse.isLeft()) {
+                    log.debug("Retrived Resource successfully.");
+                    result.addAll(nonCheckoutCompResponse.left().value());
+                } else {
+                    return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(nonCheckoutCompResponse.right().value())));
                 }
-                return Either.left(result);
-            } else {
-                responseFormat = resp.right().value();
             }
+            return Either.left(result);
         }
         finally{
             titanDao.commit();
         }
-        return Either.right(responseFormat);
     }
 
     private Boolean isHighest(HighestFilterEnum highestFilter) {
@@ -594,20 +541,15 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         ResponseFormat responseFormat = null;
 
         try{
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "get Latest Version Not Abstract Components", false);
-            if (resp.isLeft()) {
-
-                Boolean isHighest = isHighest(highestFilter);
-                Either<List<Component>, StorageOperationStatus> nonCheckoutCompResponse = toscaOperationFacade.getLatestVersionNotAbstractMetadataOnly(isAbstractAbstract, isHighest, componentTypeEnum, internalComponentType);
+            validateUserExists(userId, "get Latest Version Not Abstract Components", false);
+            Boolean isHighest = isHighest(highestFilter);
+            Either<List<Component>, StorageOperationStatus> nonCheckoutCompResponse = toscaOperationFacade.getLatestVersionNotAbstractMetadataOnly(isAbstractAbstract, componentTypeEnum, internalComponentType);
 
-                if (nonCheckoutCompResponse.isLeft()) {
-                    log.debug("Retrived Resource successfully.");
-                    return Either.left(nonCheckoutCompResponse.left().value());
-                }
-                responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(nonCheckoutCompResponse.right().value()));
-            } else {
-                responseFormat = resp.right().value();
+            if (nonCheckoutCompResponse.isLeft()) {
+                log.debug("Retrived Resource successfully.");
+                return Either.left(nonCheckoutCompResponse.left().value());
             }
+            responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(nonCheckoutCompResponse.right().value()));
         } finally {
             titanDao.commit();
         }
@@ -686,7 +628,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         return artifactsBusinessLogic.generateAndSaveToscaArtifact(artifactDefinition, component, user, isInCertificationRequest, shouldLock, inTransaction, fetchTemplatesFromDB);
     }
 
-    public Either<ImmutablePair<String, byte[]>, ResponseFormat> getToscaModelByComponentUuid(ComponentTypeEnum componentType, String uuid, EnumMap<AuditingFieldsKeysEnum, Object> additionalParam) {
+    public Either<ImmutablePair<String, byte[]>, ResponseFormat> getToscaModelByComponentUuid(ComponentTypeEnum componentType, String uuid, ResourceCommonInfo resourceCommonInfo) {
 
         Either<List<Component>, StorageOperationStatus> latestVersionEither = toscaOperationFacade.getComponentListByUuid(uuid, null);
 
@@ -706,7 +648,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
             ResponseFormat response = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.NOT_FOUND, componentType));
             return Either.right(response);
         }
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, component.getName());
+        resourceCommonInfo.setResourceName(component.getName());
         // TODO remove after migration - handle artifact not found(no
         // placeholder)
         if (null == component.getToscaArtifacts() || component.getToscaArtifacts().isEmpty()) {
@@ -741,11 +683,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         String descriptionUpdated = updatedComponent.getDescription();
         String descriptionCurrent = currentComponent.getDescription();
         if (descriptionUpdated != null && !descriptionCurrent.equals(descriptionUpdated)) {
-            Either<Boolean, ResponseFormat> validateDescriptionResponse = validateDescriptionAndCleanup(user, updatedComponent, auditingAction);
-            if (validateDescriptionResponse.isRight()) {
-                ResponseFormat errorRespons = validateDescriptionResponse.right().value();
-                return Either.right(errorRespons);
-            }
+            validateDescriptionAndCleanup(user, updatedComponent, auditingAction);
             currentComponent.setDescription(updatedComponent.getDescription());
         }
         return Either.left(true);
@@ -770,11 +708,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         String iconCurrent = currentComponent.getIcon();
         if (iconUpdated != null && !iconCurrent.equals(iconUpdated)) {
             if (!hasBeenCertified) {
-                Either<Boolean, ResponseFormat> validatIconResponse = validateIcon(user, updatedComponent, null);
-                if (validatIconResponse.isRight()) {
-                    ResponseFormat errorRespons = validatIconResponse.right().value();
-                    return Either.right(errorRespons);
-                }
+                validateIcon(user, updatedComponent, null);
                 currentComponent.setIcon(updatedComponent.getIcon());
             } else {
                 log.info("icon {} cannot be updated once the component has been certified once.", iconUpdated);
@@ -790,12 +724,14 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         log.trace("start deleteMarkedComponents");
         Either<List<String>, StorageOperationStatus> deleteMarkedElements = toscaOperationFacade.deleteMarkedElements(componentType);
 
-        titanDao.commit();
+
         if ( deleteMarkedElements.isRight()){
+            titanDao.rollback();
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(deleteMarkedElements.right().value(), componentType));
             return Either.right(responseFormat);
         }
         log.trace("end deleteMarkedComponents");
+        titanDao.commit();
         return Either.left(deleteMarkedElements.left().value());
     }
 
@@ -824,10 +760,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
     public Either<UiComponentDataTransfer, ResponseFormat> getComponentDataFilteredByParams(String componentId, User user, List<String> dataParamsToReturn) {
 
         if (user != null) {
-            Either<User, ResponseFormat> eitherCreator = validateUserExists(user, "Get Component by filtered by ui params", false);
-            if (eitherCreator.isRight()) {
-                return Either.right(eitherCreator.right().value());
-            }
+            validateUserExists(user, "Get Component by filtered by ui params", false);
         }
 
         UiComponentDataTransfer result =  new UiComponentDataTransfer();
@@ -872,15 +805,15 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         return componentNonGenericInputs;
     }
 
-    protected <T extends Component> Either<Resource, ResponseFormat> fetchAndSetDerivedFromGenericType(T component){
+    protected <T extends Component> Resource fetchAndSetDerivedFromGenericType(T component){
         Either<Resource, ResponseFormat> genericTypeEither = this.genericTypeBusinessLogic.fetchDerivedFromGenericType(component);
         if(genericTypeEither.isRight()){
             log.debug("Failed to fetch latest generic type for component {} of type", component.getName(), component.assetType());
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERIC_TYPE_NOT_FOUND, component.assetType()));
+            throw new ComponentException(ActionStatus.GENERIC_TYPE_NOT_FOUND, component.assetType());
         }
         Resource genericTypeResource = genericTypeEither.left().value();
         component.setDerivedFromGenericInfo(genericTypeResource);
-        return Either.left(genericTypeResource);
+        return genericTypeResource;
     }
 
     public Either<Map<String, List<IComponentInstanceConnectedElement>>, ResponseFormat> getFilteredComponentInstanceProperties(String componentId, Map<FilterKeyEnum, List<String>> filters, String userId) {
@@ -891,10 +824,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
                 response = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
             }
             if (userId != null && response == null) {
-                Either<User, ResponseFormat> validateUserRes = validateUserExists(userId, "Get filtered component instance properties", false);
-                if (validateUserRes.isRight()) {
-                    response = Either.right(validateUserRes.right().value());
-                }
+                validateUserExists(userId, "Get filtered component instance properties", false);
             }
             if(response == null){
                 getResourceRes = toscaOperationFacade.getToscaElement(componentId);
@@ -1033,10 +963,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         Boolean shouldUpgrade = false;
         String currentGenericType = clonedComponent.getDerivedFromGenericType();
         String currentGenericVersion = clonedComponent.getDerivedFromGenericVersion();
-        Either<Resource, ResponseFormat> fetchAndSetLatestGeneric = fetchAndSetDerivedFromGenericType(clonedComponent);
-        if(fetchAndSetLatestGeneric.isRight())
-            return Either.right(fetchAndSetLatestGeneric.right().value());
-        Resource genericTypeResource = fetchAndSetLatestGeneric.left().value();
+        Resource genericTypeResource = fetchAndSetDerivedFromGenericType(clonedComponent);
         if(null == currentGenericType || !currentGenericType.equals(genericTypeResource.getToscaResourceName()) || !currentGenericVersion.equals(genericTypeResource.getVersion())){
             shouldUpgrade = upgradeToLatestGeneric(clonedComponent, genericTypeResource);
             if(!shouldUpgrade) {
@@ -1101,7 +1028,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
             log.debug("input {} cannot be overriden, check out performed without upgrading to latest generic", eitherMerged.right().value());
             return false;
         }
-        componentToCheckOut.setInputs(new ArrayList<InputDefinition>(eitherMerged.left().value().values()));
+        componentToCheckOut.setInputs(new ArrayList<>(eitherMerged.left().value().values()));
         return true;
     }
 
@@ -1132,7 +1059,7 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         return isMatchingType;
     }
 
-    protected String cleanUpText(String text){
+    String cleanUpText(String text){
         text = ValidationUtils.removeNoneUtf8Chars(text);
         text = ValidationUtils.normaliseWhitespace(text);
         text = ValidationUtils.stripOctets(text);
@@ -1145,6 +1072,9 @@ public abstract class ComponentBusinessLogic extends BaseBusinessLogic {
         return Either.right(ActionStatus.GENERAL_ERROR);
     }
 
+    public List<GroupDefinition> throwComponentException(ResponseFormat responseFormat) {
+        throw new ComponentException(responseFormat);
+    }
 }
 
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogicProvider.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogicProvider.java
new file mode 100644
index 0000000000..3025084239
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentBusinessLogicProvider.java
@@ -0,0 +1,37 @@
+package org.openecomp.sdc.be.components.impl;
+
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ComponentBusinessLogicProvider {
+
+    private final ResourceBusinessLogic resourceBusinessLogic;
+    private final ServiceBusinessLogic serviceBusinessLogic;
+    private final ProductBusinessLogic productBusinessLogic;
+
+    public ComponentBusinessLogicProvider(ResourceBusinessLogic resourceBusinessLogic, ServiceBusinessLogic serviceBusinessLogic, ProductBusinessLogic productBusinessLogic) {
+        this.resourceBusinessLogic = resourceBusinessLogic;
+        this.serviceBusinessLogic = serviceBusinessLogic;
+        this.productBusinessLogic = productBusinessLogic;
+    }
+
+    public ComponentBusinessLogic getInstance(ComponentTypeEnum componentTypeEnum) {
+        switch (componentTypeEnum) {
+            case SERVICE:
+               return serviceBusinessLogic;
+            case PRODUCT:
+               return productBusinessLogic;
+            case RESOURCE:
+            case RESOURCE_INSTANCE:
+               return resourceBusinessLogic;
+            default:
+                BeEcompErrorManager.getInstance().logBeSystemError("getComponentBL");
+                throw new ComponentException(ActionStatus.INVALID_CONTENT_PARAM, componentTypeEnum.getValue());
+        }
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
index 0ff00913e0..35493f715c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.openecomp.sdc.be.components.impl.version.PostChangeVersionOperationOrchestrator;
+import org.openecomp.sdc.be.components.impl.instance.ComponentInstanceChangeOperationOrchestrator;
 import org.openecomp.sdc.be.components.merge.instance.ComponentInstanceMergeDataBusinessLogic;
 import org.openecomp.sdc.be.components.merge.instance.DataForMergeHolder;
 import org.openecomp.sdc.be.components.validation.ComponentValidations;
@@ -67,6 +67,7 @@ import org.openecomp.sdc.be.model.RequirementDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.jsontitan.operations.ForwardingPathOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.IComponentInstanceOperation;
@@ -81,10 +82,9 @@ import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
 import org.openecomp.sdc.common.jsongraph.util.CommonUtility;
 import org.openecomp.sdc.common.jsongraph.util.CommonUtility.LogLevelEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
@@ -107,7 +107,15 @@ import static org.openecomp.sdc.be.components.property.GetInputUtils.isGetInputV
 @org.springframework.stereotype.Component
 public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentInstanceBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ComponentInstanceBusinessLogic.class.getName());
+    private static final String VF_MODULE = "org.openecomp.groups.VfModule";
+    public static final String TRY_TO_CREATE_ENTRY_ON_GRAPH = "Try to create entry on graph";
+    public static final String FAILED_TO_CREATE_ENTRY_ON_GRAPH_FOR_COMPONENT_INSTANCE = "Failed to create entry on graph for component instance {}";
+    public static final String ENTITY_ON_GRAPH_IS_CREATED = "Entity on graph is created.";
+    public static final String INVALID_COMPONENT_TYPE = "invalid component type";
+    public static final String FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID = "Failed to retrieve component, component id {}";
+    public static final String FAILED_TO_LOCK_SERVICE = "Failed to lock service {}";
+    public static final String CREATE_OR_UPDATE_PROPERTY_VALUE = "CreateOrUpdatePropertyValue";
 
     @Autowired
     private IComponentInstanceOperation componentInstanceOperation;
@@ -119,9 +127,11 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     private ComponentInstanceMergeDataBusinessLogic compInstMergeDataBL;
 
     @Autowired
-    private PostChangeVersionOperationOrchestrator postChangeVersionOperationOrchestrator;
+    private ComponentInstanceChangeOperationOrchestrator onChangeInstanceOperationOrchestrator;
+
+    @Autowired
+    private ForwardingPathOperation forwardingPathOperation;
 
-    public static final String VF_MODULE = "org.openecomp.groups.VfModule";
 
     public ComponentInstanceBusinessLogic() {
     }
@@ -207,12 +217,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         ComponentTypeEnum containerComponentType;
 
         try {
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "create Component Instance", inTransaction);
-            if (resp.isRight()) {
-                return Either.right(resp.right().value());
-            } else {
-                user = resp.left().value();
-            }
+            user = validateUserExists(userId, "create Component Instance", inTransaction);
 
             Either<Boolean, ResponseFormat> validateValidJson = validateJsonBody(resourceInstance, ComponentInstance.class);
             if (validateValidJson.isRight()) {
@@ -329,12 +334,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         ComponentInstance resourceInstance = createAndAssotiateInfo.getNode();
         RequirementCapabilityRelDef associationInfo = createAndAssotiateInfo.getAssociate();
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create And Associate RI To RI", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        User user = validateUserExists(userId, "create And Associate RI To RI", false);
 
-        User user = resp.left().value();
         Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
         if (validateComponentType.isRight()) {
             return Either.right(validateComponentType.right().value());
@@ -585,10 +586,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     public Either<ComponentInstance, ResponseFormat> updateComponentInstanceMetadata(String containerComponentParam, String containerComponentId, String componentInstanceId, String userId, ComponentInstance componentInstance, boolean inTransaction,
             boolean needLock, boolean createNewTransaction) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "update Component Instance", inTransaction);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "update Component Instance", inTransaction);
 
         Either<ComponentInstance, ResponseFormat> resultOp = null;
 
@@ -648,16 +646,12 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     }
 
     // New Multiple Instance Update API
-    public Either<List<ComponentInstance>, ResponseFormat> updateComponentInstance(String containerComponentParam, String containerComponentId, String userId, List<ComponentInstance> componentInstanceList, boolean needLock,
-            boolean createNewTransaction) {
+    public Either<List<ComponentInstance>, ResponseFormat> updateComponentInstance(String containerComponentParam, String containerComponentId, String userId, List<ComponentInstance> componentInstanceList, boolean needLock) {
 
         Either<List<ComponentInstance>, ResponseFormat> resultOp = null;
         org.openecomp.sdc.be.model.Component containerComponent = null;
         try {
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "update Component Instance", true);
-            if (resp.isRight()) {
-                return Either.right(resp.right().value());
-            }
+            validateUserExists(userId, "update Component Instance", true);
 
             Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
             if (validateComponentType.isRight()) {
@@ -857,10 +851,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
     public Either<ComponentInstance, ResponseFormat> deleteComponentInstance(String containerComponentParam, String containerComponentId, String componentInstanceId, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Component Instance", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Component Instance", false);
 
         Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
         if (validateComponentType.isRight()) {
@@ -992,7 +983,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         if (resultOp.isLeft() && CollectionUtils.isNotEmpty(containerComponent.getInputs())) {
             List<InputDefinition> inputsToDelete = containerComponent.getInputs().stream().filter(i -> i.getInstanceUniqueId() != null && i.getInstanceUniqueId().equals(componentInstanceId)).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(inputsToDelete)) {
-                StorageOperationStatus deleteInputsRes = toscaOperationFacade.deleteComponentInstanceInputsFromTopologyTemplate(containerComponent, containerComponent.getComponentType(), inputsToDelete);
+                StorageOperationStatus deleteInputsRes = toscaOperationFacade.deleteComponentInstanceInputsFromTopologyTemplate(containerComponent, inputsToDelete);
                 if (deleteInputsRes != StorageOperationStatus.OK) {
                     log.debug("Failed to delete inputs of the component instance {} from container component. ", componentInstanceId);
                     resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(deleteInputsRes, containerComponentType), componentInstanceId));
@@ -1032,10 +1023,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     public Either<RequirementCapabilityRelDef, ResponseFormat> associateRIToRI(String componentId, String userId, RequirementCapabilityRelDef requirementDef, ComponentTypeEnum componentTypeEnum, boolean inTransaction, boolean needLock,
         boolean createNewTransaction) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "associate Ri To RI", inTransaction);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "associate Ri To RI", inTransaction);
 
         Either<RequirementCapabilityRelDef, ResponseFormat> resultOp = null;
 
@@ -1106,10 +1094,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     }
 
     public Either<RequirementCapabilityRelDef, ResponseFormat> dissociateRIFromRI(String componentId, String userId, RequirementCapabilityRelDef requirementDef, ComponentTypeEnum componentTypeEnum) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "dissociate RI From RI", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "dissociate RI From RI", false);
 
         Either<RequirementCapabilityRelDef, ResponseFormat> resultOp = null;
         Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(componentId, componentTypeEnum, null);
@@ -1177,10 +1162,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
             Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = null;
             RequirementCapabilityRelDef foundRelation = null;
 
-            Either<User, ResponseFormat> validateUserRes = validateUserExists(userId, "get relation by Id", false);
-            if (validateUserRes.isRight()) {
-                resultOp = Either.right(validateUserRes.right().value());
-            }
+            validateUserExists(userId, "get relation by Id", false);
+
             if(resultOp == null){
                 validateComponentExists = validateComponentExists(componentId, componentTypeEnum, null);
                 if (validateComponentExists.isRight()) {
@@ -1366,7 +1349,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         Either<ComponentInstanceProperty, ResponseFormat> result = null;
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
 
-        validateUserExist(userId, "create Or Update Attribute Value", errorWrapper);
+        validateUserExist(userId, "create Or Update Attribute Value");
         if (errorWrapper.isEmpty()) {
             validateComponentTypeEnum(componentTypeEnum, "CreateOrUpdateAttributeValue", errorWrapper);
         }
@@ -1440,10 +1423,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         /*-------------------------------Validations---------------------------------*/
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Or Update Properties Values", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Or Update Properties Values", false);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("CreateOrUpdatePropertiesValues", "invalid component type", ErrorSeverity.INFO);
@@ -1642,10 +1622,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         Either<List<ComponentInstanceInput>, ResponseFormat> resultOp = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Or Update Property Value", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Or Update Property Value", false);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("CreateOrUpdatePropertyValue", "invalid component type", ErrorSeverity.INFO);
@@ -1715,10 +1692,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         Either<ComponentInstanceProperty, ResponseFormat> resultOp = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Or Update Property Value", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Or Update Property Value", false);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("CreateOrUpdatePropertyValue", "invalid component type", ErrorSeverity.INFO);
@@ -1812,10 +1786,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         Either<ComponentInstanceInput, ResponseFormat> resultOp = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Or Update Input Value", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "create Or Update Input Value", false);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("createOrUpdateInputValue", "invalid component type", ErrorSeverity.INFO);
@@ -1902,10 +1873,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
     public Either<ComponentInstanceProperty, ResponseFormat> deletePropertyValue(ComponentTypeEnum componentTypeEnum, String serviceId, String resourceInstanceId, String propertyValueId, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Property Value", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Property Value", false);
 
         Either<ComponentInstanceProperty, ResponseFormat> resultOp = null;
 
@@ -2066,12 +2034,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
     public Either<ComponentInstance, ResponseFormat> changeComponentInstanceVersion(String containerComponentParam, String containerComponentId, String componentInstanceId, String userId, ComponentInstance newComponentInstance) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "change Component Instance Version", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        User user = validateUserExists(userId, "change Component Instance Version", false);
 
-        User user = resp.left().value();
         Either<ComponentInstance, ResponseFormat> resultOp = null;
 
         Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
@@ -2101,7 +2065,17 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         ComponentInstance currentResourceInstance = resourceInstanceStatus.left().value();
 
+        return changeInstanceVersion(containerComponent, currentResourceInstance, newComponentInstance, user, containerComponentType );
+    }
+
+    public Either<ComponentInstance, ResponseFormat> changeInstanceVersion(org.openecomp.sdc.be.model.Component containerComponent, ComponentInstance currentResourceInstance,
+                                                                           ComponentInstance newComponentInstance, User user, final ComponentTypeEnum containerComponentType    ) {
+        Either<ComponentInstance, ResponseFormat> resultOp = null;
+        Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus;
+
         Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "changeComponentInstanceVersion");
+        String containerComponentId = containerComponent.getUniqueId();
+        String componentInstanceId = currentResourceInstance.getUniqueId();
         if (lockComponent.isRight()) {
             return Either.right(lockComponent.right().value());
         }
@@ -2198,7 +2172,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                 return Either.right(mergeStatusEither.right().value());
             }
 
-            ActionStatus postChangeVersionResult = postChangeVersionOperationOrchestrator.doPostChangeVersionOperations(containerComponent, currentResourceInstance, newComponentInstance);
+            ActionStatus postChangeVersionResult = onChangeInstanceOperationOrchestrator.doPostChangeVersionOperations(containerComponent, currentResourceInstance, newComponentInstance);
             if (postChangeVersionResult != ActionStatus.OK) {
                 return Either.right(componentsUtils.getResponseFormat(postChangeVersionResult));
             }
@@ -2233,11 +2207,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
         try {
-            Either<User, ResponseFormat> validateUserExists = validateUserExists(userId, ECOMP_ERROR_CONTEXT, false);
-            if (validateUserExists.isRight()) {
-                resultOp = Either.right(validateUserExists.right().value());
-                return resultOp;
-            }
+            validateUserExists(userId, ECOMP_ERROR_CONTEXT, false);
 
             Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentTypeParam);
             if (validateComponentType.isRight()) {
@@ -2305,19 +2275,19 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         return result;
     }
 
-    public Either<ComponentInstance, ResponseFormat> deleteServiceProxy(String containerComponentType, String containerComponentId, String serviceProxyId, String userId) {
+    public Either<ComponentInstance, ResponseFormat> deleteServiceProxy() {
         // TODO Add implementation
         Either<ComponentInstance, ResponseFormat> result = Either.left(new ComponentInstance());
         return result;
     }
 
-    public Either<ComponentInstance, ResponseFormat> createServiceProxy(String containerComponentType, String containerComponentId, String userId, ComponentInstance componentInstance) {
+    public Either<ComponentInstance, ResponseFormat> createServiceProxy() {
         // TODO Add implementation
         Either<ComponentInstance, ResponseFormat> result = Either.left(new ComponentInstance());
         return result;
     }
 
-    public Either<ComponentInstance, ResponseFormat> changeServiceProxyVersion(String containerComponentType, String containerComponentId, String serviceProxyId, String userId) {
+    public Either<ComponentInstance, ResponseFormat> changeServiceProxyVersion() {
         // TODO Add implementation
         Either<ComponentInstance, ResponseFormat> result = Either.left(new ComponentInstance());
         return result;
@@ -2411,10 +2381,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
         try {
-            Either<User, ResponseFormat> validateUserExists = validateUserExists(userId, "Get Component Instance Properties By Id", false);
-            if (validateUserExists.isRight()) {
-                resultOp = Either.right(validateUserExists.right().value());
-            }
+            validateUserExists(userId, "Get Component Instance Properties By Id", false);
             if(resultOp == null){
                 Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentType);
                 if (validateComponentType.isRight()) {
@@ -2517,10 +2484,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                                                                                                       List<ComponentInstanceProperty> properties, String userId) {
         Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "update instance capability property", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "update instance capability property", false);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("updateInstanceCapabilityProperty", "invalid component type", ErrorSeverity.INFO);
@@ -2589,10 +2553,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         List<ComponentInstanceProperty> properties, String userId) {
         Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "update instance capability property", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "update instance capability property", false);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("updateInstanceCapabilityProperty", "invalid component type", ErrorSeverity.INFO);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentLocker.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentLocker.java
new file mode 100644
index 0000000000..8328098980
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentLocker.java
@@ -0,0 +1,55 @@
+package org.openecomp.sdc.be.components.impl;
+
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.impl.GraphLockOperation;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+
+@org.springframework.stereotype.Component
+public class ComponentLocker  {
+
+    private static final Logger log = Logger.getLogger(ComponentLocker.class.getName());
+    private final GraphLockOperation graphLockOperation;
+
+    public ComponentLocker(GraphLockOperation graphLockOperation) {
+        this.graphLockOperation = graphLockOperation;
+    }
+
+    public void lock(String id, ComponentTypeEnum componentType) {
+        lock(id, componentType.getNodeType());
+    }
+
+    public void lock(Component component) {
+        doLockComponent(component.getUniqueId(), component.getComponentType().getNodeType());
+    }
+
+    public void lock(String id, NodeTypeEnum nodeTypeEnum) {
+        doLockComponent(id, nodeTypeEnum);
+    }
+
+    private void doLockComponent(String id, NodeTypeEnum nodeTypeEnum) {
+        log.debug("#doLockComponent - locking component {} of type {}", id, nodeTypeEnum);
+        StorageOperationStatus storageOperationStatus = graphLockOperation.lockComponent(id, nodeTypeEnum);
+        if (storageOperationStatus != StorageOperationStatus.OK) {
+     		log.debug("#doLockComponent - failed to lock component {} with status {}", id, storageOperationStatus);
+            throw new StorageException(storageOperationStatus);
+        }
+    }
+
+    public void unlock(String id, ComponentTypeEnum componentType) {
+        unlock(id, componentType.getNodeType());
+    }
+
+    public void unlock(String id, NodeTypeEnum nodeTypeEnum) {
+        log.debug("#unlock - unlocking component {} of type {}", id, nodeTypeEnum);
+        StorageOperationStatus storageOperationStatus = graphLockOperation.unlockComponent(id, nodeTypeEnum);
+        if (storageOperationStatus != StorageOperationStatus.OK) {
+            log.debug("#unlock - failed to unlock component {} with status {}", id, storageOperationStatus);
+            throw new StorageException(storageOperationStatus, id);
+        }
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CompositionBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CompositionBusinessLogic.java
index b591c9e1b9..fa39cf0dca 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CompositionBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CompositionBusinessLogic.java
@@ -20,16 +20,8 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.model.ComponentInstance;
@@ -39,7 +31,10 @@ import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.Collection;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 /**
  * This class holds the logic of arranging resource instance on the canvas for imported VF
@@ -63,25 +58,24 @@ public class CompositionBusinessLogic {
         LEFT, RIGHT, UP, DOWN
     };
 
-    protected Either<List<ComponentInstance>, ResponseFormat> setPositionsForComponentInstances(Resource resource, String userId) {
-        Either<List<ComponentInstance>, ResponseFormat> result = Either.left(resource.getComponentInstances());
-
+    protected void setPositionsForComponentInstances(Resource resource, String userId) {
         boolean isNotAllPositionsCalculated = resource.getComponentInstances() == null
-                || resource.getComponentInstances().stream().filter(p -> (p.getPosX() == null || p.getPosX().isEmpty()) || (p.getPosY() == null || p.getPosY().isEmpty())).findAny().isPresent();
-
+                || resource.getComponentInstances().stream().anyMatch(p -> (p.getPosX() == null || p.getPosX().isEmpty()) || (p.getPosY() == null || p.getPosY().isEmpty()));
         if (isNotAllPositionsCalculated &&  resource.getComponentInstances() != null) {
             // Arrange Icons In Spiral Pattern
             Map<ImmutablePair<Double, Double>, ComponentInstance> componentInstanceLocations = buildSpiralPatternPositioningForComponentInstances(resource);
-
             // Set Relative Locations According to Canvas Size
-            componentInstanceLocations.entrySet().stream().forEach(e -> setRelativePosition(e));
-
+            componentInstanceLocations.entrySet().forEach(this::setRelativePosition);
             // Update in DB
-            result = componentInstanceBusinessLogic.updateComponentInstance(ComponentTypeEnum.RESOURCE_PARAM_NAME, resource.getUniqueId(), userId, resource.getComponentInstances(), false, false);
-
+            componentInstanceBusinessLogic.updateComponentInstance(ComponentTypeEnum.RESOURCE_PARAM_NAME,resource.getUniqueId(),
+                    userId, resource.getComponentInstances(), false)
+                    .left()
+                    .on(this::throwComponentException);
         }
-        return result;
+    }
 
+    private List<ComponentInstance> throwComponentException(ResponseFormat responseFormat) {
+        throw new ComponentException(responseFormat);
     }
 
     private void setRelativePosition(Entry<ImmutablePair<Double, Double>, ComponentInstance> entry) {
@@ -128,7 +122,7 @@ public class CompositionBusinessLogic {
         componentInstances.addAll(resource.getComponentInstances());
         Map<ComponentInstance, List<ComponentInstance>> connectededCps = getCpsConnectedToVFC(componentInstances, resource);
         // Remove all cp that are connected from the list
-        componentInstances.removeAll(connectededCps.values().stream().flatMap(e -> e.stream()).collect(Collectors.toList()));
+        componentInstances.removeAll(connectededCps.values().stream().flatMap(Collection::stream).collect(Collectors.toList()));
 
         buildSpiralPatternForMajorComponents(componentInstanceLocations, componentInstances);
         buildCirclePatternForCps(componentInstanceLocations, connectededCps);
@@ -154,7 +148,7 @@ public class CompositionBusinessLogic {
         for (ComponentInstance currCp : cpsGroup) {
             double cpXposition = xCenter + CompositionBusinessLogic.CP_RADIUS_FACTOR * Math.cos(currentAngle);
             double cpYposition = yCenter + CompositionBusinessLogic.CP_RADIUS_FACTOR * Math.sin(currentAngle);
-            componentInstLocations.put(new ImmutablePair<Double, Double>(cpXposition, cpYposition), currCp);
+            componentInstLocations.put(new ImmutablePair<>(cpXposition, cpYposition), currCp);
             currentAngle += angleBetweenCps;
         }
 
@@ -168,9 +162,9 @@ public class CompositionBusinessLogic {
         for (ComponentInstance curr : componentInstances) {
             elementsCounter++;
             if (elementsCounter == 1) {
-                currPlacement = new ImmutablePair<Double, Double>(0D, 0D);
+                currPlacement = new ImmutablePair<>(0D, 0D);
             } else if (elementsCounter == 2) {
-                currPlacement = new ImmutablePair<Double, Double>(-1D, 0D);
+                currPlacement = new ImmutablePair<>(-1D, 0D);
                 relationToPrevElement = RelativePosition.LEFT;
             } else {
                 relationToPrevElement = getRelativePositionForCurrentElement(componentInstanceLocations, relationToPrevElement, prevPlacement);
@@ -263,19 +257,19 @@ public class CompositionBusinessLogic {
         switch (relativeLocation) {
 
         case LEFT: {
-            relativeElementPosition = new ImmutablePair<Double, Double>(currElement.getLeft() - 1, currElement.getRight());
+            relativeElementPosition = new ImmutablePair<>(currElement.getLeft() - 1, currElement.getRight());
             break;
         }
         case RIGHT: {
-            relativeElementPosition = new ImmutablePair<Double, Double>(currElement.getLeft() + 1, currElement.getRight());
+            relativeElementPosition = new ImmutablePair<>(currElement.getLeft() + 1, currElement.getRight());
             break;
         }
         case UP: {
-            relativeElementPosition = new ImmutablePair<Double, Double>(currElement.getLeft(), currElement.getRight() + 1);
+            relativeElementPosition = new ImmutablePair<>(currElement.getLeft(), currElement.getRight() + 1);
             break;
         }
         case DOWN: {
-            relativeElementPosition = new ImmutablePair<Double, Double>(currElement.getLeft(), currElement.getRight() - 1);
+            relativeElementPosition = new ImmutablePair<>(currElement.getLeft(), currElement.getRight() - 1);
             break;
         }
         default: {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ConsumerBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ConsumerBusinessLogic.java
index 8ab124c994..213c4b67db 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ConsumerBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ConsumerBusinessLogic.java
@@ -20,28 +20,23 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.Date;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.ConsumerDefinition;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.ConsumerOperation;
 import org.openecomp.sdc.be.resources.data.ConsumerData;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.user.IUserBusinessLogic;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.Date;
 
 @Component("ConsumerBusinessLogic")
 public class ConsumerBusinessLogic extends BaseBusinessLogic {
@@ -49,20 +44,12 @@ public class ConsumerBusinessLogic extends BaseBusinessLogic {
     private static final String CONSUMER_NAME = "Consumer name";
     private static final String CONSUMER_SALT = "Consumer salt";
     private static final String CONSUMER_PW = "Consumer password";
-
-    @javax.annotation.Resource
-    private IUserBusinessLogic userAdmin;
-
-    @javax.annotation.Resource
-    private ComponentsUtils componentsUtils;
+    public static final String AUDIT_BEFORE_SENDING_RESPONSE = "audit before sending response";
 
     @javax.annotation.Resource
     private ConsumerOperation consumerOperation;
 
-    @javax.annotation.Resource
-    private IGraphLockOperation graphLockOperation;
-
-    private static final Logger log = LoggerFactory.getLogger(ConsumerBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ConsumerBusinessLogic.class.getName());
 
     public Either<ConsumerDefinition, ResponseFormat> createConsumer(User user, ConsumerDefinition consumer) {
 
@@ -75,7 +62,7 @@ public class ConsumerBusinessLogic extends BaseBusinessLogic {
         user = userValidation.left().value();
         consumer.setLastModfierAtuid(user.getUserId());
 
-        Either<ConsumerDefinition, ResponseFormat> consumerValidationResponse = validateConsumer(consumer, user, AuditingActionEnum.ADD_ECOMP_USER_CREDENTIALS);
+        Either<ConsumerDefinition, ResponseFormat> consumerValidationResponse = validateConsumer(consumer);
         if (consumerValidationResponse.isRight()) {
             ResponseFormat responseFormat = consumerValidationResponse.right().value();
             componentsUtils.auditConsumerCredentialsEvent(AuditingActionEnum.ADD_ECOMP_USER_CREDENTIALS, consumer, responseFormat, user);
@@ -94,7 +81,7 @@ public class ConsumerBusinessLogic extends BaseBusinessLogic {
         try {
             Either<ConsumerData, StorageOperationStatus> getResponse = consumerOperation.getCredentials(consumerName);
             if (getResponse.isLeft() && getResponse.left().value() != null) {
-                return updateConsumer(consumer, user, true);
+                return updateConsumer(consumer);
             }
 
             Date date = new Date();
@@ -123,7 +110,7 @@ public class ConsumerBusinessLogic extends BaseBusinessLogic {
         if (user.getUserId() == null || user.getUserId().trim().isEmpty()) {
             log.debug("createEcompUser method - user is missing. userId= {}", user.getUserId());
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.MISSING_INFORMATION);
-            log.debug("audit before sending response");
+            log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
             componentsUtils.auditConsumerCredentialsEvent(auditAction, consumer, responseFormat, user);
             return Either.right(responseFormat);
         }
@@ -132,7 +119,7 @@ public class ConsumerBusinessLogic extends BaseBusinessLogic {
         if (eitherCreator.isRight() || eitherCreator.left().value() == null) {
             log.debug("createEcompUser method - user is not listed. userId= {}", user.getUserId());
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_ACCESS);
-            log.debug("audit before sending response");
+            log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
             componentsUtils.auditConsumerCredentialsEvent(auditAction, consumer, responseFormat, user);
             return Either.right(responseFormat);
         }
@@ -143,14 +130,14 @@ public class ConsumerBusinessLogic extends BaseBusinessLogic {
         if (!user.getRole().equals(Role.ADMIN.name())) {
             log.info("role {} is not allowed to perform this action", user.getRole());
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION);
-            log.debug("audit before sending response");
+            log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
             componentsUtils.auditConsumerCredentialsEvent(auditAction, consumer, responseFormat, user);
             return Either.right(responseFormat);
         }
         return Either.left(user);
     }
 
-    private Either<ConsumerDefinition, ResponseFormat> validateConsumer(ConsumerDefinition consumer, User user, AuditingActionEnum audatingAction) {
+    private Either<ConsumerDefinition, ResponseFormat> validateConsumer(ConsumerDefinition consumer) {
         Either<ConsumerDefinition, ResponseFormat> validateConsumerName = validateConsumerName(consumer);
         if (validateConsumerName.isRight()) {
             return Either.right(validateConsumerName.right().value());
@@ -286,7 +273,7 @@ public class ConsumerBusinessLogic extends BaseBusinessLogic {
         return Either.left(consumer);
     }
 
-    public Either<ConsumerDefinition, ResponseFormat> updateConsumer(ConsumerDefinition consumer, User modifier, boolean isCreateRequest) {
+    public Either<ConsumerDefinition, ResponseFormat> updateConsumer(ConsumerDefinition consumer) {
         Either<ConsumerData, StorageOperationStatus> updateResult = consumerOperation.updateCredentials(new ConsumerData(consumer));
         if (updateResult.isRight()) {
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponseForConsumer(updateResult.right().value()));
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CsarValidationUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CsarValidationUtils.java
index 2609dfcbff..b008e516cb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CsarValidationUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CsarValidationUtils.java
@@ -20,59 +20,53 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.tosca.CsarUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public class CsarValidationUtils {
 
-    private static final Logger log = LoggerFactory.getLogger(CsarValidationUtils.class);
+    private static final Logger log = Logger.getLogger(CsarValidationUtils.class.getName());
 
     private static final String TOSCA_META_FILE_VERSION = "TOSCA-Meta-File-Version";
-
     private static final String CSAR_VERSION = "CSAR-Version";
-
     private static final String CREATED_BY = "Created-By";
-
     private static final String NEW_LINE_DELM = "\n";
-
-    public final static String TOSCA_METADATA = "TOSCA-Metadata";
-    public final static String TOSCA_FILE = "TOSCA.meta";
-    public final static String DEL_PATTERN = "([/\\\\]+)";
+    public static final String TOSCA_METADATA = "TOSCA-Metadata";
+    public static final String TOSCA_FILE = "TOSCA.meta";
+    public static final String DEL_PATTERN = "([/\\\\]+)";
     public static final String TOSCA_METADATA_PATH_PATTERN = TOSCA_METADATA +
             // Artifact Group (i.e Deployment/Informational)
             DEL_PATTERN + TOSCA_FILE;
 
     public static final String TOSCA_META_ENTRY_DEFINITIONS = "Entry-Definitions";
-
     private static final String[] TOSCA_METADATA_FIELDS = { TOSCA_META_FILE_VERSION, CSAR_VERSION, CREATED_BY, TOSCA_META_ENTRY_DEFINITIONS };
-
-    public final static String ARTIFACTS_METADATA_FILE = "HEAT.meta";
-
+    public static final String ARTIFACTS_METADATA_FILE = "HEAT.meta";
     public static final String TOSCA_CSAR_EXTENSION = ".csar";
-/**
+    public static final String TOSCA_METADATA_TOSCA_META_FILE_IS_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_CSAR_ID = "TOSCA-Metadata/TOSCA.meta file is not in expected key-value form in csar, csar ID {}";
+    public static final String TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID = "TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id ";
+    public static final String CSAR_INTERNALS_ARE_INVALID = "CSAR internals are invalid";
+    public static final String ENTRY_DEFINITIONS_ENTRY_NOT_FOUND_IN_TOSCA_METADATA_TOSCA_META_FILE_CSAR_ID = "Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file, csar ID {}";
+    public static final String FILE_NOT_FOUND_IN_CSAR_WITH_ID = " file not found in CSAR with id ";
+    public static final String CSAR_STRUCTURE_IS_INVALID = "CSAR structure is invalid";
+    public static final String ENTRY_DEFINITIONS = "Entry-Definitions ";
+
+    /**
  * Validates Csar
  * @param csar
  * @param csarUUID
@@ -103,7 +97,7 @@ public class CsarValidationUtils {
         for(int i = 0; i < numberOfArtifacts; ++i ){
             collectNonUniqueArtifact(paths, i, numberOfArtifacts, nonUniqueArtifactsToRemove);
         }
-        nonUniqueArtifactsToRemove.stream().forEach(path->csar.remove(path));
+        nonUniqueArtifactsToRemove.stream().forEach(csar::remove);
     }
 
     private static void collectNonUniqueArtifact( String[] paths, int currInd, int numberOfArtifacts, List<String> nonUniqueArtifactsToRemove) {
@@ -145,8 +139,8 @@ public class CsarValidationUtils {
         Pattern pattern = Pattern.compile(TOSCA_METADATA_PATH_PATTERN);
         Optional<String> keyOp = csar.keySet().stream().filter(k -> pattern.matcher(k).matches()).findAny();
         if(!keyOp.isPresent()){
-            log.debug("TOSCA-Metadata/TOSCA.meta file is not in expected key-value form in csar, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+            log.debug(TOSCA_METADATA_TOSCA_META_FILE_IS_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_CSAR_ID, csarUUID);
+            BeEcompErrorManager.getInstance().logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
         }
         byte[] toscaMetaBytes = csar.get(keyOp.get());
@@ -155,8 +149,8 @@ public class CsarValidationUtils {
             String propStr = new String(toscaMetaBytes);
             props.load(new StringReader(propStr.replace("\\","\\\\")));
         } catch (IOException e) {
-            log.debug("TOSCA-Metadata/TOSCA.meta file is not in expected key-value form in csar, csar ID {}", csarUUID, e);
-            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+            log.debug(TOSCA_METADATA_TOSCA_META_FILE_IS_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_CSAR_ID, csarUUID, e);
+            BeEcompErrorManager.getInstance().logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
         }
 
@@ -166,8 +160,8 @@ public class CsarValidationUtils {
         String result = list.stream().map(x -> x).collect(Collectors.joining(DEL_PATTERN));
         keyOp = csar.keySet().stream().filter(k -> Pattern.compile(result).matcher(k).matches()).findAny();
         if(!keyOp.isPresent()){
-            log.debug("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+            log.debug(ENTRY_DEFINITIONS_ENTRY_NOT_FOUND_IN_TOSCA_METADATA_TOSCA_META_FILE_CSAR_ID, csarUUID);
+            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file in CSAR with id " + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.YAML_NOT_FOUND_IN_CSAR, csarUUID, yamlFileName));
         }
 
@@ -175,20 +169,20 @@ public class CsarValidationUtils {
         byte[] yamlFileBytes = csar.get(yamlFileName);
         if (yamlFileBytes == null) {
             log.debug("Entry-Definitions {} file not found in csar, csar ID {}", yamlFileName, csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions " + yamlFileName + " file not found in CSAR with id " + csarUUID, "CSAR structure is invalid", ErrorSeverity.ERROR);
+            BeEcompErrorManager.getInstance().logInternalDataError(ENTRY_DEFINITIONS + yamlFileName + FILE_NOT_FOUND_IN_CSAR_WITH_ID + csarUUID, CSAR_STRUCTURE_IS_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.YAML_NOT_FOUND_IN_CSAR, csarUUID, yamlFileName));
         }
 
         String yamlFileContents = new String(yamlFileBytes);
 
-        return Either.left(new ImmutablePair<String, String>(yamlFileName, yamlFileContents));
+        return Either.left(new ImmutablePair<>(yamlFileName, yamlFileContents));
     }
 
     public static Either<ImmutablePair<String, String>, ResponseFormat> getArtifactsMeta(Map<String, byte[]> csar, String csarUUID, ComponentsUtils componentsUtils) {
 
         if( !csar.containsKey(CsarUtils.ARTIFACTS_PATH + ARTIFACTS_METADATA_FILE) ) {
-            log.debug("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+            log.debug(ENTRY_DEFINITIONS_ENTRY_NOT_FOUND_IN_TOSCA_METADATA_TOSCA_META_FILE_CSAR_ID, csarUUID);
+            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file in CSAR with id " + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.YAML_NOT_FOUND_IN_CSAR, csarUUID, ARTIFACTS_METADATA_FILE));
         }
 
@@ -196,19 +190,19 @@ public class CsarValidationUtils {
         byte[] artifactsMetaBytes = csar.get(CsarUtils.ARTIFACTS_PATH + ARTIFACTS_METADATA_FILE);
         if (artifactsMetaBytes == null) {
             log.debug("Entry-Definitions {}{} file not found in csar, csar ID {}", CsarUtils.ARTIFACTS_PATH, ARTIFACTS_METADATA_FILE, csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions " + CsarUtils.ARTIFACTS_PATH + ARTIFACTS_METADATA_FILE + " file not found in CSAR with id " + csarUUID, "CSAR structure is invalid", ErrorSeverity.ERROR);
+            BeEcompErrorManager.getInstance().logInternalDataError(ENTRY_DEFINITIONS + CsarUtils.ARTIFACTS_PATH + ARTIFACTS_METADATA_FILE + FILE_NOT_FOUND_IN_CSAR_WITH_ID + csarUUID, CSAR_STRUCTURE_IS_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.YAML_NOT_FOUND_IN_CSAR, csarUUID, CsarUtils.ARTIFACTS_PATH + ARTIFACTS_METADATA_FILE));
         }
 
         String artifactsFileContents = new String(artifactsMetaBytes);
 
-        return Either.left(new ImmutablePair<String, String>(CsarUtils.ARTIFACTS_PATH + ARTIFACTS_METADATA_FILE, artifactsFileContents));
+        return Either.left(new ImmutablePair<>(CsarUtils.ARTIFACTS_PATH + ARTIFACTS_METADATA_FILE, artifactsFileContents));
     }
 
     public static Either<ImmutablePair<String, byte[]>, ResponseFormat> getArtifactsContent(String csarUUID, Map<String, byte[]> csar, String artifactPath, String artifactName, ComponentsUtils componentsUtils) {
         if (!csar.containsKey(artifactPath)) {
             log.debug("Entry-Definitions entry not found in Artifacts/HEAT.meta file, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions entry not found in TOSCA-Metadata/TOSCA.meta file in CSAR with id " + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.ARTIFACT_NOT_FOUND_IN_CSAR, CsarUtils.ARTIFACTS_PATH + artifactName, csarUUID));
         }
 
@@ -216,11 +210,11 @@ public class CsarValidationUtils {
         byte[] artifactFileBytes = csar.get(artifactPath);
         if (artifactFileBytes == null) {
             log.debug("Entry-Definitions {}{} file not found in csar, csar ID {}", CsarUtils.ARTIFACTS_PATH, artifactName, csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("Entry-Definitions " + artifactPath + " file not found in CSAR with id " + csarUUID, "CSAR structure is invalid", ErrorSeverity.ERROR);
+            BeEcompErrorManager.getInstance().logInternalDataError(ENTRY_DEFINITIONS + artifactPath + FILE_NOT_FOUND_IN_CSAR_WITH_ID + csarUUID, CSAR_STRUCTURE_IS_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.ARTIFACT_NOT_FOUND_IN_CSAR, artifactPath, csarUUID));
         }
 
-        return Either.left(new ImmutablePair<String, byte[]>(artifactName, artifactFileBytes));
+        return Either.left(new ImmutablePair<>(artifactName, artifactFileBytes));
     }
 
     private static Either<Boolean, ResponseFormat> validateTOSCAMetadataFile(Map<String, byte[]> csar, String csarUUID, ComponentsUtils componentsUtils) {
@@ -228,8 +222,8 @@ public class CsarValidationUtils {
         Pattern pattern = Pattern.compile(TOSCA_METADATA_PATH_PATTERN);
         Optional<String> keyOp = csar.keySet().stream().filter(k -> pattern.matcher(k).matches()).findAny();
         if(!keyOp.isPresent()){
-            log.debug("TOSCA-Metadata/TOSCA.meta file is not in expected key-value form in csar, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+            log.debug(TOSCA_METADATA_TOSCA_META_FILE_IS_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_CSAR_ID, csarUUID);
+            BeEcompErrorManager.getInstance().logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
         }
 
@@ -237,8 +231,8 @@ public class CsarValidationUtils {
         String toscaMetadata = new String(toscaMetaBytes);
         String[] splited = toscaMetadata.split(NEW_LINE_DELM);
         if (splited == null || splited.length < TOSCA_METADATA_FIELDS.length) {
-            log.debug("TOSCA-Metadata/TOSCA.meta file is not in expected key-value form in csar, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+            log.debug(TOSCA_METADATA_TOSCA_META_FILE_IS_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_CSAR_ID, csarUUID);
+            BeEcompErrorManager.getInstance().logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
         }
 
@@ -260,30 +254,29 @@ public class CsarValidationUtils {
             try {
                 props.load(new ByteArrayInputStream(splited[index].getBytes()));
             } catch (IOException e) {
-                log.debug("TOSCA-Metadata/TOSCA.meta file is not in expected key-value form in csar, csar ID {}", csarUUID, e);
-                BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+                log.debug(TOSCA_METADATA_TOSCA_META_FILE_IS_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_CSAR_ID, csarUUID, e);
+                BeEcompErrorManager.getInstance().logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                 return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
             }
             if (!props.containsKey(toscaField)) {
                 log.debug("TOSCA.meta file format is invalid: No new line after block_0 as expected in csar, csar ID {}", csarUUID);
-                BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+                BeEcompErrorManager.getInstance().logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                 return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
             }
             String value = props.getProperty(toscaField);
             if (value == null || value.isEmpty()) {
-                log.debug("TOSCA-Metadata/TOSCA.meta file is not in expected key-value form in csar, csar ID {}", csarUUID);
-                BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
+                log.debug(TOSCA_METADATA_TOSCA_META_FILE_IS_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_CSAR_ID, csarUUID);
+                BeEcompErrorManager.getInstance().logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
                 return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
             }
 
             // TOSCA-Meta-File-Version & CSAR-Version : digit.digit - format
             // validation
-            if (toscaField.equals(TOSCA_META_FILE_VERSION) || toscaField.equals(CSAR_VERSION)) {
-                if (!validateTOSCAMetaProperty(value)) {
-                    log.debug("TOSCA-Metadata/TOSCA.meta file contains {} in wrong format (digit.digit), csar ID {}", toscaField, csarUUID);
-                    BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not in expected key-value form in CSAR with id " + csarUUID, "CSAR internals are invalid", ErrorSeverity.ERROR);
-                    return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
-                }
+            if ((toscaField.equals(TOSCA_META_FILE_VERSION) || toscaField.equals(CSAR_VERSION)) && !validateTOSCAMetaProperty(value)) {
+                log.debug("TOSCA-Metadata/TOSCA.meta file contains {} in wrong format (digit.digit), csar ID {}", toscaField, csarUUID);
+                BeEcompErrorManager.getInstance()
+                                   .logInternalDataError(TOSCA_METADATA_TOSCA_META_FILE_NOT_IN_EXPECTED_KEY_VALUE_FORM_IN_CSAR_WITH_ID + csarUUID, CSAR_INTERNALS_ARE_INVALID, ErrorSeverity.ERROR);
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID_FORMAT, csarUUID));
             }
             index++;
         }
@@ -311,14 +304,14 @@ public class CsarValidationUtils {
         if(!keyOp.isPresent()){
 
             log.debug("TOSCA-Metadata/TOSCA.meta file not found in csar, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not found in CSAR with id " + csarUUID, "CSAR structure is invalid", ErrorSeverity.ERROR);
+            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not found in CSAR with id " + csarUUID, CSAR_STRUCTURE_IS_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID, csarUUID));
         }
         byte[] toscaMetaBytes = csar.get(keyOp.get());
-        // && exchanged for ||
+
         if (toscaMetaBytes == null || toscaMetaBytes.length == 0) {
             log.debug("TOSCA-Metadata/TOSCA.meta file not found in csar, csar ID {}", csarUUID);
-            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not found in CSAR with id " + csarUUID, "CSAR structure is invalid", ErrorSeverity.ERROR);
+            BeEcompErrorManager.getInstance().logInternalDataError("TOSCA-Metadata/TOSCA.meta file not found in CSAR with id " + csarUUID, CSAR_STRUCTURE_IS_INVALID, ErrorSeverity.ERROR);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.CSAR_INVALID, csarUUID));
         }
 
@@ -339,9 +332,7 @@ public class CsarValidationUtils {
     }
 
     public static boolean isCsarPayloadName(String payloadName) {
-        if (payloadName == null)
-            return false;
-        return payloadName.toLowerCase().endsWith(TOSCA_CSAR_EXTENSION);
+        return payloadName != null && payloadName.toLowerCase().endsWith(TOSCA_CSAR_EXTENSION);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeImportManager.java
index e423e729de..a9502b14f4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypeImportManager.java
@@ -20,53 +20,30 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
+import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.CommonImportManager.ElementTypeEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Component("dataTypeImportManager")
 public class DataTypeImportManager {
 
-    public static void main(String[] args) {
-
-        List<PropertyDefinition> properties = new ArrayList<>();
-        PropertyDefinition propertyDefintion = new PropertyDefinition();
-        propertyDefintion.setName("aaa");
-        properties.add(propertyDefintion);
-
-        List<String> allParentsProps = new ArrayList<>();
-        allParentsProps.add("aaa");
-        allParentsProps.add("bbb");
-
-        Set<String> alreadyExistPropsCollection = properties.stream().filter(p -> allParentsProps.contains(p.getName())).map(p -> p.getName()).collect(Collectors.toSet());
-        System.out.println(alreadyExistPropsCollection);
-
-    }
-
-    private static final Logger log = LoggerFactory.getLogger(DataTypeImportManager.class);
+    private static final Logger log = Logger.getLogger(DataTypeImportManager.class.getName());
     @Resource
     private PropertyOperation propertyOperation;
     @Resource
@@ -75,18 +52,16 @@ public class DataTypeImportManager {
     private CommonImportManager commonImportManager;
 
     public Either<List<ImmutablePair<DataTypeDefinition, Boolean>>, ResponseFormat> createDataTypes(String dataTypeYml) {
-        return commonImportManager.createElementTypes(dataTypeYml, elementTypeYml -> createDataTypesFromYml(elementTypeYml), elementTypesList -> createDataTypesByDao(elementTypesList), ElementTypeEnum.DataType);
+        return commonImportManager.createElementTypes(dataTypeYml, this::createDataTypesFromYml, this::createDataTypesByDao, ElementTypeEnum.DATA_TYPE);
     }
 
     private Either<List<DataTypeDefinition>, ActionStatus> createDataTypesFromYml(String dataTypesYml) {
-
-        return commonImportManager.createElementTypesFromYml(dataTypesYml, (dataTypeName, dataTypeJsonData) -> createDataType(dataTypeName, dataTypeJsonData));
-
+        return commonImportManager.createElementTypesFromYml(dataTypesYml, this::createDataType);
     }
 
     private Either<List<ImmutablePair<DataTypeDefinition, Boolean>>, ResponseFormat> createDataTypesByDao(List<DataTypeDefinition> dataTypesToCreate) {
 
-        return commonImportManager.createElementTypesByDao(dataTypesToCreate, dataType -> validateDataType(dataType), dataType -> new ImmutablePair<>(ElementTypeEnum.DataType, dataType.getName()),
+        return commonImportManager.createElementTypesByDao(dataTypesToCreate, this::validateDataType, dataType -> new ImmutablePair<>(ElementTypeEnum.DATA_TYPE, dataType.getName()),
                 dataTypeName -> propertyOperation.getDataTypeByNameWithoutDerived(dataTypeName), dataType -> propertyOperation.addDataType(dataType), (newDataType, oldDataType) -> propertyOperation.updateDataType(newDataType, oldDataType));
     }
 
@@ -124,17 +99,15 @@ public class DataTypeImportManager {
             }
 
             // check no duplicates
-            Set<String> collect = properties.stream().map(p -> p.getName()).collect(Collectors.toSet());
-            if (collect != null) {
-                if (properties.size() != collect.size()) {
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormatByDataType(ActionStatus.DATA_TYPE_DUPLICATE_PROPERTY, dataType, null);
+            Set<String> collect = properties.stream().map(PropertyDataDefinition::getName).collect(Collectors.toSet());
+            if (collect != null && properties.size() != collect.size()) {
+                ResponseFormat responseFormat = componentsUtils.getResponseFormatByDataType(ActionStatus.DATA_TYPE_DUPLICATE_PROPERTY, dataType, null);
 
-                    return Either.right(responseFormat);
-                }
+                return Either.right(responseFormat);
             }
 
-            List<String> propertiesWithSameTypeAsDataType = properties.stream().filter(p -> p.getType().equals(dataType.getName())).map(p -> p.getName()).collect(Collectors.toList());
-            if (propertiesWithSameTypeAsDataType != null && propertiesWithSameTypeAsDataType.isEmpty() == false) {
+            List<String> propertiesWithSameTypeAsDataType = properties.stream().filter(p -> p.getType().equals(dataType.getName())).map(PropertyDataDefinition::getName).collect(Collectors.toList());
+            if (propertiesWithSameTypeAsDataType != null && !propertiesWithSameTypeAsDataType.isEmpty()) {
                 log.debug("The data type {} contains properties with the type {}", dataType.getName(), dataType.getName());
                 ResponseFormat responseFormat = componentsUtils.getResponseFormatByDataType(ActionStatus.DATA_TYPE_PROEPRTY_CANNOT_HAVE_SAME_TYPE_OF_DATA_TYPE, dataType, propertiesWithSameTypeAsDataType);
 
@@ -160,9 +133,9 @@ public class DataTypeImportManager {
             } else {
 
                 DataTypeDefinition derivedDataTypeDef = derivedDataTypeByName.left().value();
-                if (properties != null && properties.isEmpty() == false) {
+                if (properties != null && !properties.isEmpty() && derivedDataTypeDef!=null) {
 
-                    if (true == isScalarType(derivedDataTypeDef)) {
+                    if (isScalarType(derivedDataTypeDef)) {
                         ResponseFormat responseFormat = componentsUtils.getResponseFormatByDataType(ActionStatus.DATA_TYPE_CANNOT_HAVE_PROPERTIES, dataType, null);
 
                         return Either.right(responseFormat);
@@ -181,8 +154,8 @@ public class DataTypeImportManager {
 
                     // Check that no property is already defined in one of the
                     // ancestors
-                    Set<String> alreadyExistPropsCollection = properties.stream().filter(p -> allParentsProps.contains(p.getName())).map(p -> p.getName()).collect(Collectors.toSet());
-                    if (alreadyExistPropsCollection != null && alreadyExistPropsCollection.isEmpty() == false) {
+                    Set<String> alreadyExistPropsCollection = properties.stream().filter(p -> allParentsProps.contains(p.getName())).map(PropertyDataDefinition::getName).collect(Collectors.toSet());
+                    if (alreadyExistPropsCollection != null && !alreadyExistPropsCollection.isEmpty()) {
                         List<String> duplicateProps = new ArrayList<>();
                         duplicateProps.addAll(alreadyExistPropsCollection);
                         ResponseFormat responseFormat = componentsUtils.getResponseFormatByDataType(ActionStatus.DATA_TYPE_PROPERTY_ALREADY_DEFINED_IN_ANCESTOR, dataType, duplicateProps);
@@ -200,7 +173,7 @@ public class DataTypeImportManager {
 
         ToscaPropertyType isPrimitiveToscaType = ToscaPropertyType.isValidType(dataTypeName);
 
-        return isPrimitiveToscaType != null && isPrimitiveToscaType.isAbstract() == true;
+        return isPrimitiveToscaType != null && isPrimitiveToscaType.isAbstract();
 
     }
 
@@ -230,22 +203,13 @@ public class DataTypeImportManager {
 
         if (toscaJson != null) {
             // Description
-            final Consumer<String> descriptionSetter = description -> dataType.setDescription(description);
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DESCRIPTION.getElementName(), descriptionSetter);
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DESCRIPTION.getElementName(), dataType::setDescription);
             // Derived From
-            final Consumer<String> derivedFromSetter = derivedFrom -> dataType.setDerivedFromName(derivedFrom);
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DERIVED_FROM.getElementName(), derivedFromSetter);
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DERIVED_FROM.getElementName(), dataType::setDerivedFromName);
             // Properties
-            commonImportManager.setProperties(toscaJson, (values) -> dataType.setProperties(values));
-
-            setConstraints(toscaJson, dataType);
+            CommonImportManager.setProperties(toscaJson, dataType::setProperties);
         }
         return dataType;
     }
 
-    private void setConstraints(Map<String, Object> toscaJson, DataTypeDefinition dataType) {
-        // TODO Auto-generated method stub
-
-    }
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypesService.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypesService.java
new file mode 100644
index 0000000000..3ddfe4bfc4
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DataTypesService.java
@@ -0,0 +1,39 @@
+package org.openecomp.sdc.be.components.impl;
+
+import fj.data.Either;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+public class DataTypesService {
+
+    private final ComponentsUtils componentsUtils;
+
+    public DataTypesService(ComponentsUtils componentsUtils) {
+        this.componentsUtils = componentsUtils;
+    }
+
+    public Either<Map<String, DataTypeDefinition>, ResponseFormat> getAllDataTypes(ApplicationDataTypeCache applicationDataTypeCache) {
+        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = applicationDataTypeCache.getAll();
+        if (allDataTypes.isRight()) {
+            TitanOperationStatus operationStatus = allDataTypes.right().value();
+            if (operationStatus == TitanOperationStatus.NOT_FOUND) {
+                BeEcompErrorManager.getInstance().logInternalDataError("FetchDataTypes", "Data types are not loaded", BeEcompErrorManager.ErrorSeverity.ERROR);
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.DATA_TYPE_CANNOT_BE_EMPTY));
+            } else {
+                BeEcompErrorManager.getInstance().logInternalFlowError("FetchDataTypes", "Failed to fetch data types", BeEcompErrorManager.ErrorSeverity.ERROR);
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+            }
+        }
+        return Either.left(allDataTypes.left().value());
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DistributionMonitoringBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DistributionMonitoringBusinessLogic.java
index af5c03b4b8..4cf7c44e85 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DistributionMonitoringBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/DistributionMonitoringBusinessLogic.java
@@ -20,33 +20,25 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import fj.data.Either;
 import org.apache.http.HttpStatus;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.cassandra.AuditCassandraDao;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.info.DistributionStatusInfo;
 import org.openecomp.sdc.be.info.DistributionStatusListResponse;
 import org.openecomp.sdc.be.info.DistributionStatusOfServiceInfo;
 import org.openecomp.sdc.be.info.DistributionStatusOfServiceListResponce;
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
 import org.openecomp.sdc.be.resources.data.auditing.DistributionStatusEvent;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
 import org.openecomp.sdc.common.datastructure.ESTimeBasedEvent;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.*;
 
 @Component("distributionMonitoringBusinessLogic")
 public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
@@ -58,24 +50,18 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
 
     private static final String IN_PROGRESS = "In Progress";
 
-    private static final Logger log = LoggerFactory.getLogger(ArtifactsBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ArtifactsBusinessLogic.class.getName());
 
 
     @Autowired
     private AuditCassandraDao cassandraDao;
 
-    @javax.annotation.Resource
-    private ComponentsUtils componentsUtils;
-
     public DistributionMonitoringBusinessLogic() {
     }
 
     public Either<DistributionStatusListResponse, ResponseFormat> getListOfDistributionStatus(String did, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get List Of Distribution Status", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get List Of Distribution Status", false);
 
         log.trace("getListOfDistributionStatus for did {}", did);
         Either<List<DistributionStatusEvent>, ActionStatus> distributionStatus = cassandraDao.getListOfDistributionStatuses(did);
@@ -83,7 +69,7 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
             log.debug("not found distribution statuses for did {}   status is {} ", did, distributionStatus.right().value());
             return Either.right(componentsUtils.getResponseFormat(distributionStatus.right().value(), did));
         }
-        List<DistributionStatusInfo> distribStatusInfoList = new ArrayList<DistributionStatusInfo>();
+        List<DistributionStatusInfo> distribStatusInfoList = new ArrayList<>();
         List<DistributionStatusEvent> distributionStatusEventList = distributionStatus.left().value();
         if (distributionStatusEventList != null) {
             for (ESTimeBasedEvent distributionStatusEvent : distributionStatusEventList) {
@@ -98,10 +84,7 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
     }
 
     public Either<DistributionStatusOfServiceListResponce, ResponseFormat> getListOfDistributionServiceStatus(String serviceUuid, String userId) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get List Of Distribution Service Status", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get List Of Distribution Service Status", false);
 
         log.trace("getListOfDistributionServiceStatus for serviceUUID {}", serviceUuid);
         Either<List<? extends AuditingGenericEvent>, ActionStatus> status = cassandraDao.getServiceDistributionStatusesList(serviceUuid);
@@ -109,7 +92,7 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
             log.debug("failed to find service distribution statuses. error: {}", status);
             return Either.right(componentsUtils.getResponseFormat(status.right().value(), serviceUuid));
         }
-        List<DistributionStatusOfServiceInfo> distribStatusInfoList = new ArrayList<DistributionStatusOfServiceInfo>();
+        List<DistributionStatusOfServiceInfo> distribStatusInfoList;
         List<? extends AuditingGenericEvent> distributionStatusEventList = status.left().value();
         distribStatusInfoList = handleAuditingDaoResponse(distributionStatusEventList);
         DistributionStatusOfServiceListResponce distributionStatusListResponse = new DistributionStatusOfServiceListResponce();
@@ -118,7 +101,7 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
     }
 
     private List<DistributionStatusOfServiceInfo> handleAuditingDaoResponse(List<? extends AuditingGenericEvent> distribStatusInfoList) {
-        List<DistributionStatusOfServiceInfo> reslist = new ArrayList<DistributionStatusOfServiceInfo>();
+        List<DistributionStatusOfServiceInfo> reslist = new ArrayList<>();
         Map<String, List<AuditingGenericEvent>> serviceDidMap = createServiceDidMap(distribStatusInfoList);
         Set<String> didSet = serviceDidMap.keySet();
         for (String did : didSet) {
@@ -132,8 +115,8 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
             for (AuditingGenericEvent auditingGenericEvent : auditingGenericEventList) {
                 auditingGenericEvent.fillFields();
 
-                String action = (String) auditingGenericEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_ACTION.getDisplayName());
-                Object modifierUserId = auditingGenericEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID.getDisplayName());
+                String action = (String) auditingGenericEvent.getFields().get(AuditingFieldsKey.AUDIT_ACTION.getDisplayName());
+                Object modifierUserId = auditingGenericEvent.getFields().get(AuditingFieldsKey.AUDIT_MODIFIER_UID.getDisplayName());
                 if (modifierUserId != null) {
                     distributionStatusOfServiceInfo.setUserId((String) modifierUserId);
                 }
@@ -152,7 +135,7 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
                 resAuditingGenericEvent = auditingGenericEvent;
 
             }
-            distributionStatusOfServiceInfo.setTimestamp((String) resAuditingGenericEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP.getDisplayName()));
+            distributionStatusOfServiceInfo.setTimestamp((String) resAuditingGenericEvent.getFields().get(AuditingFieldsKey.AUDIT_TIMESTAMP.getDisplayName()));
 
             if (!isResult) {
                 if (dReguestStatus.equals(String.valueOf(HttpStatus.SC_OK))) {
@@ -177,7 +160,7 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
 
     private String getStatusFromAuditEvent(ESTimeBasedEvent auditingGenericEvent) {
         String status = "";
-        Object requestStatus = auditingGenericEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName());
+        Object requestStatus = auditingGenericEvent.getFields().get(AuditingFieldsKey.AUDIT_STATUS.getDisplayName());
         if (requestStatus instanceof String) {
             status = (String) requestStatus;
         }
@@ -186,13 +169,13 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
 
     private Map<String, List<AuditingGenericEvent>> createServiceDidMap(List<? extends AuditingGenericEvent> distribStatusInfoList) {
 
-        Map<String, List<AuditingGenericEvent>> serviceDidMap = new HashMap<String, List<AuditingGenericEvent>>();
+        Map<String, List<AuditingGenericEvent>> serviceDidMap = new HashMap<>();
         for (AuditingGenericEvent auditingGenericEvent : distribStatusInfoList) {
             List<AuditingGenericEvent> auditingGenericEventList = null;
             String did = "";
             auditingGenericEvent.fillFields();
 
-            Object didValue = auditingGenericEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID.getDisplayName());
+            Object didValue = auditingGenericEvent.getFields().get(AuditingFieldsKey.AUDIT_DISTRIBUTION_ID.getDisplayName());
             if (didValue != null) {
                 did = (String) didValue;
             }
@@ -202,7 +185,7 @@ public class DistributionMonitoringBusinessLogic extends BaseBusinessLogic {
                     auditingGenericEventList = serviceDidMap.get(did);
                 }
                 if (auditingGenericEventList == null) {
-                    auditingGenericEventList = new ArrayList();
+                    auditingGenericEventList = new ArrayList<>();
 
                 }
                 auditingGenericEventList.add(auditingGenericEvent);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ElementBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ElementBusinessLogic.java
index 998ef6274f..630332fd32 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ElementBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ElementBusinessLogic.java
@@ -20,23 +20,11 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
@@ -48,25 +36,8 @@ import org.openecomp.sdc.be.datamodel.api.CategoryTypeEnum;
 import org.openecomp.sdc.be.datamodel.utils.NodeTypeConvertUtils;
 import org.openecomp.sdc.be.datatypes.components.ComponentMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
-import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ComponentFieldsEnum;
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum;
-import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
-import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.ArtifactType;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.DistributionStatusEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Product;
-import org.openecomp.sdc.be.model.PropertyScope;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.Tag;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.datatypes.enums.*;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.catalog.CatalogComponent;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
@@ -85,25 +56,31 @@ import org.openecomp.sdc.be.ui.model.UiCategories;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import static org.apache.commons.lang.BooleanUtils.isTrue;
 
 @org.springframework.stereotype.Component("elementsBusinessLogic")
 public class ElementBusinessLogic extends BaseBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(ElementBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ElementBusinessLogic.class);
+    private static final String SERVICES = "services";
+    private static final String RESOURCES = "resources";
+    private static final String VALIDATION_OF_USER_FAILED_USER_ID = "Validation of user failed, userId {}";
+    private static final String COMPONENT_TYPE_IS_INVALID = "Component type {} is invalid";
+    private static final String VALIDATION_OF_USER_ROLE_FAILED_USER_ID = "Validation of user role failed, userId {}";
 
     @javax.annotation.Resource
     private IElementOperation elementOperation;
 
     @javax.annotation.Resource
-    private ComponentsUtils componentsUtils;
-
-    @javax.annotation.Resource
     private UserBusinessLogic userAdminManager;
 
     /**
@@ -127,22 +104,22 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
 
         case TESTER:
             userId = user.getUserId();
-            response = handleTester(userId);
+            response = handleTester();
             break;
 
         case GOVERNOR:
             userId = user.getUserId();
-            response = handleGovernor(userId);
+            response = handleGovernor();
             break;
 
         case OPS:
             userId = user.getUserId();
-            response = handleOps(userId);
+            response = handleOps();
             break;
 
         case PRODUCT_STRATEGIST:
             userId = user.getUserId();
-            response = handleProductStrategist(userId);
+            response = handleProductStrategist();
             break;
 
         case PRODUCT_MANAGER:
@@ -178,16 +155,16 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
     private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleAdmin() {
         Either<Map<String, Set<? extends Component>>, ResponseFormat> response;
         // userId should stay null
-        Set<LifecycleStateEnum> lifecycleStates = new HashSet<LifecycleStateEnum>();
-        Set<LifecycleStateEnum> lastStateStates = new HashSet<LifecycleStateEnum>();
+        Set<LifecycleStateEnum> lifecycleStates = new HashSet<>();
+        Set<LifecycleStateEnum> lastStateStates = new HashSet<>();
         lifecycleStates.add(LifecycleStateEnum.CERTIFIED);
         response = getFollowedResourcesAndServices(null, lifecycleStates, lastStateStates);
         return response;
     }
 
     private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleDesigner(String userId) {
-        Set<LifecycleStateEnum> lifecycleStates = new HashSet<LifecycleStateEnum>();
-        Set<LifecycleStateEnum> lastStateStates = new HashSet<LifecycleStateEnum>();
+        Set<LifecycleStateEnum> lifecycleStates = new HashSet<>();
+        Set<LifecycleStateEnum> lastStateStates = new HashSet<>();
         Either<Map<String, Set<? extends Component>>, ResponseFormat> response;
         lifecycleStates.add(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
         lifecycleStates.add(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
@@ -200,21 +177,20 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         return response;
     }
 
-    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleGovernor(String userId) {
-        Either<Map<String, Set<? extends Component>>, ResponseFormat> result = handleFollowedCertifiedServices(null);
-        return result;
+    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleGovernor() {
+        return handleFollowedCertifiedServices(null);
     }
 
-    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleProductStrategist(String userId) {
+    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleProductStrategist() {
         // Should be empty list according to Ella, 13/03/16
-        Map<String, Set<? extends Component>> result = new HashMap<String, Set<? extends Component>>();
+        Map<String, Set<? extends Component>> result = new HashMap<>();
         result.put("products", new HashSet<>());
         return Either.left(result);
     }
 
     private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleProductManager(String userId) {
-        Set<LifecycleStateEnum> lifecycleStates = new HashSet<LifecycleStateEnum>();
-        Set<LifecycleStateEnum> lastStateStates = new HashSet<LifecycleStateEnum>();
+        Set<LifecycleStateEnum> lifecycleStates = new HashSet<>();
+        Set<LifecycleStateEnum> lastStateStates = new HashSet<>();
         Either<Map<String, Set<? extends Component>>, ResponseFormat> response;
         lifecycleStates.add(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN);
         lifecycleStates.add(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
@@ -227,13 +203,12 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         return response;
     }
 
-    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleOps(String userId) {
-        Set<DistributionStatusEnum> distStatus = new HashSet<DistributionStatusEnum>();
+    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleOps() {
+        Set<DistributionStatusEnum> distStatus = new HashSet<>();
         distStatus.add(DistributionStatusEnum.DISTRIBUTION_APPROVED);
         distStatus.add(DistributionStatusEnum.DISTRIBUTED);
 
-        Either<Map<String, Set<? extends Component>>, ResponseFormat> result = handleFollowedCertifiedServices(distStatus);
-        return result;
+        return handleFollowedCertifiedServices(distStatus);
     }
 
     private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleFollowedCertifiedServices(Set<DistributionStatusEnum> distStatus) {
@@ -243,20 +218,19 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
             Map<String, Set<? extends Component>> result = new HashMap<>();
             Set<Service> set = new HashSet<>();
             set.addAll(services.left().value());
-            result.put("services", set);
+            result.put(SERVICES, set);
             return Either.left(result);
         } else {
             return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(services.right().value())));
         }
     }
 
-    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleTester(String userId) {
-        Set<LifecycleStateEnum> lifecycleStates = new HashSet<LifecycleStateEnum>();
+    private Either<Map<String, Set<? extends Component>>, ResponseFormat> handleTester() {
+        Set<LifecycleStateEnum> lifecycleStates = new HashSet<>();
         lifecycleStates.add(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS);
         lifecycleStates.add(LifecycleStateEnum.READY_FOR_CERTIFICATION);
-        Either<Map<String, Set<? extends Component>>, ResponseFormat> result = getFollowedResourcesAndServices(null, lifecycleStates, null);
 
-        return result;
+        return getFollowedResourcesAndServices(null, lifecycleStates, null);
     }
 
     private Either<Map<String, Set<? extends Component>>, ResponseFormat> getFollowedResourcesAndServices(String userId, Set<LifecycleStateEnum> lifecycleStates, Set<LifecycleStateEnum> lastStateStates) {
@@ -267,9 +241,9 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
             if (resources.isLeft()) {
                 Either<Set<Service>, StorageOperationStatus> services = toscaOperationFacade.getFollowed(userId, lifecycleStates, lastStateStates, ComponentTypeEnum.SERVICE);
                 if (services.isLeft()) {
-                    Map<String, Set<? extends Component>> result = new HashMap<String, Set<? extends Component>>();
-                    result.put("services", services.left().value());
-                    result.put("resources", resources.left().value());
+                    Map<String, Set<? extends Component>> result = new HashMap<>();
+                    result.put(SERVICES, services.left().value());
+                    result.put(RESOURCES, resources.left().value());
                     return Either.left(result);
                 } else {
                     return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(services.right().value())));
@@ -311,10 +285,10 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         String componentType = componentTypeEnum == null ? componentTypeParamName : componentTypeEnum.getValue();
         CategoryTypeEnum categoryType = CategoryTypeEnum.CATEGORY;
 
-        User user = new User();
+        User user;
         Either<User, ResponseFormat> validateUser = validateUser(userId);
         if (validateUser.isRight()) {
-            log.debug("Validation of user failed, userId {}", userId);
+            log.debug(VALIDATION_OF_USER_FAILED_USER_ID, userId);
             ResponseFormat responseFormat = validateUser.right().value();
             user = new User();
             user.setUserId(userId);
@@ -336,7 +310,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         // For auditing of failures we need the original non-normalized name
         String origCategoryName = categoryName;
         if (componentTypeEnum == null) {
-            log.debug("Component type {} is invalid", componentTypeParamName);
+            log.debug(COMPONENT_TYPE_IS_INVALID, componentTypeParamName);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
             handleCategoryAuditing(responseFormat, user, origCategoryName, auditingAction, componentType);
             return Either.right(responseFormat);
@@ -344,7 +318,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
 
         Either<Boolean, ResponseFormat> validateUserRole = validateUserRole(user, componentTypeEnum);
         if (validateUserRole.isRight()) {
-            log.debug("Validation of user role failed, userId {}", userId);
+            log.debug(VALIDATION_OF_USER_ROLE_FAILED_USER_ID, userId);
             ResponseFormat responseFormat = validateUserRole.right().value();
             handleCategoryAuditing(responseFormat, user, origCategoryName, auditingAction, componentType);
             return Either.right(responseFormat);
@@ -422,22 +396,20 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         String subCategoryName = subCategory.getName();
         // For auditing of failures we need the original non-normalized name
         String origSubCategoryName = subCategoryName;
-
-        User user = new User();
-        Either<User, ResponseFormat> validateUser = validateUserExists(userId, "createSubCategory", false);
-        if (validateUser.isRight()) {
-            log.debug("Validation of user failed, userId {}", userId);
-            ResponseFormat responseFormat = validateUser.right().value();
+        User user;
+        try{
+            user =  validateUserExists(userId, "createSubCategory", false);
+        } catch(ComponentException e){
+            log.debug(VALIDATION_OF_USER_FAILED_USER_ID, userId);
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat() :
+                    componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
             user = new User();
             user.setUserId(userId);
             handleCategoryAuditing(responseFormat, user, parentCategoryName, origSubCategoryName, auditingAction, componentType);
-            return Either.right(responseFormat);
+            throw e;
         }
-
-        user = validateUser.left().value();
-
         if (componentTypeEnum == null) {
-            log.debug("Component type {} is invalid", componentTypeParamName);
+            log.debug(COMPONENT_TYPE_IS_INVALID, componentTypeParamName);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
             handleCategoryAuditing(responseFormat, user, parentCategoryName, origSubCategoryName, auditingAction, componentType);
             return Either.right(responseFormat);
@@ -453,7 +425,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
 
         Either<Boolean, ResponseFormat> validateUserRole = validateUserRole(user, componentTypeEnum);
         if (validateUserRole.isRight()) {
-            log.debug("Validation of user role failed, userId {}", userId);
+            log.debug(VALIDATION_OF_USER_ROLE_FAILED_USER_ID, userId);
             ResponseFormat responseFormat = validateUserRole.right().value();
             handleCategoryAuditing(responseFormat, user, parentCategoryName, origSubCategoryName, auditingAction, componentType);
             return Either.right(responseFormat);
@@ -557,19 +529,19 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         String parentSubCategoryName = parentSubCategoryId;
 
         User user;
-        Either<User, ResponseFormat> validateUser = validateUserExists(userId, "create Grouping", false);
-        if (validateUser.isRight()) {
-            log.debug("Validation of user failed, userId {}", userId);
-            ResponseFormat responseFormat = validateUser.right().value();
+        try{
+            user = validateUserExists(userId, "create Grouping", false);
+        } catch(ComponentException e){
+            log.debug(VALIDATION_OF_USER_FAILED_USER_ID, userId);
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat() :
+                    componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
             user = new User();
             user.setUserId(userId);
             String groupingNameForAudit = grouping == null ? null : grouping.getName();
             handleCategoryAuditing(responseFormat, user, parentCategoryName, parentSubCategoryName, groupingNameForAudit, auditingAction, componentType);
-            return Either.right(responseFormat);
+            throw e;
         }
 
-        user = validateUser.left().value();
-
         if (grouping == null) {
             log.debug("Grouping json is invalid");
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -582,7 +554,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         String origGroupingName = groupingName;
 
         if (componentTypeEnum == null) {
-            log.debug("Component type {} is invalid", componentTypeParamName);
+            log.debug(COMPONENT_TYPE_IS_INVALID, componentTypeParamName);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
             handleCategoryAuditing(responseFormat, user, parentCategoryName, parentSubCategoryName, origGroupingName, auditingAction, componentType);
             return Either.right(responseFormat);
@@ -598,7 +570,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
 
         Either<Boolean, ResponseFormat> validateUserRole = validateUserRole(user, componentTypeEnum);
         if (validateUserRole.isRight()) {
-            log.debug("Validation of user role failed, userId {}", userId);
+            log.debug(VALIDATION_OF_USER_ROLE_FAILED_USER_ID, userId);
             ResponseFormat responseFormat = validateUserRole.right().value();
             handleCategoryAuditing(responseFormat, user, parentCategoryName, parentSubCategoryName, origGroupingName, auditingAction, componentType);
             return Either.right(responseFormat);
@@ -707,31 +679,30 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
     }
 
     public Either<List<CategoryDefinition>, ResponseFormat> getAllCategories(String componentType, String userId) {
-        AuditingActionEnum auditingAction = AuditingActionEnum.GET_CATEGORY_HIERARCHY;
         ResponseFormat responseFormat;
         User user = new User();
         if (userId == null) {
             user.setUserId("UNKNOWN");
             responseFormat = componentsUtils.getResponseFormat(ActionStatus.MISSING_INFORMATION);
-            componentsUtils.auditGetCategoryHierarchy(auditingAction, user, componentType, responseFormat);
+            componentsUtils.auditGetCategoryHierarchy(user, componentType, responseFormat);
             return Either.right(responseFormat);
         }
-
-        Either<User, ResponseFormat> validateUser = validateUserExists(userId, "get All Categories", false);
-        if (validateUser.isRight()) {
+        try {
+            user = validateUserExists(userId, "get All Categories", false);
+        } catch (ComponentException e){
+            user = new User();
             user.setUserId(userId);
-            log.debug("Validation of user failed, userId {}", userId);
-            responseFormat = validateUser.right().value();
-            componentsUtils.auditGetCategoryHierarchy(auditingAction, user, componentType, responseFormat);
-            return Either.right(responseFormat);
+            log.debug(VALIDATION_OF_USER_FAILED_USER_ID, userId);
+            responseFormat = e.getResponseFormat() != null ? e.getResponseFormat():
+                    componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
+            componentsUtils.auditGetCategoryHierarchy(user, componentType, responseFormat);
+            throw e;
         }
-        user = validateUser.left().value();
-
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
         if (componentTypeEnum == null) {
             log.debug("Cannot create category for component type {}", componentType);
             responseFormat = componentsUtils.getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, "component type");
-            componentsUtils.auditGetCategoryHierarchy(auditingAction, user, componentType, responseFormat);
+            componentsUtils.auditGetCategoryHierarchy(user, componentType, responseFormat);
             return Either.right(responseFormat);
         }
 
@@ -739,32 +710,26 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         Either<List<CategoryDefinition>, ActionStatus> getAllCategoriesByType = elementOperation.getAllCategories(nodeTypeEnum, false);
         if (getAllCategoriesByType.isRight()) {
             responseFormat = componentsUtils.getResponseFormat(getAllCategoriesByType.right().value());
-            componentsUtils.auditGetCategoryHierarchy(auditingAction, user, componentType, responseFormat);
+            componentsUtils.auditGetCategoryHierarchy(user, componentType, responseFormat);
             return Either.right(responseFormat);
         }
         List<CategoryDefinition> categories = getAllCategoriesByType.left().value();
         responseFormat = componentsUtils.getResponseFormat(ActionStatus.OK);
-        componentsUtils.auditGetCategoryHierarchy(auditingAction, user, componentType, responseFormat);
+        componentsUtils.auditGetCategoryHierarchy(user, componentType, responseFormat);
         return Either.left(categories);
     }
 
     public Either<UiCategories, ResponseFormat> getAllCategories(String userId) {
-        AuditingActionEnum auditingAction = AuditingActionEnum.GET_CATEGORY_HIERARCHY;
         ResponseFormat responseFormat;
         UiCategories categories = new UiCategories();
 
-        Either<User, ResponseFormat> userResponse = validateUserExists(userId, "get all categories", false);
-
-        if (userResponse.isRight()) {
-            return Either.right(userResponse.right().value());
-        }
-        User user = userResponse.left().value();
+        User user = validateUserExists(userId, "get all categories", false);
 
         // GET resource categories
         Either<List<CategoryDefinition>, ActionStatus> getResourceCategoriesByType = elementOperation.getAllCategories(NodeTypeEnum.ResourceNewCategory, false);
         if (getResourceCategoriesByType.isRight()) {
             responseFormat = componentsUtils.getResponseFormat(getResourceCategoriesByType.right().value());
-            componentsUtils.auditGetCategoryHierarchy(auditingAction, user, ComponentTypeEnum.RESOURCE.getValue(), responseFormat);
+            componentsUtils.auditGetCategoryHierarchy(user, ComponentTypeEnum.RESOURCE.getValue(), responseFormat);
             return Either.right(responseFormat);
         }
         categories.setResourceCategories(getResourceCategoriesByType.left().value());
@@ -773,7 +738,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         Either<List<CategoryDefinition>, ActionStatus> getServiceCategoriesByType = elementOperation.getAllCategories(NodeTypeEnum.ServiceNewCategory, false);
         if (getServiceCategoriesByType.isRight()) {
             responseFormat = componentsUtils.getResponseFormat(getServiceCategoriesByType.right().value());
-            componentsUtils.auditGetCategoryHierarchy(auditingAction, user, ComponentTypeEnum.SERVICE.getValue(), responseFormat);
+            componentsUtils.auditGetCategoryHierarchy(user, ComponentTypeEnum.SERVICE.getValue(), responseFormat);
             return Either.right(responseFormat);
         }
         categories.setServiceCategories(getServiceCategoriesByType.left().value());
@@ -782,7 +747,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         Either<List<CategoryDefinition>, ActionStatus> getProductCategoriesByType = elementOperation.getAllCategories(NodeTypeEnum.ProductCategory, false);
         if (getProductCategoriesByType.isRight()) {
             responseFormat = componentsUtils.getResponseFormat(getProductCategoriesByType.right().value());
-            componentsUtils.auditGetCategoryHierarchy(auditingAction, user, ComponentTypeEnum.PRODUCT.getValue(), responseFormat);
+            componentsUtils.auditGetCategoryHierarchy(user, ComponentTypeEnum.PRODUCT.getValue(), responseFormat);
             return Either.right(responseFormat);
         }
 
@@ -793,10 +758,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
 
     public Either<CategoryDefinition, ResponseFormat> deleteCategory(String categoryId, String componentTypeParamName, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Category", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Category", false);
 
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentTypeParamName);
         if (componentTypeEnum == null) {
@@ -816,12 +778,9 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         return Either.left(category);
     }
 
-    public Either<SubCategoryDefinition, ResponseFormat> deleteSubCategory(String grandParentCategoryId, String parentSubCategoryId, String componentTypeParamName, String userId) {
+    public Either<SubCategoryDefinition, ResponseFormat> deleteSubCategory(String parentSubCategoryId, String componentTypeParamName, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Sub Category", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Sub Category", false);
 
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentTypeParamName);
         if (componentTypeEnum == null) {
@@ -841,12 +800,9 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         return Either.left(subCategory);
     }
 
-    public Either<GroupingDefinition, ResponseFormat> deleteGrouping(String grandParentCategoryId, String parentSubCategoryId, String groupingId, String componentTypeParamName, String userId) {
+    public Either<GroupingDefinition, ResponseFormat> deleteGrouping(String groupingId, String componentTypeParamName, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Grouping", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Grouping", false);
 
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentTypeParamName);
         if (componentTypeEnum == null) {
@@ -1001,13 +957,12 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         return elementOperation.getDefaultHeatTimeout();
     }
 
-    public Either<Map<String, List<CatalogComponent>>, ResponseFormat> getCatalogComponents(String userId) {
+	public Either<Map<String, List<CatalogComponent>>, ResponseFormat> getCatalogComponents(String userId, List<OriginTypeEnum> excludeTypes) {
         try {
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "get Catalog Components", true);
-            if (resp.isRight()) {
-                return Either.right(resp.right().value());
-            }
-            return toscaOperationFacade.getCatalogComponents().bimap(this::groupByComponentType, err -> componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(err)));
+            validateUserExists(userId, "get Catalog Components", true);
+            return toscaOperationFacade.getCatalogOrArchiveComponents(true, excludeTypes)
+                    .bimap(this::groupByComponentType,
+                            err -> componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(err)));
         } finally {
             titanDao.commit();
         }
@@ -1020,11 +975,11 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         if (map == null) {
             map = new HashMap<>();
         }
-        if (map.get("resources") == null) {
-            map.put("resources", new ArrayList());
+        if (map.get(RESOURCES) == null) {
+            map.put(RESOURCES, new ArrayList());
         }
-        if (map.get("services") == null) {
-            map.put("services", new ArrayList());
+        if (map.get(SERVICES) == null) {
+            map.put(SERVICES, new ArrayList());
         }
         return map;
     }
@@ -1032,9 +987,9 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
     private String cmptTypeToString(ComponentTypeEnum componentTypeEnum) {
         switch (componentTypeEnum) {
         case RESOURCE:
-            return "resources";
+            return RESOURCES;
         case SERVICE:
-            return "services";
+            return SERVICES;
         default:
             throw new IllegalStateException("resources or services only");
         }
@@ -1099,7 +1054,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         }
 
         if (categoryName != null) { // primary filter
-            components = fetchByCategoryOrSubCategoryName(categoryName, NodeTypeEnum.ServiceNewCategory, GraphEdgeLabels.CATEGORY.getProperty(), NodeTypeEnum.Service, inTransaction, ServiceMetadataData.class, null);
+            components = fetchByCategoryOrSubCategoryName(categoryName, NodeTypeEnum.ServiceNewCategory, NodeTypeEnum.Service, inTransaction, ServiceMetadataData.class, null);
             if (components.isLeft() && distEnum != null) {// secondary filter
                 Predicate<T> statusFilter = p -> ((Service) p).getDistributionStatus().equals(distEnum);
                 return Either.left(components.left().value().stream().filter(statusFilter).collect(Collectors.toList()));
@@ -1186,7 +1141,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
     }
 
     private List<String> getErrorResponseParams(Map<FilterKeyEnum, String> filters, ComponentTypeEnum assetType) {
-        List<String> params = new ArrayList<String>();
+        List<String> params = new ArrayList<>();
         if (1 == filters.size()) {
             params.add(assetType.getValue().toLowerCase());
             params.add(filters.keySet().iterator().next().getName());
@@ -1220,11 +1175,11 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
                 if (!subCategoryData.isPresent()) {
                     return Either.right(StorageOperationStatus.MATCH_NOT_FOUND);
                 }
-                return fetchByCategoryOrSubCategoryUid((String) subCategoryData.get().getLeft().getUniqueId(), NodeTypeEnum.ResourceSubcategory, GraphEdgeLabels.SUB_CATEGORY.getProperty(), NodeTypeEnum.Resource, inTransaction,
+                return fetchByCategoryOrSubCategoryUid((String) subCategoryData.get().getLeft().getUniqueId(), NodeTypeEnum.ResourceSubcategory, NodeTypeEnum.Resource, inTransaction,
                         ResourceMetadataData.class, resourceType);
             }
 
-            return fetchByCategoryOrSubCategoryName(subCategoryName, NodeTypeEnum.ResourceSubcategory, GraphEdgeLabels.SUB_CATEGORY.getProperty(), NodeTypeEnum.Resource, inTransaction, ResourceMetadataData.class, resourceType);
+            return fetchByCategoryOrSubCategoryName(subCategoryName, NodeTypeEnum.ResourceSubcategory, NodeTypeEnum.Resource, inTransaction, ResourceMetadataData.class, resourceType);
         }
         if (subcategories != null) {
             return fetchByMainCategory(subcategories.left().value(), inTransaction, resourceType);
@@ -1252,23 +1207,23 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         return childNodes.stream().filter(matchName).findAny();
     }
 
-    protected <T, S extends ComponentMetadataData> Either<List<T>, StorageOperationStatus> fetchByCategoryOrSubCategoryUid(String categoryUid, NodeTypeEnum categoryType, String categoryLabel, NodeTypeEnum neededType, boolean inTransaction,
-            Class<S> clazz, ResourceTypeEnum resourceType) {
+    protected <T, S extends ComponentMetadataData> Either<List<T>, StorageOperationStatus> fetchByCategoryOrSubCategoryUid(String categoryUid, NodeTypeEnum categoryType, NodeTypeEnum neededType, boolean inTransaction,
+                                                                                                                           Class<S> clazz, ResourceTypeEnum resourceType) {
         try {
             return collectComponents(neededType, categoryUid, categoryType, clazz, resourceType);
         } finally {
-            if (false == inTransaction) {
+            if (!inTransaction) {
                 titanDao.commit();
             }
         }
     }
 
-    protected <T, S extends ComponentMetadataData> Either<List<T>, StorageOperationStatus> fetchByCategoryOrSubCategoryName(String categoryName, NodeTypeEnum categoryType, String categoryLabel, NodeTypeEnum neededType, boolean inTransaction,
-            Class<S> clazz, ResourceTypeEnum resourceType) {
+    protected <T, S extends ComponentMetadataData> Either<List<T>, StorageOperationStatus> fetchByCategoryOrSubCategoryName(String categoryName, NodeTypeEnum categoryType, NodeTypeEnum neededType, boolean inTransaction,
+                                                                                                                            Class<S> clazz, ResourceTypeEnum resourceType) {
         List<T> components = new ArrayList<>();
         try {
             Class categoryClazz = categoryType == NodeTypeEnum.ServiceNewCategory ? CategoryData.class : SubCategoryData.class;
-            Map<String, Object> props = new HashMap<String, Object>();
+            Map<String, Object> props = new HashMap<>();
             props.put(GraphPropertiesDictionary.NORMALIZED_NAME.getProperty(), ValidationUtils.normalizeCategoryName4Uniqueness(categoryName));
             Either<List<GraphNode>, TitanOperationStatus> getCategory = titanGenericDao.getByCriteria(categoryType, props, categoryClazz);
             if (getCategory.isRight()) {
@@ -1284,12 +1239,13 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
 
             return Either.left(components);
         } finally {
-            if (false == inTransaction) {
+            if (!inTransaction) {
                 titanDao.commit();
             }
         }
     }
 
+
     private <T, S extends ComponentMetadataData> Either<List<T>, StorageOperationStatus> collectComponents(NodeTypeEnum neededType, String categoryUid, NodeTypeEnum categoryType, Class<S> clazz, ResourceTypeEnum resourceType) {
         List<T> components = new ArrayList<>();
         Either<List<ImmutablePair<S, GraphEdge>>, TitanOperationStatus> parentNodes = titanGenericDao.getParentNodes(UniqueIdBuilder.getKeyByNodeType(categoryType), categoryUid, GraphEdgeLabels.CATEGORY, neededType, clazz);
@@ -1298,9 +1254,10 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
                 ComponentMetadataDataDefinition componentData = component.getLeft().getMetadataDataDefinition();
                 Boolean isHighest = componentData.isHighestVersion();
                 boolean isMatchingResourceType = isMatchingByResourceType(neededType, resourceType, componentData);
-                boolean isDeleted = componentData.isDeleted() != null && componentData.isDeleted();
+                boolean isDeleted = isTrue(componentData.isDeleted());
+                boolean isArchived = isTrue(componentData.isArchived());
 
-                if (isHighest && isMatchingResourceType && !isDeleted) {
+                if (isHighest && isMatchingResourceType && !isDeleted && !isArchived) {
                     Either<T, StorageOperationStatus> result = (Either<T, StorageOperationStatus>) toscaOperationFacade.getToscaElement(componentData.getUniqueId(), JsonParseFlagEnum.ParseMetadata);
                     if (result.isRight()) {
                         return Either.right(result.right().value());
@@ -1331,7 +1288,7 @@ public class ElementBusinessLogic extends BaseBusinessLogic {
         List<T> components = new ArrayList<>();
 
         for (ImmutablePair<SubCategoryData, GraphEdge> subCategory : subcategories) {
-            Either<List<T>, StorageOperationStatus> fetched = fetchByCategoryOrSubCategoryUid((String) subCategory.getLeft().getUniqueId(), NodeTypeEnum.ResourceSubcategory, GraphEdgeLabels.SUB_CATEGORY.getProperty(), NodeTypeEnum.Resource,
+            Either<List<T>, StorageOperationStatus> fetched = fetchByCategoryOrSubCategoryUid((String) subCategory.getLeft().getUniqueId(), NodeTypeEnum.ResourceSubcategory, NodeTypeEnum.Resource,
                     inTransaction, ResourceMetadataData.class, resourceType);
             if (fetched.isRight()) {
                 continue;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ExternalRefsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ExternalRefsBusinessLogic.java
index d8626ff591..0b53da0018 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ExternalRefsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ExternalRefsBusinessLogic.java
@@ -1,24 +1,21 @@
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
+import org.openecomp.sdc.be.components.validation.AccessValidations;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.GraphPropertyEnum;
-import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.dto.ExternalRefDTO;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.jsontitan.operations.ExternalReferencesOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.model.operations.impl.GraphLockOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import fj.data.Either;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by yavivi on 04/02/2018.
@@ -26,16 +23,18 @@ import fj.data.Either;
 @org.springframework.stereotype.Component
 public class ExternalRefsBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(ExternalRefsBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ExternalRefsBusinessLogic.class);
 
-    private ExternalReferencesOperation externalReferencesOperation;
-    private ToscaOperationFacade toscaOperationFacade;
-    private GraphLockOperation graphLockOperation;
+    private final ExternalReferencesOperation externalReferencesOperation;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final AccessValidations accessValidations;
+    private final ComponentLocker componentLocker;
 
-    public ExternalRefsBusinessLogic(ExternalReferencesOperation externalReferencesOperation, ToscaOperationFacade toscaOperationFacade, GraphLockOperation graphLockOperation){
+    public ExternalRefsBusinessLogic(ExternalReferencesOperation externalReferencesOperation, ToscaOperationFacade toscaOperationFacade, AccessValidations accessValidations, ComponentLocker componentLocker) {
         this.externalReferencesOperation = externalReferencesOperation;
         this.toscaOperationFacade = toscaOperationFacade;
-        this.graphLockOperation = graphLockOperation;
+        this.accessValidations = accessValidations;
+        this.componentLocker = componentLocker;
     }
 
     public Either<List<String>, ActionStatus> getExternalReferences(String assetUuid, String version, String componentInstanceName, String objectType){
@@ -63,21 +62,20 @@ public class ExternalRefsBusinessLogic {
         }
     }
 
-    public Either<String, ActionStatus> addExternalReference(String uuid, String componentInstanceName, String objectType, ExternalRefDTO ref) {
-        return this.doAction("POST", uuid, componentInstanceName, objectType, ref.getReferenceUUID(), "");
+    public Either<String, ActionStatus> addExternalReference(ComponentTypeEnum componentType, String userId, String uuid, String componentInstanceName, String objectType, ExternalRefDTO ref) {
+        return this.doAction(componentType, userId, "POST", uuid, componentInstanceName, objectType, ref.getReferenceUUID(), "");
     }
 
-
-    public Either<String, ActionStatus> deleteExternalReference(String uuid, String componentInstanceName, String objectType, String reference) {
-        return this.doAction("DELETE", uuid, componentInstanceName, objectType, reference, "");
+    public Either<String, ActionStatus> deleteExternalReference(ComponentTypeEnum componentType, String userId, String uuid, String componentInstanceName, String objectType, String reference) {
+        return this.doAction(componentType, userId, "DELETE", uuid, componentInstanceName, objectType, reference, "");
     }
 
-    public Either<String, ActionStatus> updateExternalReference(String uuid, String componentInstanceName, String objectType, String oldRefValue, String newRefValue) {
-        return this.doAction("PUT", uuid, componentInstanceName, objectType, oldRefValue, newRefValue);
+    public Either<String, ActionStatus> updateExternalReference(ComponentTypeEnum componentType, String userId, String uuid, String componentInstanceName, String objectType, String oldRefValue, String newRefValue) {
+        return this.doAction(componentType, userId, "PUT", uuid, componentInstanceName, objectType, oldRefValue, newRefValue);
     }
 
-    private Either<String, ActionStatus> doAction(String action, String uuid, String componentInstanceName, String objectType, String ref1, String ref2){
-        Either<Component, StorageOperationStatus> latestServiceByUuid = toscaOperationFacade.getLatestComponentByUuid(uuid, createPropsToMatch());
+    private Either<String, ActionStatus> doAction(ComponentTypeEnum componentType, String userId, String action, String uuid, String componentInstanceName, String objectType, String ref1, String ref2){
+        Either<Component, StorageOperationStatus> latestServiceByUuid = toscaOperationFacade.getLatestComponentByUuid(uuid, createPropsToMatch(componentType));
         if (latestServiceByUuid == null || latestServiceByUuid.isRight()){
             return Either.right(ActionStatus.RESOURCE_NOT_FOUND);
         }
@@ -87,10 +85,8 @@ public class ExternalRefsBusinessLogic {
         String uniqueId = component.getUniqueId();
 
         //Lock Asset
-        StorageOperationStatus lockStatus = this.graphLockOperation.lockComponent(uniqueId, NodeTypeEnum.Service);
-        if (lockStatus != StorageOperationStatus.OK){
-            return Either.right(ActionStatus.GENERAL_ERROR);
-        }
+        this.componentLocker.lock(component);
+        this.accessValidations.validateUserCanWorkOnComponent(component, userId, action + " EXTERNAL REF");
 
         Either<String, ActionStatus> opResult = Either.right(ActionStatus.GENERAL_ERROR);
         try {
@@ -113,14 +109,14 @@ public class ExternalRefsBusinessLogic {
             log.error("Cause is:" , e);
         } finally {
             //Unlock Asset
-            this.graphLockOperation.unlockComponent(uniqueId, NodeTypeEnum.Service);
+            this.componentLocker.unlock(uniqueId, componentType);
         }
         return opResult;
     }
 
-    private Map<GraphPropertyEnum, Object> createPropsToMatch() {
+    private Map<GraphPropertyEnum, Object> createPropsToMatch(ComponentTypeEnum componentType) {
         Map<GraphPropertyEnum, Object> propertiesToMatch = new HashMap<>();
-        propertiesToMatch.put(GraphPropertyEnum.COMPONENT_TYPE, ComponentTypeEnum.SERVICE.name());
+        propertiesToMatch.put(GraphPropertyEnum.COMPONENT_TYPE, componentType.name());
         propertiesToMatch.put(GraphPropertyEnum.STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
         return propertiesToMatch;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java
index 313a117add..f2d0d94418 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogic.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,22 +20,7 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import static java.util.stream.Collectors.toList;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -43,6 +28,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.components.impl.lock.LockingTransactional;
+import org.openecomp.sdc.be.components.impl.policy.PolicyTargetsUpdateHandler;
 import org.openecomp.sdc.be.components.utils.Utils;
 import org.openecomp.sdc.be.components.validation.AccessValidations;
 import org.openecomp.sdc.be.components.validation.ComponentValidations;
@@ -51,74 +38,65 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.CreatedFrom;
 import org.openecomp.sdc.be.info.ArtifactDefinitionInfo;
 import org.openecomp.sdc.be.info.ArtifactTemplateInfo;
 import org.openecomp.sdc.be.info.GroupDefinitionInfo;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.GroupDefinition;
-import org.openecomp.sdc.be.model.GroupInstance;
-import org.openecomp.sdc.be.model.GroupInstanceProperty;
-import org.openecomp.sdc.be.model.GroupProperty;
-import org.openecomp.sdc.be.model.GroupTypeDefinition;
-import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.PropertyDefinition.GroupInstancePropertyValueUpdateBehavior;
 import org.openecomp.sdc.be.model.PropertyDefinition.PropertyNames;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
-import org.openecomp.sdc.be.model.jsontitan.operations.ArtifactsOperations;
 import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.TopologyTemplateOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
-import org.openecomp.sdc.be.model.operations.impl.GroupTypeOperation;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toList;
+import static org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter.extractCapabilitiesFromGroups;
+import static org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter.extractCapabilityPropertiesFromGroups;
 
 @org.springframework.stereotype.Component("groupBusinessLogic")
 public class GroupBusinessLogic extends BaseBusinessLogic {
+
     public static final String GROUP_DELIMITER_REGEX = "\\.\\.";
-    private static String ADDING_GROUP = "AddingGroup";
 
     public static final String INITIAL_VERSION = "1";
 
+    private static final String ADDING_GROUP = "AddingGroup";
+
     private static final String CREATE_GROUP = "CreateGroup";
 
     private static final String UPDATE_GROUP = "UpdateGroup";
 
     private static final String GET_GROUP = "GetGroup";
 
-    private static final String DELETE_GROUP = "GetGroup";
+    private static final String DELETE_GROUP = "DeleteGroup";
 
-    private static final Logger log = LoggerFactory.getLogger(GroupBusinessLogic.class);
-
-    @javax.annotation.Resource
+    private static final Logger log = Logger.getLogger(GroupBusinessLogic.class);
+    @Autowired
     private AccessValidations accessValidations;
 
     @javax.annotation.Resource
-    private GroupTypeOperation groupTypeOperation;
-
-    @Autowired
-    private ArtifactsOperations artifactsOperation;
-
     @Autowired
     private GroupsOperation groupsOperation;
+
     @Autowired
-    private ApplicationDataTypeCache dataTypeCache;
+    PolicyTargetsUpdateHandler policyTargetsUpdateHandler;
 
     private String getComponentTypeForResponse(org.openecomp.sdc.be.model.Component component) {
         String componentTypeForResponse = "SERVICE";
@@ -147,7 +125,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
         }
 
-        List<String> currentArtifacts = deploymentArtifacts.values().stream().map(p -> p.getUniqueId()).collect(toList());
+        List<String> currentArtifacts = deploymentArtifacts.values().stream().map(ArtifactDefinition::getUniqueId).collect(toList());
         log.debug("The deployment artifacts of component {} are {}", component.getNormalizedName(), deploymentArtifacts);
         if (!currentArtifacts.containsAll(artifacts)) {
             BeEcompErrorManager.getInstance().logInvalidInputError(context, "Not all artifacts belongs to component " + component.getNormalizedName(), ErrorSeverity.INFO);
@@ -178,7 +156,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
 
         List<ComponentInstance> componentInstances = component.getComponentInstances();
         if (CollectionUtils.isNotEmpty(componentInstances)) {
-            Map<String, ComponentInstance> compInstUidToCompInstMap = componentInstances.stream().collect(Collectors.toMap(p -> p.getUniqueId(), p -> p));
+            Map<String, ComponentInstance> compInstUidToCompInstMap = componentInstances.stream().collect(Collectors.toMap(ComponentInstance::getUniqueId, p -> p));
 
             Set<String> allCompInstances = compInstUidToCompInstMap.keySet();
 
@@ -218,11 +196,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         Either<GroupDefinition, ResponseFormat> result = null;
         try {
             // Validate user exist
-            Either<User, ResponseFormat> validateUserExists = validateUserExists(user.getUserId(), UPDATE_GROUP, inTransaction);
-            if (validateUserExists.isRight()) {
-                result = Either.right(validateUserExists.right().value());
-                return result;
-            }
+            validateUserExists(user.getUserId(), UPDATE_GROUP, inTransaction);
             // Validate component exist
             Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(componentId, componentType, null);
             if (validateComponent.isRight()) {
@@ -268,7 +242,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             return result;
 
         } finally {
-            if (result.isLeft()) {
+            if (result != null && result.isLeft()) {
                 titanDao.commit();
             } else {
                 titanDao.rollback();
@@ -320,239 +294,6 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
     }
 
     /**
-     * Validate and Update Group Property
-     *
-     * @param componentId
-     * @param groupUniqueId
-     * @param user
-     * @param componentType
-     * @param groupPropertiesToUpdate
-     * @param inTransaction
-     * @return
-     */
-    public Either<List<GroupProperty>, ResponseFormat> validateAndUpdateGroupProperties(String componentId, String groupUniqueId, User user, ComponentTypeEnum componentType, List<GroupProperty> groupPropertiesToUpdate, boolean inTransaction) {
-
-        Either<List<GroupProperty>, ResponseFormat> result = Either.left(groupPropertiesToUpdate);
-        try {
-            Optional<GroupDefinition> optionalGroupConnectedToVf = null;
-            GroupDefinition currentGroup = null;
-            StorageOperationStatus lockResult = graphLockOperation.lockComponent(componentId, componentType.getNodeType());
-            if (lockResult != StorageOperationStatus.OK) {
-                result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockResult, componentType), componentId));
-            }
-            if (result.isLeft()) {
-                // VF exist because lock succedded
-                Resource vf = (Resource) toscaOperationFacade.getToscaElement(componentId).left().value();
-                optionalGroupConnectedToVf =
-                        // All groups on resource
-                        vf.getGroups().stream().
-                        // Filter in group sent is part of VF groups
-                                filter(e -> e.getUniqueId().equals(groupUniqueId)).
-                                // Collect
-                                findAny();
-                if (!optionalGroupConnectedToVf.isPresent()) {
-                    result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GROUP_IS_MISSING, groupUniqueId, vf.getName(), ComponentTypeEnum.RESOURCE.getValue()));
-                }
-            }
-
-            if (result.isLeft()) {
-                currentGroup = optionalGroupConnectedToVf.get();
-                result = validateGroupPropertyAndResetEmptyValue(currentGroup, groupPropertiesToUpdate);
-            }
-            if (result.isLeft()) {
-                result = updateGroupPropertiesValue(componentId, currentGroup, groupPropertiesToUpdate, inTransaction);
-                if (result.isRight()) {
-                    BeEcompErrorManager.getInstance().logBeSystemError("Update GroupProperties");
-                    log.debug("failed to update Vf {}", componentId);
-                }
-            }
-
-        } catch (Exception e) {
-            log.debug("Error in validateAndUpdateGroupProperty {}", e);
-            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
-        } finally {
-            graphLockOperation.unlockComponent(componentId, componentType.getNodeType());
-        }
-        return result;
-    }
-
-    private void resetEmptyValueWithDefaults(List<GroupProperty> groupPropertiesToUpdate, GroupDefinition originalGroup) {
-        Map<String, GroupProperty> originalProperties =
-                // Stream of original properties from group
-                originalGroup.convertToGroupProperties().stream().
-                // Collecting to map with name as key
-                        collect(Collectors.toMap(e -> e.getName(), e -> e));
-        for (GroupProperty gp : groupPropertiesToUpdate) {
-            if (StringUtils.isEmpty(gp.getValue())) {
-                gp.setValue(originalProperties.get(gp.getName()).getDefaultValue());
-            }
-        }
-
-    }
-
-    private Either<List<GroupProperty>, ResponseFormat> validateGroupPropertyAndResetEmptyValue(GroupDefinition originalGroup, List<GroupProperty> groupPropertiesToUpdate) {
-
-        Either<List<GroupProperty>, ResponseFormat> ret = validateOnlyValueChanged(groupPropertiesToUpdate, originalGroup);
-        if (ret.isLeft()) {
-            resetEmptyValueWithDefaults(groupPropertiesToUpdate, originalGroup);
-        }
-        if (ret.isLeft()) {
-            // Validate Type Match Value
-            Optional<StorageOperationStatus> optionalError =
-                    // Stream of group properties
-                    groupPropertiesToUpdate.stream().
-                    // Validate each and map to returned Strorage status value
-                            map(e -> groupOperation.validateAndUpdatePropertyValue(e)).
-                            // Keep only failed result if there is such
-                            filter(e -> e != StorageOperationStatus.OK).
-                            // collect
-                            findFirst();
-            if (optionalError.isPresent()) {
-                ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(optionalError.get());
-                ret = Either.right(componentsUtils.getResponseFormat(actionStatus));
-            }
-
-        }
-        if (ret.isLeft()) {
-            // Validate min max ect...
-            ret = validatePropertyBusinessLogic(groupPropertiesToUpdate, originalGroup);
-        }
-
-        return ret;
-    }
-
-    private Either<List<GroupProperty>, ResponseFormat> validatePropertyBusinessLogic(List<GroupProperty> groupPropertiesToUpdate, GroupDefinition originalGroup) {
-
-        Either<List<GroupProperty>, ResponseFormat> ret = Either.left(groupPropertiesToUpdate);
-
-        Map<PropertyNames, String> nameValueMap = new HashMap<>();
-        for (GroupProperty gp : groupPropertiesToUpdate) {
-            // Filter out non special properties which does not have Enum
-            final PropertyNames gpEnum = PropertyNames.findName(gp.getName());
-            if (gpEnum != null) {
-                nameValueMap.put(gpEnum, gp.getValue());
-            }
-        }
-
-        if (!MapUtils.isEmpty(nameValueMap)) {
-
-            if (nameValueMap.containsKey(PropertyNames.INITIAL_COUNT) || nameValueMap.containsKey(PropertyNames.MAX_INSTANCES) || nameValueMap.containsKey(PropertyNames.MIN_INSTANCES)) {
-
-                Map<PropertyNames, String> oldValueMap = prepareMapWithOriginalProperties(originalGroup);
-
-                Either<Boolean, ResponseFormat> eitherValid = validateMinMaxAndInitialCountPropertyLogicVF(nameValueMap, oldValueMap);
-                if (eitherValid.isRight()) {
-                    ret = Either.right(eitherValid.right().value());
-                }
-            }
-            if (ret.isLeft() && (nameValueMap.containsKey(PropertyNames.VF_MODULE_DESCRIPTION) || nameValueMap.containsKey(PropertyNames.VF_MODULE_LABEL))) {
-
-                Optional<ResponseFormat> optionalError =
-                        // Stream of group Properties
-                        groupPropertiesToUpdate.stream().
-                        // Filter in only properties that needs text validation
-                                filter(e -> enumHasValueFilter(e.getName(), enumName -> PropertyNames.findName(enumName), PropertyNames.VF_MODULE_DESCRIPTION, PropertyNames.VF_MODULE_LABEL)).
-                                // validate text properties
-                                map(e -> validateFreeText(e)).
-                                // filter in only errors if exist
-                                filter(e -> e.isRight()).
-                                // map the Either value to the Error
-                                map(e -> e.right().value())
-                                // collect
-                                .findFirst();
-                if (optionalError.isPresent()) {
-                    ret = Either.right(optionalError.get());
-                }
-
-            }
-        }
-
-        return ret;
-    }
-
-    private Map<PropertyNames, String> prepareMapWithOriginalProperties(GroupDefinition originalGroup) {
-        Map<PropertyNames, String> oldValueMap = new HashMap<>();
-        PropertyNames[] propertiesToCheck = new PropertyNames[] { PropertyNames.INITIAL_COUNT, PropertyNames.MAX_INSTANCES, PropertyNames.MIN_INSTANCES };
-
-        for (GroupProperty gp : originalGroup.convertToGroupProperties()) {
-            if (enumHasValueFilter(gp.getName(), PropertyNames::findName, propertiesToCheck)) {
-                oldValueMap.put(PropertyNames.findName(gp.getName()), gp.getValue());
-            }
-        }
-        if (StringUtils.isEmpty(oldValueMap.get(PropertyNames.MAX_INSTANCES))) {
-            oldValueMap.put(PropertyNames.MAX_INSTANCES, String.valueOf(Integer.MAX_VALUE));
-        }
-        return oldValueMap;
-    }
-
-    private Either<List<GroupProperty>, ResponseFormat> validateOnlyValueChanged(List<GroupProperty> groupPropertiesToUpdate, GroupDefinition originalGroup) {
-
-        Either<List<GroupProperty>, ResponseFormat> ret = Either.left(groupPropertiesToUpdate);
-        if (CollectionUtils.isEmpty(groupPropertiesToUpdate)) {
-            ret = Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND, StringUtils.EMPTY));
-        } else if (CollectionUtils.isEmpty(originalGroup.getProperties())) {
-            ret = Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND, groupPropertiesToUpdate.get(NumberUtils.INTEGER_ZERO).getName()));
-        } else {
-            Map<String, GroupProperty> namePropertyMap =
-                    // Original Group Properties Stream
-                    originalGroup.convertToGroupProperties().stream().
-                    // Collect to map with name as key
-                            collect(Collectors.toMap(e -> e.getName(), e -> e));
-
-            Optional<GroupProperty> optionalMissingProperty =
-                    // Group Properties to be updated Stream
-                    groupPropertiesToUpdate.stream().
-                    // Filter in property that is not contained in original if there is such
-                            filter(e -> !namePropertyMap.containsKey(e.getName())).
-                            // collect
-                            findFirst();
-
-            if (optionalMissingProperty.isPresent()) {
-                ret = Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND, optionalMissingProperty.get().getName()));
-            } else {
-                Optional<GroupProperty> optionalNonValueChange =
-                        // groups to be updated stream
-                        groupPropertiesToUpdate.stream().
-                        // filter in only properties with non-value (illegal) change
-                                filter(e -> !isOnlyGroupPropertyValueChanged(e, namePropertyMap.get(e.getName()))).
-                                // Collect
-                                findFirst();
-                if (optionalNonValueChange.isPresent()) {
-                    ret = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_PROPERTY, optionalNonValueChange.get().getName()));
-
-                }
-            }
-
-        }
-        return ret;
-    }
-
-    /**
-     * if groupProperty are the same or if only value is different returns true, otherwise returns false.
-     *
-     * @param groupProperty
-     * @param groupProperty2
-     * @return
-     */
-    private boolean isOnlyGroupPropertyValueChanged(GroupProperty groupProperty, GroupProperty groupProperty2) {
-        // Create 2 duplicates for groupPropery and reset their values
-        try {
-            GroupProperty groupPropertyDuplicate = new GroupProperty(groupProperty);
-            groupPropertyDuplicate.setValue(null);
-            groupPropertyDuplicate.setSchema(null);
-            groupPropertyDuplicate.setParentUniqueId(null);
-            GroupProperty groupProperty2Duplicate = new GroupProperty(groupProperty2);
-            groupProperty2Duplicate.setValue(null);
-            groupProperty2Duplicate.setSchema(null);
-            groupProperty2Duplicate.setParentUniqueId(null);
-            return groupPropertyDuplicate.equals(groupProperty2Duplicate) && StringUtils.equals(groupPropertyDuplicate.getValueUniqueUid(), groupProperty2Duplicate.getValueUniqueUid());
-        } catch (Exception e) {
-            log.debug("Failed validate group properties. ", e);
-            return false;
-        }
-    }
-
-    /**
      * Validate and update GroupDefinition metadata
      *
      * @param currentGroup
@@ -659,16 +400,9 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         Either<GroupDefinitionInfo, ResponseFormat> result = null;
 
         // Validate user exist
-        Either<User, ResponseFormat> validateUserExists = validateUserExists(userId, GET_GROUP, true);
-
-        if (validateUserExists.isRight()) {
-            result = Either.right(validateUserExists.right().value());
-            return result;
-        }
-
+        validateUserExists(userId, GET_GROUP, true);
         // Validate component exist
         org.openecomp.sdc.be.model.Component component = null;
-        String realComponentId = componentId;
 
         try {
             ComponentParametersView componentParametersView = new ComponentParametersView();
@@ -677,7 +411,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             componentParametersView.setIgnoreArtifacts(false);
             componentParametersView.setIgnoreUsers(false);
 
-            Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(realComponentId, componentType, componentParametersView);
+            Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(componentId, componentType, componentParametersView);
             if (validateComponent.isRight()) {
                 result = Either.right(validateComponent.right().value());
                 return result;
@@ -714,12 +448,12 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
 
             Map<String, ArtifactDefinition> deploymentArtifacts = null;
             if (MapUtils.isNotEmpty(component.getDeploymentArtifacts())) {
-                deploymentArtifacts = component.getDeploymentArtifacts().values().stream().collect(Collectors.toMap(a -> a.getUniqueId(), a -> a));
+                deploymentArtifacts = component.getDeploymentArtifacts().values().stream().collect(Collectors.toMap(ArtifactDataDefinition::getUniqueId, a -> a));
             }
 
             if (artifactsIds != null && !artifactsIds.isEmpty()) {
                 for (String id : artifactsIds) {
-                    if (MapUtils.isEmpty(deploymentArtifacts) || !deploymentArtifacts.containsKey(id)) {
+                    if (deploymentArtifacts == null || !deploymentArtifacts.containsKey(id)) {
                         log.debug("Failed to get artifact {} . Status is {} ", id, StorageOperationStatus.NOT_FOUND);
                         ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.NOT_FOUND));
                         result = Either.right(responseFormat);
@@ -777,36 +511,9 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         return result;
     }
 
-    public String getAsString(List<String> list) {
-
-        if (list == null || list.isEmpty()) {
-            return "";
-        }
-        StringBuilder builder = new StringBuilder();
-        list.forEach(p -> builder.append(p + ","));
-
-        String result = builder.toString();
-        return result.substring(0, result.length());
-
-    }
-
-
-    private Either<List<GroupProperty>, ResponseFormat> updateGroupPropertiesValue(String componentId, GroupDefinition currentGroup, List<GroupProperty> groupPropertyToUpdate, boolean inTransaction) {
-        Either<List<GroupProperty>, ResponseFormat> result;
-
-        Either<List<GroupProperty>, StorageOperationStatus> eitherUpdate = groupsOperation.updateGroupPropertiesOnComponent(componentId, currentGroup, groupPropertyToUpdate);
-        if (eitherUpdate.isRight()) {
-            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(eitherUpdate.right().value());
-            result = Either.right(componentsUtils.getResponseFormat(actionStatus));
-        } else {
-            result = Either.left(eitherUpdate.left().value());
-        }
-        return result;
-    }
-
     public Either<Boolean, ResponseFormat> validateGenerateVfModuleGroupNames(List<ArtifactTemplateInfo> allGroups, String resourceSystemName, int startGroupCounter) {
         Either<Boolean, ResponseFormat> validateGenerateGroupNamesRes = Either.left(true);
-        Collections.sort(allGroups, (art1, art2) -> ArtifactTemplateInfo.compareByGroupName(art1, art2));
+        Collections.sort(allGroups, ArtifactTemplateInfo::compareByGroupName);
         for (ArtifactTemplateInfo group : allGroups) {
             Either<String, ResponseFormat> validateGenerateGroupNameRes = validateGenerateVfModuleGroupName(resourceSystemName, group.getDescription(), startGroupCounter++);
             if (validateGenerateGroupNameRes.isRight()) {
@@ -837,7 +544,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         return validateGenerateGroupNameRes;
     }
 
-    public Either<Map<String, GroupDefinition>, ResponseFormat> validateUpdateVfGroupNames(Map<String, GroupDefinition> groups, String resourceSystemName) {
+    Either<Map<String, GroupDefinition>, ResponseFormat> validateUpdateVfGroupNames(Map<String, GroupDefinition> groups, String resourceSystemName) {
 
         Map<String, GroupDefinition> updatedNamesGroups = new HashMap<>();
         Either<Map<String, GroupDefinition>, ResponseFormat> result = Either.left(updatedNamesGroups);
@@ -884,12 +591,12 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         if (groups != null && !groups.isEmpty()) {
             List<Integer> counters = groups.stream().filter(group -> Pattern.compile(Constants.MODULE_NEW_NAME_PATTERN).matcher(group.getName()).matches() || Pattern.compile(Constants.MODULE_OLD_NAME_PATTERN).matcher(group.getName()).matches())
                     .map(group -> Integer.parseInt(group.getName().split(Constants.MODULE_NAME_DELIMITER)[1])).collect(toList());
-            counter = (counters == null || counters.isEmpty()) ? 0 : counters.stream().max((a, b) -> Integer.compare(a, b)).get() + 1;
+            counter = (counters == null || counters.isEmpty()) ? 0 : counters.stream().max(Integer::compare).get() + 1;
         }
         return counter;
     }
 
-    public Either<List<GroupDefinition>, ResponseFormat> validateUpdateVfGroupNamesOnGraph(List<GroupDefinition> groups, Component component, boolean inTransaction) {
+    public Either<List<GroupDefinition>, ResponseFormat> validateUpdateVfGroupNamesOnGraph(List<GroupDefinition> groups, Component component) {
         List<GroupDefinition> updatedGroups = new ArrayList<>();
         Either<List<GroupDefinition>, ResponseFormat> result = Either.left(updatedGroups);
 
@@ -924,16 +631,9 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         Either<GroupDefinitionInfo, ResponseFormat> result = null;
 
         // Validate user exist
-        Either<User, ResponseFormat> validateUserExists = validateUserExists(userId, UPDATE_GROUP, true);
-
-        if (validateUserExists.isRight()) {
-            result = Either.right(validateUserExists.right().value());
-            return result;
-        }
-
+        validateUserExists(userId, UPDATE_GROUP, true);
         // Validate component exist
         org.openecomp.sdc.be.model.Component component = null;
-        String realComponentId = componentId;
 
         try {
             ComponentParametersView componentParametersView = new ComponentParametersView();
@@ -942,7 +642,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             componentParametersView.setIgnoreComponentInstances(false);
             componentParametersView.setIgnoreArtifacts(false);
 
-            Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(realComponentId, componentType, componentParametersView);
+            Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(componentId, componentType, componentParametersView);
             if (validateComponent.isRight()) {
                 result = Either.right(validateComponent.right().value());
                 return result;
@@ -1044,42 +744,6 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         return result;
     }
 
-    private int getLatestIntProperty(Map<PropertyNames, String> newValues, Map<PropertyNames, String> parentValues, PropertyNames propertyKey) {
-        String value;
-        if (newValues.containsKey(propertyKey)) {
-            value = newValues.get(propertyKey);
-        } else {
-            value = parentValues.get(propertyKey);
-        }
-        return Integer.valueOf(value);
-    }
-
-    private boolean isPropertyChanged(Map<PropertyNames, String> newValues, Map<PropertyNames, String> parentValues, final PropertyNames minInstances) {
-        return newValues.containsKey(minInstances) && !newValues.get(minInstances).equals(parentValues.get(minInstances));
-    }
-
-    private Either<Boolean, ResponseFormat> validateMinMaxAndInitialCountPropertyLogicVF(Map<PropertyNames, String> newValues, Map<PropertyNames, String> parentValues) {
-
-        int latestMaxInstances = getLatestIntProperty(newValues, parentValues, PropertyNames.MAX_INSTANCES);
-        int latestInitialCount = getLatestIntProperty(newValues, parentValues, PropertyNames.INITIAL_COUNT);
-        int latestMinInstances = getLatestIntProperty(newValues, parentValues, PropertyNames.MIN_INSTANCES);
-        Either<Boolean, ResponseFormat> result = Either.left(true);
-
-        if (isPropertyChanged(newValues, parentValues, PropertyNames.INITIAL_COUNT) && result.isLeft()
-                && (latestInitialCount > latestMaxInstances || latestInitialCount < latestMinInstances)) {
-            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_GROUP_INITIAL_COUNT_PROPERTY_VALUE, PropertyNames.INITIAL_COUNT.getPropertyName(), String.valueOf(latestMinInstances), String.valueOf(latestMaxInstances)));
-        }
-        if (isPropertyChanged(newValues, parentValues, PropertyNames.MAX_INSTANCES) && result.isLeft() &&
-                latestMaxInstances < latestInitialCount) {
-            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_GROUP_PROPERTY_VALUE_LOWER_HIGHER, PropertyNames.MAX_INSTANCES.getPropertyName(), "higher", String.valueOf(latestInitialCount)));
-        }
-        if (isPropertyChanged(newValues, parentValues, PropertyNames.MIN_INSTANCES) &&
-                result.isLeft() && latestMinInstances > latestInitialCount) {
-            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_GROUP_PROPERTY_VALUE_LOWER_HIGHER, PropertyNames.MIN_INSTANCES.getPropertyName(), "lower", String.valueOf(latestInitialCount)));
-        }
-        return result;
-    }
-
     private Either<Boolean, ResponseFormat> validateMinMaxAndInitialCountPropertyLogic(Map<PropertyNames, String> newValues, Map<PropertyNames, String> currValues, Map<PropertyNames, String> parentValues) {
 
         Either<Boolean, ResponseFormat> result;
@@ -1088,24 +752,24 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             if (currPropertyName == PropertyNames.MIN_INSTANCES) {
                 String minValue = parentValues.get(PropertyNames.MIN_INSTANCES);
                 String maxValue = newValues.containsKey(PropertyNames.INITIAL_COUNT) ? newValues.get(PropertyNames.MAX_INSTANCES) : currValues.get(PropertyNames.INITIAL_COUNT);
-                result = validateValueInRange(new ImmutablePair<PropertyNames, String>(currPropertyName, entry.getValue()), new ImmutablePair<PropertyNames, String>(PropertyNames.MIN_INSTANCES, minValue),
-                        new ImmutablePair<PropertyNames, String>(PropertyNames.MAX_INSTANCES, maxValue));
+                result = validateValueInRange(new ImmutablePair<>(currPropertyName, entry.getValue()), new ImmutablePair<>(PropertyNames.MIN_INSTANCES, minValue),
+                        new ImmutablePair<>(PropertyNames.MAX_INSTANCES, maxValue));
                 if (result.isRight()) {
                     return result;
                 }
             } else if (currPropertyName == PropertyNames.INITIAL_COUNT) {
                 String minValue = newValues.containsKey(PropertyNames.MIN_INSTANCES) ? newValues.get(PropertyNames.MIN_INSTANCES) : currValues.get(PropertyNames.MIN_INSTANCES);
                 String maxValue = newValues.containsKey(PropertyNames.MAX_INSTANCES) ? newValues.get(PropertyNames.MAX_INSTANCES) : currValues.get(PropertyNames.MAX_INSTANCES);
-                result = validateValueInRange(new ImmutablePair<PropertyNames, String>(currPropertyName, entry.getValue()), new ImmutablePair<PropertyNames, String>(PropertyNames.MIN_INSTANCES, minValue),
-                        new ImmutablePair<PropertyNames, String>(PropertyNames.MAX_INSTANCES, maxValue));
+                result = validateValueInRange(new ImmutablePair<>(currPropertyName, entry.getValue()), new ImmutablePair<>(PropertyNames.MIN_INSTANCES, minValue),
+                        new ImmutablePair<>(PropertyNames.MAX_INSTANCES, maxValue));
                 if (result.isRight()) {
                     return result;
                 }
             } else if (currPropertyName == PropertyNames.MAX_INSTANCES) {
                 String minValue = newValues.containsKey(PropertyNames.INITIAL_COUNT) ? newValues.get(PropertyNames.MIN_INSTANCES) : currValues.get(PropertyNames.INITIAL_COUNT);
                 String maxValue = parentValues.get(PropertyNames.MAX_INSTANCES);
-                result = validateValueInRange(new ImmutablePair<PropertyNames, String>(currPropertyName, entry.getValue()), new ImmutablePair<PropertyNames, String>(PropertyNames.MIN_INSTANCES, minValue),
-                        new ImmutablePair<PropertyNames, String>(PropertyNames.MAX_INSTANCES, maxValue));
+                result = validateValueInRange(new ImmutablePair<>(currPropertyName, entry.getValue()), new ImmutablePair<>(PropertyNames.MIN_INSTANCES, minValue),
+                        new ImmutablePair<>(PropertyNames.MAX_INSTANCES, maxValue));
                 if (result.isRight()) {
                     return result;
                 }
@@ -1149,10 +813,9 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
      *
      * @param oldGroupInstance
      * @param newProperties
-     * @param inTransaction
      * @return
      */
-    public Either<GroupInstance, ResponseFormat> validateAndUpdateGroupInstancePropertyValues(String componentId, String instanceId, GroupInstance oldGroupInstance, List<GroupInstanceProperty> newProperties, boolean inTransaction) {
+    public Either<GroupInstance, ResponseFormat> validateAndUpdateGroupInstancePropertyValues(String componentId, String instanceId, GroupInstance oldGroupInstance, List<GroupInstanceProperty> newProperties) {
 
         Either<GroupInstance, ResponseFormat> actionResult = null;
         Either<GroupInstance, StorageOperationStatus> updateGroupInstanceResult = null;
@@ -1179,7 +842,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
 
         Either<Boolean, ResponseFormat> validationRes = null;
         Either<List<GroupInstanceProperty>, ResponseFormat> actionResult;
-        Map<String, GroupInstanceProperty> existingProperties = oldGroupInstance.convertToGroupInstancesProperties().stream().collect(Collectors.toMap(p -> p.getName(), p -> p));
+        Map<String, GroupInstanceProperty> existingProperties = oldGroupInstance.convertToGroupInstancesProperties().stream().collect(Collectors.toMap(PropertyDataDefinition::getName, p -> p));
         Map<PropertyNames, String> newPropertyValues = new EnumMap<>(PropertyNames.class);
         List<GroupInstanceProperty> reducedProperties = new ArrayList<>();
         String currPropertyName;
@@ -1312,52 +975,54 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         }
     }
 
-    public GroupDefinition createGroup(String groupType, ComponentTypeEnum componentTypeEnum, String componentId,
+    @LockingTransactional
+    public GroupDefinition createGroup(String componentId, ComponentTypeEnum componentTypeEnum, String groupType,
                                        String userId) {
 
-        try {
-            Component component = accessValidations.validateUserCanWorkOnComponentAndLockIt(componentTypeEnum, componentId, userId, CREATE_GROUP);
+        Component component = accessValidations.validateUserCanWorkOnComponent(componentId, componentTypeEnum, userId, CREATE_GROUP);
 
-            validateGroupTypePerComponent(groupType, component);
+        validateGroupTypePerComponent(groupType, component);
 
-            GroupTypeDefinition groupTypeDefinition = groupTypeOperation.getLatestGroupTypeByType(groupType, false)
-                    .left()
-                    .on(se -> onGroupTypeNotFound(component));
+        GroupTypeDefinition groupTypeDefinition = groupTypeOperation.getLatestGroupTypeByType(groupType, false)
+                .left()
+                .on(se -> onGroupTypeNotFound(component));
 
-            boolean isFirstGroup = component.getGroups() == null;
-            GroupDefinition groupDefinition = new GroupDefinition();
-            groupDefinition.setType(groupType);
+        boolean hasExistingGroups = CollectionUtils.isNotEmpty(component.getGroups());
+        GroupDefinition groupDefinition = new GroupDefinition();
+        groupDefinition.setType(groupType);
 
-            //find next valid counter
-            int nextCounter = 0;
-            if (!isFirstGroup) {
-                nextCounter = getNewGroupCounter(component);
-            }
-            String name = TopologyTemplateOperation.buildSubComponentName(component.getName(), groupType, nextCounter);
-            groupDefinition.setName(name);
-
-            //Add default type properties
-            List<PropertyDefinition> groupTypeProperties = groupTypeDefinition.getProperties();
-            List<GroupProperty> properties = groupTypeProperties.stream()
-                    .map(GroupProperty::new)
-                    .collect(toList());
-            groupDefinition.convertFromGroupProperties(properties);
-
-            List<GroupDefinition> gdList;
-            if (isFirstGroup) {
-                gdList = createGroups(component, Arrays.asList(groupDefinition))
-                        .left()
-                        .on(this::onFailedGroupDBOperation);
-            } else {
-                gdList = addGroups(component, Arrays.asList(groupDefinition))
-                        .left()
-                        .on(this::onFailedGroupDBOperation);
-            }
-            return gdList.get(0);
-        } finally {
-            titanDao.commit();
-            graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
+        //find next valid counter
+        int nextCounter = 0;
+        if (hasExistingGroups) {
+            nextCounter = getNewGroupCounter(component);
+        }
+        String name = TopologyTemplateOperation.buildSubComponentName(component.getName(), groupType, nextCounter);
+        groupDefinition.setName(name);
+        groupDefinition.setDescription(groupTypeDefinition.getDescription());
+        groupDefinition.setInvariantName(name);
+        groupDefinition.setCreatedFrom(CreatedFrom.UI);
+
+        //Add default type properties
+        List<PropertyDefinition> groupTypeProperties = groupTypeDefinition.getProperties();
+        List<GroupProperty> properties = groupTypeProperties.stream()
+                .map(GroupProperty::new)
+                .collect(toList());
+        groupDefinition.convertFromGroupProperties(properties);
+
+        groupDefinition.convertCapabilityDefinitions(groupTypeDefinition.getCapabilities());
+
+        List<GroupDefinition> gdList;
+        if (toscaOperationFacade.canAddGroups(componentId)) {
+            gdList = addGroups(component, Arrays.asList(groupDefinition), false)
+                    .left()
+                    .on(this::onFailedGroupDBOperation);
+        } else {
+            //createGroups also creates an edge and vertex to store group data
+            gdList = createGroups(component, Arrays.asList(groupDefinition), false)
+                    .left()
+                    .on(this::onFailedGroupDBOperation);
         }
+        return gdList.get(0);
     }
 
     private void validateGroupTypePerComponent(String groupType, Component component) {
@@ -1391,28 +1056,23 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         return Utils.getNextCounter(existingIds);
     }
 
-    public GroupDefinition updateGroup(ComponentTypeEnum componentTypeEnum, String componentId, String groupId,
+    @LockingTransactional
+    public GroupDefinition updateGroup(String componentId, ComponentTypeEnum componentTypeEnum, String groupId,
                                        String userId, GroupDefinition updatedGroup) {
-        try {
-            Component component = accessValidations.validateUserCanWorkOnComponentAndLockIt(componentTypeEnum, componentId, userId, UPDATE_GROUP);
-
-            GroupDefinition existingGroup = findGroupOnComponent(component, groupId)
-                    .left()
-                    .on(se -> onGroupNotFoundInComponentError(component, groupId));
+        Component component = accessValidations.validateUserCanWorkOnComponent(componentId, componentTypeEnum, userId, UPDATE_GROUP);
 
-            String existingGroupName = existingGroup.getName();
-            String updatedGroupName = updatedGroup.getName();
-            assertNewNameIsValidAndUnique(existingGroupName, updatedGroupName, component);
-            existingGroup.setName(updatedGroupName);
+        GroupDefinition existingGroup = findGroupOnComponent(component, groupId)
+                .left()
+                .on(se -> onGroupNotFoundInComponentError(component, groupId));
 
-            return updateGroup(component, existingGroup, existingGroupName)
-                    .left()
-                    .on(this::onFailedUpdateGroupDBOperation);
-        } finally {
-            titanDao.commit();
-            graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
-        }
+        String existingGroupName = existingGroup.getName();
+        String updatedGroupName = updatedGroup.getName();
+        assertNewNameIsValidAndUnique(existingGroupName, updatedGroupName, component);
+        existingGroup.setName(updatedGroupName);
 
+        return updateGroup(component, existingGroup, existingGroupName)
+                .left()
+                .on(this::onFailedUpdateGroupDBOperation);
     }
 
     private void assertNewNameIsValidAndUnique(String currentGroupName, String updatedGroupName, Component component) {
@@ -1427,23 +1087,21 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
         }
     }
 
-    public GroupDefinition deleteGroup(ComponentTypeEnum componentTypeEnum, String componentId, String groupId,
-                                                                     String userId) {
-        try {
-            Component component = accessValidations.validateUserCanWorkOnComponentAndLockIt(componentTypeEnum, componentId, userId, DELETE_GROUP);
+    @LockingTransactional
+    public GroupDefinition deleteGroup(String componentId, ComponentTypeEnum componentTypeEnum, String groupId,
+                                       String userId) {
+        Component component = accessValidations.validateUserCanWorkOnComponent(componentId, componentTypeEnum, userId, DELETE_GROUP);
 
-            GroupDefinition groupDefinition = findGroupOnComponent(component, groupId)
-                    .left()
-                    .on(se -> onGroupNotFoundInComponentError(component, groupId));
+        GroupDefinition groupDefinition = findGroupOnComponent(component, groupId)
+                .left()
+                .on(se -> onGroupNotFoundInComponentError(component, groupId));
 
-            List<GroupDefinition> gdList = deleteGroups(component, java.util.Arrays.asList(groupDefinition))
-                    .left()
-                    .on(this::onFailedGroupDBOperation);
-            return gdList.get(0);
-        } finally {
-            titanDao.commit();
-            graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
-        }
+        List<GroupDefinition> gdList = deleteGroups(component, java.util.Arrays.asList(groupDefinition))
+                .left()
+                .on(this::onFailedGroupDBOperation);
+
+        updatePolicyTargetReferencingDeletedGroup(groupId, component);
+        return gdList.get(0);
     }
 
     private List<GroupDefinition> onFailedGroupDBOperation(ResponseFormat responseFormat) {
@@ -1466,7 +1124,17 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
                 component.getComponentType().toString());
     }
 
-    public Either<List<GroupDefinition>, ResponseFormat> createGroups(Component component, final List<GroupDefinition> groupDefinitions) {
+    private void updatePolicyTargetReferencingDeletedGroup(String groupId, Component component) {
+        log.debug("#updatePolicyTargetReferencingDeletedGroup - removing all component {} policy targets referencing group {}", component.getUniqueId(), groupId);
+        ActionStatus actionStatus = policyTargetsUpdateHandler.removePoliciesTargets(component, groupId, PolicyTargetType.GROUPS);
+        if (ActionStatus.OK != actionStatus) {
+            titanDao.rollback();
+            throw new ComponentException(actionStatus, groupId);
+        }
+    }
+
+
+    public Either<List<GroupDefinition>, ResponseFormat> createGroups(Component component, final List<GroupDefinition> groupDefinitions, boolean fromCsar) {
 
         Map<String, GroupDataDefinition> groups = new HashMap<>();
         Either<List<GroupDefinition>, ResponseFormat> result = null;
@@ -1499,12 +1167,43 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             }
         }
         if (result == null) {
-            result = Either.left(createGroupsResult.left().value());
+            addCalculatedCapabilitiesWithPropertiesToComponent(component, groupDefinitions, fromCsar);
+        }
+        if (result == null) {
+            result = Either.left(groupDefinitions);
         }
         return result;
     }
 
-    public Either<List<GroupDefinition>, ResponseFormat> addGroups(Component component, final List<GroupDefinition> groupDefinitions) {
+    private void updateCalculatedCapabilitiesWithPropertiesOnComponent(Component component, final List<GroupDefinition> groupDefinitions, boolean fromCsar) {
+        groupDefinitions.forEach(GroupDefinition::updateEmptyCapabilitiesOwnerFields);
+        StorageOperationStatus status = groupsOperation.updateCalculatedCapabilitiesWithProperties(component.getUniqueId(),
+                extractCapabilitiesFromGroups(groupDefinitions), extractCapabilityPropertiesFromGroups(groupDefinitions, fromCsar));
+        if(status != StorageOperationStatus.OK){
+            log.error("#updateCalculatedCapabilitiesWithPropertiesOnComponent - failed to update the groups' calculated capabilities with the properties on the component {}. ", component.getUniqueId());
+            rollbackWithException(componentsUtils.convertFromStorageResponse(status));
+        }
+    }
+
+    private void addCalculatedCapabilitiesWithPropertiesToComponent(Component component, final List<GroupDefinition> groupDefinitions, boolean fromCsar) {
+        groupDefinitions.forEach(GroupDefinition::updateEmptyCapabilitiesOwnerFields);
+        StorageOperationStatus status = groupsOperation.addCalculatedCapabilitiesWithProperties(component.getUniqueId(),
+                extractCapabilitiesFromGroups(groupDefinitions), extractCapabilityPropertiesFromGroups(groupDefinitions, fromCsar));
+        if(status != StorageOperationStatus.OK){
+            log.error("#addCalculatedCapabilitiesWithPropertiesToComponent - failed to add the groups' calculated capabilities with the properties to the component {}. ", component.getUniqueId());
+            rollbackWithException(componentsUtils.convertFromStorageResponse(status));
+        }
+    }
+
+    private void deleteCalculatedCapabilitiesWithPropertiesFromComponent(Component component, final List<GroupDefinition> groupDefinitions) {
+        StorageOperationStatus status = groupsOperation.deleteCalculatedCapabilitiesWithProperties(component.getUniqueId(), groupDefinitions);
+        if(status != StorageOperationStatus.OK){
+            log.error("#deleteCalculatedCapabilitiesWithPropertiesFromComponent - failed to remove the groups' calculated capabilities with the properties from the component {}. ", component.getUniqueId());
+            rollbackWithException(componentsUtils.convertFromStorageResponse(status));
+        }
+    }
+
+    public Either<List<GroupDefinition>, ResponseFormat> addGroups(Component component, final List<GroupDefinition> groupDefinitions, boolean fromCsar) {
 
         Either<List<GroupDefinition>, ResponseFormat> result = null;
         Either<List<GroupDefinition>, StorageOperationStatus> createGroupsResult = null;
@@ -1537,7 +1236,10 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             }
         }
         if (result == null) {
-            result = Either.left(createGroupsResult.left().value());
+            addCalculatedCapabilitiesWithPropertiesToComponent(component, groupDefinitions, fromCsar);
+        }
+        if (result == null) {
+            result = Either.left(groupDefinitions);
         }
         return result;
     }
@@ -1546,34 +1248,39 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
 
         Either<List<GroupDefinition>, StorageOperationStatus> deleteGroupsResult;
 
-        deleteGroupsResult = groupsOperation.deleteGroups(component, groupDefinitions.stream().map(x -> new GroupDataDefinition(x)).collect(toList()));
+        deleteGroupsResult = groupsOperation.deleteGroups(component, groupDefinitions.stream().map(GroupDataDefinition::new).collect(toList()));
         if (deleteGroupsResult.isRight()) {
             return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(deleteGroupsResult.right().value())));
+        } else {
+            deleteCalculatedCapabilitiesWithPropertiesFromComponent(component, groupDefinitions);
         }
         return Either.left(deleteGroupsResult.left().value());
     }
 
     /**
      * Update specific group version
+     * @param fromCsar TODO
      *
      */
-    public Either<List<GroupDefinition>, ResponseFormat> updateGroups(Component component, List<GroupDefinition> groupDefinitions) {
+    public Either<List<GroupDefinition>, ResponseFormat> updateGroups(Component component, List<GroupDefinition> groupDefinitions, boolean fromCsar) {
 
         Either<List<GroupDefinition>, ResponseFormat> result = null;
         Either<List<GroupDefinition>, StorageOperationStatus> createGroupsResult;
 
-        createGroupsResult = groupsOperation.updateGroups(component, groupDefinitions.stream().map(GroupDataDefinition::new).collect(toList()));
+        createGroupsResult = groupsOperation.updateGroups(component, groupDefinitions.stream().map(GroupDataDefinition::new).collect(toList()), true);
         if (createGroupsResult.isRight()) {
             result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(createGroupsResult.right().value())));
         }
-
         if (result == null) {
-            result = Either.left(createGroupsResult.left().value());
+            updateCalculatedCapabilitiesWithPropertiesOnComponent(component, groupDefinitions, fromCsar);
+        }
+        if (result == null) {
+            result = Either.left(groupDefinitions);
         }
         return result;
     }
 
-    public Either<GroupDefinition, ResponseFormat> handleGroup(Component component, GroupDefinition groupDefinition, Map<String, DataTypeDefinition> allDAtaTypes) {
+    private Either<GroupDefinition, ResponseFormat> handleGroup(Component component, GroupDefinition groupDefinition, Map<String, DataTypeDefinition> allDAtaTypes) {
 
         log.trace("Going to create group {}", groupDefinition);
         // 3. verify group not already exist
@@ -1623,7 +1330,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
                 return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.MATCH_NOT_FOUND))));
             }
 
-            Map<String, PropertyDefinition> groupTypePropertiesMap = groupTypeProperties.stream().collect(Collectors.toMap(p -> p.getName(), p -> p));
+            Map<String, PropertyDefinition> groupTypePropertiesMap = groupTypeProperties.stream().collect(Collectors.toMap(PropertyDefinition::getName, p -> p));
 
             Either<GroupProperty, TitanOperationStatus> addPropertyResult;
             int i = 1;
@@ -1638,6 +1345,7 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
                 i++;
             }
         }
+
         if (groupDefinition.getUniqueId() == null) {
             String uid = UniqueIdBuilder.buildGroupingUid(component.getUniqueId(), groupDefinitionName);
             groupDefinition.setUniqueId(uid);
@@ -1666,11 +1374,10 @@ public class GroupBusinessLogic extends BaseBusinessLogic {
             return Either.right(TitanOperationStatus.ILLEGAL_ARGUMENT);
         }
 
-        PropertyDataDefinition propDataDef = prop;
-        String propertyType = propDataDef.getType();
+        String propertyType = prop.getType();
         String value = groupProperty.getValue();
 
-        Either<String, TitanOperationStatus> checkInnerType = propertyOperation.checkInnerType(propDataDef);
+        Either<String, TitanOperationStatus> checkInnerType = propertyOperation.checkInnerType(prop);
         if (checkInnerType.isRight()) {
             TitanOperationStatus status = checkInnerType.right().value();
             return Either.right(status);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogicNew.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogicNew.java
new file mode 100644
index 0000000000..855e55c415
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupBusinessLogicNew.java
@@ -0,0 +1,231 @@
+package org.openecomp.sdc.be.components.impl;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.components.impl.lock.LockingTransactional;
+import org.openecomp.sdc.be.components.validation.AccessValidations;
+import org.openecomp.sdc.be.components.validation.ComponentValidations;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation;
+import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.impl.GroupOperation;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.openecomp.sdc.be.components.impl.BaseBusinessLogic.enumHasValueFilter;
+
+@org.springframework.stereotype.Component
+public class GroupBusinessLogicNew {
+
+    private final AccessValidations accessValidations;
+    private final ComponentValidations componentValidations;
+    private final GroupsOperation groupsOperation;
+    private final GroupOperation groupOperation;
+
+    public GroupBusinessLogicNew(AccessValidations accessValidations, ComponentValidations componentValidations, GroupsOperation groupsOperation, GroupOperation groupOperation) {
+        this.accessValidations = accessValidations;
+        this.componentValidations = componentValidations;
+        this.groupsOperation = groupsOperation;
+        this.groupOperation = groupOperation;
+    }
+
+    @LockingTransactional
+    public List<String> updateMembers(String componentId, ComponentTypeEnum componentType, String userId, String groupUniqueId, List<String> members) {
+        Component component = accessValidations.validateUserCanWorkOnComponent(componentId, componentType, userId, "UPDATE GROUP MEMBERS");
+        GroupDefinition groupDefinition = getGroup(component, groupUniqueId);
+        groupDefinition.setMembers(buildMembersMap(component, members));
+        groupsOperation.updateGroupOnComponent(componentId, groupDefinition);
+        return new ArrayList<>(groupDefinition.getMembers().values());
+    }
+
+    @LockingTransactional
+    public List<GroupProperty> updateProperties(String componentId, ComponentTypeEnum componentType, String userId, String groupUniqueId, List<GroupProperty> newProperties) {
+        Component component = accessValidations.validateUserCanWorkOnComponent(componentId, componentType, userId, "UPDATE GROUP PROPERTIES");
+        GroupDefinition currentGroup = getGroup(component, groupUniqueId);
+        validateUpdatedPropertiesAndSetEmptyValues(currentGroup, newProperties);
+        return groupsOperation.updateGroupPropertiesOnComponent(componentId, currentGroup, newProperties)
+                .left()
+                .on(this::onUpdatePropertyError);
+    }
+
+    @Transactional
+    public List<PropertyDataDefinition> getProperties(String componentType, String userId, String componentId, String groupUniqueId) {
+        Component component = accessValidations.validateUserCanRetrieveComponentData(componentId, componentType, userId, "GET GROUP PROPERTIES");
+        GroupDefinition currentGroup = getGroup(component, groupUniqueId);
+        return currentGroup.getProperties();
+    }
+
+    private List<GroupProperty> onUpdatePropertyError(StorageOperationStatus storageOperationStatus) {
+        throw new StorageException(storageOperationStatus);
+    }
+
+    private Map<String, String> buildMembersMap(Component component, List<String> newMemberUniqueIds) {
+        Map<String, String> nameToUniqueId = new HashMap<>();
+        for (String memberUniqueId : newMemberUniqueIds) {
+            ComponentInstance componentInstance = getComponentInstance(component, memberUniqueId);
+            nameToUniqueId.put(componentInstance.getName(), componentInstance.getUniqueId());
+        }
+        return nameToUniqueId;
+    }
+
+    private ComponentInstance getComponentInstance(Component component, String memberUniqueId) {
+        return componentValidations.getComponentInstance(component, memberUniqueId)
+                .orElseThrow(() -> new ComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER,
+                        memberUniqueId, "",
+                        component.getActualComponentType(), component.getSystemName()));
+    }
+
+    private GroupDefinition getGroup(Component component, String groupUniqueId) {
+        return component.getGroupById(groupUniqueId)
+                .orElseThrow(() -> new ComponentException(ActionStatus.GROUP_IS_MISSING,
+                        component.getSystemName(), component.getActualComponentType()));
+    }
+
+    private void validateUpdatedPropertiesAndSetEmptyValues(GroupDefinition originalGroup, List<GroupProperty> groupPropertiesToUpdate) {
+
+        if (CollectionUtils.isEmpty(groupPropertiesToUpdate)) {
+            throw new ComponentException(ActionStatus.PROPERTY_NOT_FOUND, StringUtils.EMPTY);
+        }
+        if (CollectionUtils.isEmpty(originalGroup.getProperties())) {
+            throw new ComponentException(ActionStatus.PROPERTY_NOT_FOUND, groupPropertiesToUpdate.get(NumberUtils.INTEGER_ZERO).getName());
+        }
+        Map<String, GroupProperty> originalProperties = originalGroup.convertToGroupProperties()
+                .stream()
+                .collect(Collectors.toMap(PropertyDataDefinition::getName, p -> p));
+
+
+        for (GroupProperty gp : groupPropertiesToUpdate) {
+            String updatedPropertyName = gp.getName();
+            if (!originalProperties.containsKey(updatedPropertyName)) {
+                throw new ComponentException(ActionStatus.PROPERTY_NOT_FOUND, updatedPropertyName);
+            }
+            if (!isOnlyGroupPropertyValueChanged(gp, originalProperties.get(updatedPropertyName))) {
+                throw new ComponentException(ActionStatus.INVALID_PROPERTY, updatedPropertyName);
+            }
+            if (StringUtils.isEmpty(gp.getValue())) {
+                gp.setValue(originalProperties.get(updatedPropertyName).getDefaultValue());
+            }
+            StorageOperationStatus sos = groupOperation.validateAndUpdatePropertyValue(gp);
+            if (StorageOperationStatus.OK != sos) {
+                throw new StorageException(sos, updatedPropertyName);
+            }
+        }
+
+        validatePropertyBusinessLogic(groupPropertiesToUpdate, originalGroup);
+    }
+
+    private void validatePropertyBusinessLogic(List<GroupProperty> groupPropertiesToUpdate, GroupDefinition originalGroup) {
+
+        Map<PropertyDefinition.PropertyNames, String> enumValueMap = new EnumMap<>(PropertyDefinition.PropertyNames.class);
+        for (GroupProperty gp : groupPropertiesToUpdate) {
+            // Filter out non special properties which does not have Enum
+            final PropertyDefinition.PropertyNames gpEnum = PropertyDefinition.PropertyNames.findName(gp.getName());
+            if (gpEnum != null) {
+                enumValueMap.put(gpEnum, gp.getValue());
+            }
+        }
+        if (MapUtils.isEmpty(enumValueMap)) {
+            return;
+        }
+
+        validateVFInstancesLogic(enumValueMap, prepareMapWithOriginalProperties(originalGroup));
+
+        if (enumValueMap.containsKey(PropertyDefinition.PropertyNames.VF_MODULE_DESCRIPTION) || enumValueMap.containsKey(PropertyDefinition.PropertyNames.VF_MODULE_LABEL)) {
+            groupPropertiesToUpdate.stream()
+                    .filter(e -> enumHasValueFilter(e.getName(), PropertyDefinition.PropertyNames::findName, PropertyDefinition.PropertyNames.VF_MODULE_DESCRIPTION, PropertyDefinition.PropertyNames.VF_MODULE_LABEL))
+                    .forEach(this::validateFreeText);
+        }
+    }
+
+    private Map<PropertyDefinition.PropertyNames, String> prepareMapWithOriginalProperties(GroupDefinition originalGroup) {
+        Map<PropertyDefinition.PropertyNames, String> oldValueMap = new EnumMap<>(PropertyDefinition.PropertyNames.class);
+        PropertyDefinition.PropertyNames[] propertiesToCheck = new PropertyDefinition.PropertyNames[] { PropertyDefinition.PropertyNames.INITIAL_COUNT, PropertyDefinition.PropertyNames.MAX_INSTANCES, PropertyDefinition.PropertyNames.MIN_INSTANCES };
+
+        for (GroupProperty gp : originalGroup.convertToGroupProperties()) {
+            if (enumHasValueFilter(gp.getName(), PropertyDefinition.PropertyNames::findName, propertiesToCheck)) {
+                oldValueMap.put(PropertyDefinition.PropertyNames.findName(gp.getName()), gp.getValue());
+            }
+        }
+        if (StringUtils.isEmpty(oldValueMap.get(PropertyDefinition.PropertyNames.MAX_INSTANCES))) {
+            oldValueMap.put(PropertyDefinition.PropertyNames.MAX_INSTANCES, String.valueOf(Integer.MAX_VALUE));
+        }
+        return oldValueMap;
+    }
+
+    private void validateVFInstancesLogic(Map<PropertyDefinition.PropertyNames, String> newValues, Map<PropertyDefinition.PropertyNames, String> parentValues) {
+        if (!newValues.containsKey(PropertyDefinition.PropertyNames.INITIAL_COUNT)
+                && !newValues.containsKey(PropertyDefinition.PropertyNames.MAX_INSTANCES)
+                && !newValues.containsKey(PropertyDefinition.PropertyNames.MIN_INSTANCES)) {
+            return;
+        }
+        int latestMaxInstances = getLatestIntProperty(newValues, parentValues, PropertyDefinition.PropertyNames.MAX_INSTANCES);
+        int latestInitialCount = getLatestIntProperty(newValues, parentValues, PropertyDefinition.PropertyNames.INITIAL_COUNT);
+        int latestMinInstances = getLatestIntProperty(newValues, parentValues, PropertyDefinition.PropertyNames.MIN_INSTANCES);
+
+        if (isPropertyChanged(newValues, parentValues, PropertyDefinition.PropertyNames.INITIAL_COUNT)
+                && (latestInitialCount > latestMaxInstances || latestInitialCount < latestMinInstances)) {
+            throw new ComponentException(ActionStatus.INVALID_GROUP_INITIAL_COUNT_PROPERTY_VALUE, PropertyDefinition.PropertyNames.INITIAL_COUNT.getPropertyName(), String.valueOf(latestMinInstances), String.valueOf(latestMaxInstances));
+        }
+        if (isPropertyChanged(newValues, parentValues, PropertyDefinition.PropertyNames.MAX_INSTANCES) &&
+                latestMaxInstances < latestInitialCount) {
+            throw new ComponentException(ActionStatus.INVALID_GROUP_PROPERTY_VALUE_LOWER_HIGHER, PropertyDefinition.PropertyNames.MAX_INSTANCES.getPropertyName(), "higher", String.valueOf(latestInitialCount));
+        }
+        if (isPropertyChanged(newValues, parentValues, PropertyDefinition.PropertyNames.MIN_INSTANCES) &&
+                latestMinInstances > latestInitialCount) {
+            throw new ComponentException(ActionStatus.INVALID_GROUP_PROPERTY_VALUE_LOWER_HIGHER, PropertyDefinition.PropertyNames.MIN_INSTANCES.getPropertyName(), "lower", String.valueOf(latestInitialCount));
+        }
+    }
+
+    private boolean isPropertyChanged(Map<PropertyDefinition.PropertyNames, String> newValues, Map<PropertyDefinition.PropertyNames, String> parentValues, final PropertyDefinition.PropertyNames minInstances) {
+        return newValues.containsKey(minInstances) && !newValues.get(minInstances).equals(parentValues.get(minInstances));
+    }
+
+    private int getLatestIntProperty(Map<PropertyDefinition.PropertyNames, String> newValues, Map<PropertyDefinition.PropertyNames, String> parentValues, PropertyDefinition.PropertyNames propertyKey) {
+        String value;
+        if (newValues.containsKey(propertyKey)) {
+            value = newValues.get(propertyKey);
+        } else {
+            value = parentValues.get(propertyKey);
+        }
+        return Integer.valueOf(value);
+    }
+
+    private boolean isOnlyGroupPropertyValueChanged(GroupProperty groupProperty1, GroupProperty groupProperty2) {
+        GroupProperty groupProperty1Duplicate = new GroupProperty(groupProperty1);
+        groupProperty1Duplicate.setValue(null);
+        groupProperty1Duplicate.setSchema(null);
+        groupProperty1Duplicate.setParentUniqueId(null);
+        GroupProperty groupProperty2Duplicate = new GroupProperty(groupProperty2);
+        groupProperty2Duplicate.setValue(null);
+        groupProperty2Duplicate.setSchema(null);
+        groupProperty2Duplicate.setParentUniqueId(null);
+        return StringUtils.equals(groupProperty1Duplicate.getValueUniqueUid(), groupProperty2Duplicate.getValueUniqueUid())
+                && groupProperty1Duplicate.equals(groupProperty2Duplicate);
+    }
+
+    private void validateFreeText(GroupProperty groupPropertyToUpdate) {
+        final String groupTypeValue = groupPropertyToUpdate.getValue();
+        if (!org.apache.commons.lang3.StringUtils.isEmpty(groupTypeValue)) {
+            if (!ValidationUtils.validateDescriptionLength(groupTypeValue)) {
+                throw new ComponentException(ActionStatus.COMPONENT_DESCRIPTION_EXCEEDS_LIMIT,
+                        NodeTypeEnum.Property.getName(),
+                        String.valueOf(ValidationUtils.COMPONENT_DESCRIPTION_MAX_LENGTH));
+            } else if (!ValidationUtils.validateIsEnglish(groupTypeValue)) {
+                throw new ComponentException(ActionStatus.COMPONENT_INVALID_DESCRIPTION,
+                        NodeTypeEnum.Property.getName());
+            }
+        }
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeBusinessLogic.java
index d852ac3c3c..99c4e9e181 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeBusinessLogic.java
@@ -1,46 +1,70 @@
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.List;
-import java.util.Set;
-
+import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.validation.UserValidations;
 import org.openecomp.sdc.be.config.ConfigurationManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.GroupTypeDefinition;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.GroupTypeOperation;
-import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.stereotype.Component;
 
-@Component
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Collections.emptySet;
+
+@Component("groupTypeBusinessLogic")
 public class GroupTypeBusinessLogic {
 
     private final GroupTypeOperation groupTypeOperation;
     private final TitanDao titanDao;
     private final UserValidations userValidations;
+    private final ComponentsUtils componentsUtils;
 
-    public GroupTypeBusinessLogic(GroupTypeOperation groupTypeOperation, TitanDao titanDao, UserValidations userValidations) {
+    public GroupTypeBusinessLogic(GroupTypeOperation groupTypeOperation, TitanDao titanDao, UserValidations userValidations, ComponentsUtils componentsUtils) {
         this.groupTypeOperation = groupTypeOperation;
         this.titanDao = titanDao;
         this.userValidations = userValidations;
+        this.componentsUtils = componentsUtils;
     }
 
 
     public List<GroupTypeDefinition> getAllGroupTypes(String userId, String internalComponentType) {
         try {
-            userValidations.validateUserExists(userId, "get group types", true)
-                    .left()
-                    .on(this::onUserError);
-
-            Set<String> excludeGroupTypes = ConfigurationManager.getConfigurationManager().getConfiguration().getExcludedGroupTypesMapping().get(internalComponentType);
+            userValidations.validateUserExists(userId, "get group types", true);
+            Set<String> excludeGroupTypes = getExcludedGroupTypes(internalComponentType);
             return groupTypeOperation.getAllGroupTypes(excludeGroupTypes);
         } finally {
             titanDao.commit();
         }
     }
 
-    private User onUserError(ResponseFormat responseFormat) {
-        throw new ComponentException(responseFormat);
+    public GroupTypeDefinition getLatestGroupTypeByType(String groupTypeName) {
+        return groupTypeOperation.getLatestGroupTypeByType(groupTypeName, true)
+                .left()
+                .on(e -> failOnGetGroupType(e, groupTypeName));
+    }
+
+    public Set<String> getExcludedGroupTypes(String internalComponentType) {
+        if (StringUtils.isEmpty(internalComponentType)) {
+            return emptySet();
+        }
+        Map<String, Set<String>> excludedGroupTypesMapping = ConfigurationManager.getConfigurationManager().getConfiguration().getExcludedGroupTypesMapping();
+        Set<String> excludedTypes = excludedGroupTypesMapping.get(internalComponentType);
+        return excludedTypes == null ? emptySet() : excludedTypes;
+    }
+
+    private GroupTypeDefinition failOnGetGroupType(StorageOperationStatus status, String groupType) {
+        titanDao.rollback();
+        if (status == StorageOperationStatus.NOT_FOUND) {
+            throw new ComponentException(ActionStatus.GROUP_TYPE_IS_INVALID, groupType);
+        } else {
+            throw new ComponentException(ActionStatus.GENERAL_ERROR);
+        }
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java
index 0485e3a968..4a7b080fbc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/GroupTypeImportManager.java
@@ -20,76 +20,73 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
+import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.CommonImportManager.ElementTypeEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
+import org.openecomp.sdc.be.components.impl.model.ToscaTypeImportData;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
+import org.openecomp.sdc.be.model.CapabilityDefinition;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.GroupTypeDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.operations.api.IGroupTypeOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.impl.GroupTypeOperation;
+import org.openecomp.sdc.be.model.utils.TypeCompareUtils;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Component("groupTypeImportManager")
 public class GroupTypeImportManager {
 
-    public static void main(String[] args) {
-
-        List<PropertyDefinition> properties = new ArrayList<>();
-        PropertyDefinition propertyDefintion = new PropertyDefinition();
-        propertyDefintion.setName("aaa");
-        properties.add(propertyDefintion);
-
-        List<String> allParentsProps = new ArrayList<>();
-        allParentsProps.add("aaa");
-        allParentsProps.add("bbb");
-
-        Set<String> alreadyExistPropsCollection = properties.stream().filter(p -> allParentsProps.contains(p.getName())).map(p -> p.getName()).collect(Collectors.toSet());
-        System.out.println(alreadyExistPropsCollection);
-
+    private static final Logger log = Logger.getLogger(GroupTypeImportManager.class);
+    private final GroupTypeOperation groupTypeOperation;
+    private final ComponentsUtils componentsUtils;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final CommonImportManager commonImportManager;
+
+    public GroupTypeImportManager(GroupTypeOperation groupTypeOperation, ComponentsUtils componentsUtils, ToscaOperationFacade toscaOperationFacade, CommonImportManager commonImportManager) {
+        this.groupTypeOperation = groupTypeOperation;
+        this.componentsUtils = componentsUtils;
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.commonImportManager = commonImportManager;
     }
 
-    private static final Logger log = LoggerFactory.getLogger(GroupTypeImportManager.class);
-    @Resource
-    private IGroupTypeOperation groupTypeOperation;
-    @Resource
-    private ComponentsUtils componentsUtils;
-    @Resource
-    private ToscaOperationFacade toscaOperationFacade;
-
-    @Resource
-    private CommonImportManager commonImportManager;
-
-    public Either<List<ImmutablePair<GroupTypeDefinition, Boolean>>, ResponseFormat> createGroupTypes(String groupTypesYml) {
-        return commonImportManager.createElementTypes(groupTypesYml, elementTypeYml -> createGroupTypesFromYml(elementTypeYml), groupTypesList -> createGroupTypesByDao(groupTypesList), ElementTypeEnum.GroupType);
+    public Either<List<ImmutablePair<GroupTypeDefinition, Boolean>>, ResponseFormat> createGroupTypes(ToscaTypeImportData toscaTypeImportData) {
+        return commonImportManager.createElementTypes(toscaTypeImportData, this::createGroupTypesFromYml, this::upsertGroupTypesByDao);
     }
 
     private Either<List<GroupTypeDefinition>, ActionStatus> createGroupTypesFromYml(String groupTypesYml) {
+        return commonImportManager.createElementTypesFromYml(groupTypesYml, this::createGroupType);
+    }
 
-        return commonImportManager.createElementTypesFromYml(groupTypesYml, (groupTypeName, groupTypeJsonData) -> createGroupType(groupTypeName, groupTypeJsonData));
+    private Either<List<ImmutablePair<GroupTypeDefinition, Boolean>>, ResponseFormat> upsertGroupTypesByDao(List<GroupTypeDefinition> groupTypesToCreate) {
+        return commonImportManager.createElementTypesByDao(groupTypesToCreate, this::validateGroupType, groupType -> new ImmutablePair<>(ElementTypeEnum.GROUP_TYPE, groupType.getType()),
+                groupTypeOperation::getLatestGroupTypeByType, groupTypeOperation::addGroupType, this::updateGroupType);
     }
 
-    private Either<List<ImmutablePair<GroupTypeDefinition, Boolean>>, ResponseFormat> createGroupTypesByDao(List<GroupTypeDefinition> groupTypesToCreate) {
-        return commonImportManager.createElementTypesByDao(groupTypesToCreate, groupType -> validateGroupType(groupType), groupType -> new ImmutablePair<>(ElementTypeEnum.GroupType, groupType.getType()),
-                groupTypeName -> groupTypeOperation.getLatestGroupTypeByType(groupTypeName), groupType -> groupTypeOperation.addGroupType(groupType), groupTypeOperation::upgradeGroupType);
+    private Either<GroupTypeDefinition, StorageOperationStatus> updateGroupType(GroupTypeDefinition newGroupType, GroupTypeDefinition oldGroupType) {
+        Either<GroupTypeDefinition, StorageOperationStatus> validationRes = groupTypeOperation.validateUpdateProperties(newGroupType);
+        if (validationRes.isRight()) {
+            log.error("#updateGroupType - One or all properties of group type {} not valid. status is {}", newGroupType, validationRes.right().value());
+            return validationRes;
+        }
+        
+        if (TypeCompareUtils.isGroupTypesEquals(newGroupType, oldGroupType)) {
+            return TypeCompareUtils.typeAlreadyExists();
+        }
+        
+        return groupTypeOperation.updateGroupType(newGroupType, oldGroupType);
     }
 
     private Either<ActionStatus, ResponseFormat> validateGroupType(GroupTypeDefinition groupType) {
@@ -123,24 +120,24 @@ public class GroupTypeImportManager {
 
         if (toscaJson != null) {
             // Description
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DESCRIPTION.getElementName(), groupType::setDescription);
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DESCRIPTION.getElementName(), groupType::setDescription);
             // Derived From
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DERIVED_FROM.getElementName(), groupType::setDerivedFrom);
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DERIVED_FROM.getElementName(), groupType::setDerivedFrom);
             // Properties
-            commonImportManager.setProperties(toscaJson, groupType::setProperties);
+            CommonImportManager.setProperties(toscaJson, groupType::setProperties);
             // Metadata
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.METADATA.getElementName(), groupType::setMetadata);
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.METADATA.getElementName(), groupType::setMetadata);
             // Capabilities
-            List<CapabilityTypeDefinition> capabilityTypes = createGroupCapabilityTypes(toscaJson);
-            groupType.setCapabilityTypes(capabilityTypes);
+            Map<String, CapabilityDefinition> capabilities = createCapabilities(toscaJson);
+            groupType.setCapabilities(capabilities);
             // Members
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.MEMBERS.getElementName(), groupType::setMembers);
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.MEMBERS.getElementName(), groupType::setMembers);
 
             groupType.setType(groupTypeName);
 
             groupType.setHighestVersion(true);
 
-            groupType.setVersion(ImportUtils.Constants.FIRST_CERTIFIED_VERSION_VERSION);
+            groupType.setVersion(TypeUtils.FIRST_CERTIFIED_VERSION_VERSION);
         }
         return groupType;
     }
@@ -149,17 +146,17 @@ public class GroupTypeImportManager {
      * @param toscaJson
      * @return
      */
-    private List<CapabilityTypeDefinition> createGroupCapabilityTypes(Map<String, Object> toscaJson) {
+    private Map<String, CapabilityDefinition> createCapabilities(Map<String, Object> toscaJson) {
         CapabilityTypeToscaJsonHolder capabilityTypeToscaJsonHolder = new CapabilityTypeToscaJsonHolder();
-        commonImportManager.setField(toscaJson, ToscaTagNamesEnum.CAPABILITIES.getElementName(), capabilityTypeToscaJsonHolder::setCapabilityTypeToscaJson);
-        List<CapabilityTypeDefinition> capabilityTypes;
+        commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.CAPABILITIES.getElementName(), capabilityTypeToscaJsonHolder::setCapabilityTypeToscaJson);
+        Map<String, CapabilityDefinition> capabilities;
         if (capabilityTypeToscaJsonHolder.isEmpty()) {
-            capabilityTypes = Collections.emptyList();
+            capabilities = Collections.emptyMap();
         }
         else {
-            capabilityTypes = commonImportManager.createElementTypesFromToscaJsonMap(this::createGroupCapabilityType, capabilityTypeToscaJsonHolder.getCapabilityTypeToscaJson());
+            capabilities = commonImportManager.createElementTypesMapFromToscaJsonMap(this::createCapability, capabilityTypeToscaJsonHolder.getCapabilityTypeToscaJson());
         }
-        return capabilityTypes;
+        return capabilities;
     }
     
     private class CapabilityTypeToscaJsonHolder {
@@ -178,14 +175,25 @@ public class GroupTypeImportManager {
         }
     }
     
-    private CapabilityTypeDefinition createGroupCapabilityType(String capabilityTypeName, Map<String, Object> toscaJson) {
-        CapabilityTypeDefinition capabilityType = new CapabilityTypeDefinition();
+    private CapabilityDefinition createCapability(String capabilityName, Map<String, Object> toscaJson) {
+        CapabilityDefinition capability = new CapabilityDefinition();
 
-        commonImportManager.setField(toscaJson, ToscaTagNamesEnum.TYPE.getElementName(), capabilityType::setType);
+        capability.setName(capabilityName);
+        commonImportManager.setField(toscaJson, ToscaTagNamesEnum.TYPE.getElementName(), capability::setType);
         // Properties
-        commonImportManager.setPropertiesMap(toscaJson, capabilityType::setProperties);
+        CommonImportManager.setProperties(toscaJson, pl -> capability.setProperties(map(pl)));
+
+        return capability;
+    }
 
-        return capabilityType;
+    /**
+     * @param pl
+     * @return
+     */
+    private List<ComponentInstanceProperty> map(List<PropertyDefinition> pl) {
+        return pl.stream()
+                .map(ComponentInstanceProperty::new)
+                .collect(Collectors.toList());
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
index 4b9203de42..8b69a4575c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ImportUtils.java
@@ -20,30 +20,28 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import fj.data.Either;
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
+import org.openecomp.sdc.be.datatypes.elements.Annotation;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
-import org.openecomp.sdc.be.model.HeatParameterDefinition;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.PropertyConstraint;
-import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.heat.HeatParameterType;
+import org.openecomp.sdc.be.model.operations.impl.AnnotationTypeOperations;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintDeserialiser;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.openecomp.sdc.be.utils.TypeUtils.ToscaTagNamesEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.YamlProcessor;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
@@ -52,11 +50,16 @@ import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Representer;
 import org.yaml.snakeyaml.resolver.Resolver;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.openecomp.sdc.be.components.impl.ResourceImportManager.PROPERTY_NAME_PATTERN_IGNORE_LENGTH;
+import static org.openecomp.sdc.be.datatypes.elements.Annotation.setAnnotationsName;
 
-import fj.data.Either;
 
 public final class ImportUtils {
     private ImportUtils() {
@@ -64,7 +67,15 @@ public final class ImportUtils {
     }
 
     private static CustomResolver customResolver = new CustomResolver();
-    private static Yaml STRICT_MAPPING_YAML_LOADER =  new YamlLoader().getStrictYamlLoader();
+    private static Yaml strictYamlLoader =  new YamlLoader().getStrictYamlLoader();
+
+    @Autowired
+    protected static ComponentsUtils componentsUtils;
+
+    @Autowired
+    private ExceptionUtils exceptionUtils;
+
+    private static final Logger log = Logger.getLogger(ImportUtils.class);
 
     private static class CustomResolver extends Resolver {
         @Override
@@ -106,7 +117,7 @@ public final class ImportUtils {
 
     public static Map<String, Object> loadYamlAsStrictMap(String content){
         Map<String, Object> result = new LinkedHashMap<>();
-        Object map = STRICT_MAPPING_YAML_LOADER.load(content);
+        Object map = strictYamlLoader.load(content);
         buildMap(result, (Map<String, Object>)map);
         return result;
     }
@@ -124,8 +135,6 @@ public final class ImportUtils {
     }
 
     public static class Constants {
-
-        public static final String FIRST_CERTIFIED_VERSION_VERSION = "1.0";
         public static final String FIRST_NON_CERTIFIED_VERSION = "0.1";
         public static final String VENDOR_NAME = "ATT (Tosca)";
         public static final String VENDOR_RELEASE = "1.0.0.wd03";
@@ -139,6 +148,8 @@ public final class ImportUtils {
         public static final String USER_DEFINED_RESOURCE_NAMESPACE_PREFIX = "org.openecomp.resource.";
         public static final String UI_JSON_PAYLOAD_NAME = "payloadName";
         public static final String CVFC_DESCRIPTION = "Complex node type that is used as nested type in VF";
+
+        private Constants() {}
     }
 
     public enum ResultStatusEnum {
@@ -149,37 +160,6 @@ public final class ImportUtils {
         BOOLEAN, STRING, MAP, LIST, ALL
     }
 
-    public enum ToscaTagNamesEnum {
-        DERIVED_FROM("derived_from"), IS_PASSWORD("is_password"),
-        // Properties
-        PROPERTIES("properties"), TYPE("type"), STATUS("status"), ENTRY_SCHEMA("entry_schema"), REQUIRED("required"), DESCRIPTION("description"), DEFAULT_VALUE("default"), VALUE("value"), CONSTRAINTS("constraints"),
-        // Group Types
-        MEMBERS("members"), METADATA("metadata"),
-        // Policy Types
-        TARGETS("targets"),
-        // Capabilities
-        CAPABILITIES("capabilities"), VALID_SOURCE_TYPES("valid_source_types"),
-        // Requirements
-        REQUIREMENTS("requirements"), NODE("node"), RELATIONSHIP("relationship"), CAPABILITY("capability"), INTERFACES("interfaces"),
-        // Heat env Validation
-        PARAMETERS("parameters"),
-        // Import Validations
-        TOSCA_VERSION("tosca_definitions_version"), TOPOLOGY_TEMPLATE("topology_template"), NODE_TYPES("node_types"), OCCURRENCES("occurrences"), NODE_TEMPLATES("node_templates"), GROUPS("groups"), INPUTS("inputs"),
-        SUBSTITUTION_MAPPINGS("substitution_mappings"),  NODE_TYPE("node_type"),
-        // Attributes
-        ATTRIBUTES("attributes"), LABEL("label"), HIDDEN("hidden"), IMMUTABLE("immutable"), GET_INPUT("get_input");
-
-        private String elementName;
-
-        private ToscaTagNamesEnum(String elementName) {
-            this.elementName = elementName;
-        }
-
-        public String getElementName() {
-            return elementName;
-        }
-    }
-
     @SuppressWarnings("unchecked")
     private static void handleElementNameNotFound(String elementName, Object elementValue, ToscaElementTypeEnum elementType, List<Object> returnedList) {
         if (elementValue instanceof Map) {
@@ -190,7 +170,7 @@ public final class ImportUtils {
     }
 
     @SuppressWarnings("unchecked")
-    private static void handleElementNameFound(String elementName, ToscaElementTypeEnum elementType, List<Object> returnedList, Object elementValue) {
+    private static void addFoundElementAccordingToItsType(String elementName, ToscaElementTypeEnum elementType, List<Object> returnedList, Object elementValue) {
 
         if (elementValue instanceof Boolean) {
             if (elementType == ToscaElementTypeEnum.BOOLEAN || elementType == ToscaElementTypeEnum.ALL) {
@@ -216,10 +196,8 @@ public final class ImportUtils {
 
         }
         // For Integer, Double etc...
-        else if (elementType == ToscaElementTypeEnum.ALL) {
-            if (elementValue != null) {
-                returnedList.add(String.valueOf(elementValue));
-            }
+        else if (elementType == ToscaElementTypeEnum.ALL && elementValue != null) {
+            returnedList.add(String.valueOf(elementValue));
         }
     }
 
@@ -232,15 +210,13 @@ public final class ImportUtils {
 
     }
 
-    public static Either<Object, ResultStatusEnum> findToscaElement(Map<String, Object> toscaJson, ToscaTagNamesEnum elementName, ToscaElementTypeEnum elementType) {
+    public static Either<Object, ResultStatusEnum> findToscaElement(Map<String, Object> toscaJson, TypeUtils.ToscaTagNamesEnum elementName, ToscaElementTypeEnum elementType) {
         List<Object> foundElements = new ArrayList<>();
-        Either<Object, ResultStatusEnum> returnedElement = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
         ImportUtils.findToscaElements(toscaJson, elementName.getElementName(), elementType, foundElements);
-        if (foundElements.size() > 0) {
-            returnedElement = Either.left(foundElements.get(0));
+        if (!isEmpty(foundElements)) {
+            return Either.left(foundElements.get(0));
         }
-        return returnedElement;
-
+        return Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
     }
 
     /**
@@ -250,16 +226,13 @@ public final class ImportUtils {
      * Or ELEMENT_NOT_FOUND ActionStatus
      *
      * @param toscaJson
-     * @param toscaTagName
      * @return
      */
     public static Either<List<Object>, ResultStatusEnum> findToscaElements(Map<String, Object> toscaJson, String elementName, ToscaElementTypeEnum elementType, List<Object> returnedList) {
         Either<List<Object>, ResultStatusEnum> returnedElement = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
         String skipKey = null;
         if (toscaJson.containsKey(elementName)) {
-            Object elementValue = toscaJson.get(elementName);
-            handleElementNameFound(elementName, elementType, returnedList, elementValue);
-            skipKey = elementName;
+            skipKey = handleFoundElement(toscaJson, elementName, elementType, returnedList);
         }
 
         Iterator<Entry<String, Object>> keyValItr = toscaJson.entrySet().iterator();
@@ -270,15 +243,22 @@ public final class ImportUtils {
             }
         }
 
-        if (returnedList.size() > 0) {
+        if (!isEmpty(returnedList)) {
             returnedElement = Either.left(returnedList);
         }
 
         return returnedElement;
     }
 
+    private static String handleFoundElement(Map<String, Object> toscaJson, String elementName, ToscaElementTypeEnum elementType, List<Object> returnedList) {
+        Object elementValue = toscaJson.get(elementName);
+        addFoundElementAccordingToItsType(elementName, elementType, returnedList, elementValue);
+        return elementName;
+
+    }
+
     @SuppressWarnings("unchecked")
-    public static <T> Either<List<T>, ResultStatusEnum> findFirstToscaListElement(Map<String, Object> toscaJson, ToscaTagNamesEnum toscaTagName) {
+    public static <T> Either<List<T>, ResultStatusEnum> findFirstToscaListElement(Map<String, Object> toscaJson, TypeUtils.ToscaTagNamesEnum toscaTagName) {
         Either<List<T>, ResultStatusEnum> returnedElement = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
         Either<Object, ResultStatusEnum> findFirstToscaElement = findToscaElement(toscaJson, toscaTagName, ToscaElementTypeEnum.LIST);
         if (findFirstToscaElement.isLeft()) {
@@ -289,7 +269,7 @@ public final class ImportUtils {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> Either<Map<String, T>, ResultStatusEnum> findFirstToscaMapElement(Map<String, Object> toscaJson, ToscaTagNamesEnum toscaTagName) {
+    public static <T> Either<Map<String, T>, ResultStatusEnum> findFirstToscaMapElement(Map<String, Object> toscaJson, TypeUtils.ToscaTagNamesEnum toscaTagName) {
         Either<Map<String, T>, ResultStatusEnum> returnedElement = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
         Either<Object, ResultStatusEnum> findFirstToscaElement = findToscaElement(toscaJson, toscaTagName, ToscaElementTypeEnum.MAP);
         if (findFirstToscaElement.isLeft()) {
@@ -299,7 +279,7 @@ public final class ImportUtils {
 
     }
 
-    public static Either<String, ResultStatusEnum> findFirstToscaStringElement(Map<String, Object> toscaJson, ToscaTagNamesEnum toscaTagName) {
+    public static Either<String, ResultStatusEnum> findFirstToscaStringElement(Map<String, Object> toscaJson, TypeUtils.ToscaTagNamesEnum toscaTagName) {
         Either<String, ResultStatusEnum> returnedElement = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
         Either<Object, ResultStatusEnum> findFirstToscaElements = findToscaElement(toscaJson, toscaTagName, ToscaElementTypeEnum.STRING);
         if (findFirstToscaElements.isLeft()) {
@@ -315,7 +295,7 @@ public final class ImportUtils {
      * @param toscaTagName
      * @return
      */
-    public static Either<String, ResultStatusEnum> findFirstToscaBooleanElement(Map<String, Object> toscaJson, ToscaTagNamesEnum toscaTagName) {
+    public static Either<String, ResultStatusEnum> findFirstToscaBooleanElement(Map<String, Object> toscaJson, TypeUtils.ToscaTagNamesEnum toscaTagName) {
         Either<String, ResultStatusEnum> returnedElement = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
         Either<Object, ResultStatusEnum> findFirstToscaElements = findToscaElement(toscaJson, toscaTagName, ToscaElementTypeEnum.BOOLEAN);
         if (findFirstToscaElements.isLeft()) {
@@ -325,7 +305,7 @@ public final class ImportUtils {
     }
 
     private static void setPropertyConstraints(Map<String, Object> propertyValue, PropertyDefinition property) {
-        Either<List<Object>, ResultStatusEnum> propertyFieldconstraints = findFirstToscaListElement(propertyValue, ToscaTagNamesEnum.CONSTRAINTS);
+        Either<List<Object>, ResultStatusEnum> propertyFieldconstraints = findFirstToscaListElement(propertyValue, TypeUtils.ToscaTagNamesEnum.CONSTRAINTS);
         if (propertyFieldconstraints.isLeft()) {
             List<Object> jsonConstraintList = propertyFieldconstraints.left().value();
 
@@ -345,78 +325,129 @@ public final class ImportUtils {
     public static PropertyDefinition createModuleProperty(Map<String, Object> propertyValue) {
 
         PropertyDefinition propertyDef = new PropertyDefinition();
-        ImportUtils.setField(propertyValue, ToscaTagNamesEnum.TYPE, type -> propertyDef.setType(type));
-        ImportUtils.setPropertyFieldRequired(propertyValue, propertyDef);
-        ImportUtils.setField(propertyValue, ToscaTagNamesEnum.DESCRIPTION, desc -> propertyDef.setDescription(desc));
+        setField(propertyValue, TypeUtils.ToscaTagNamesEnum.TYPE, propertyDef::setType);
+        setPropertyFieldRequired(propertyValue, propertyDef);
+        setField(propertyValue, TypeUtils.ToscaTagNamesEnum.DESCRIPTION, propertyDef::setDescription);
 
-        Either<Object, ResultStatusEnum> findToscaElement = ImportUtils.findToscaElement(propertyValue, ToscaTagNamesEnum.DEFAULT_VALUE, ToscaElementTypeEnum.ALL);
-        if (findToscaElement.isLeft()) {
-            String propertyJsonStringValue = getPropertyJsonStringValue(findToscaElement.left().value(), propertyDef.getType());
-            propertyDef.setDefaultValue(propertyJsonStringValue);
-        }
-        ImportUtils.setField(propertyValue, ToscaTagNamesEnum.IS_PASSWORD, pass -> propertyDef.setPassword(Boolean.parseBoolean(pass)));
-        ImportUtils.setField(propertyValue, ToscaTagNamesEnum.STATUS, status -> propertyDef.setStatus(status));
-        ImportUtils.setPropertyScheme(propertyValue, propertyDef);
-        ImportUtils.setPropertyConstraints(propertyValue, propertyDef);
+        setJsonStringField(propertyValue, TypeUtils.ToscaTagNamesEnum.DEFAULT_VALUE, propertyDef.getType(), propertyDef::setDefaultValue);
+        setJsonStringField(propertyValue, TypeUtils.ToscaTagNamesEnum.VALUE, propertyDef.getType(), propertyDef::setValue);
+
+        setField(propertyValue, TypeUtils.ToscaTagNamesEnum.IS_PASSWORD, pass -> propertyDef.setPassword(Boolean.parseBoolean(pass)));
+        setField(propertyValue, TypeUtils.ToscaTagNamesEnum.STATUS, propertyDef::setStatus);
+        setScheme(propertyValue, propertyDef);
+        setPropertyConstraints(propertyValue, propertyDef);
 
         return propertyDef;
     }
 
-    public static InputDefinition createModuleInput(Map<String, Object> inputValue) {
+
+    private static void setJsonStringField(Map<String, Object> propertyValue, ToscaTagNamesEnum elementName, String type, Consumer<String> setter) {
+        Either<Object, ResultStatusEnum> eitherValue = ImportUtils.findToscaElement(propertyValue, elementName, ToscaElementTypeEnum.ALL);
+        if (eitherValue.isLeft()) {
+            String propertyJsonStringValue = getPropertyJsonStringValue(eitherValue.left().value(), type);
+            setter.accept(propertyJsonStringValue);
+        }
+    }
+
+
+
+    public static Annotation createModuleAnnotation(Map<String, Object> annotationMap, AnnotationTypeOperations annotationTypeOperations) {
+        String parsedAnnotationType = findFirstToscaStringElement(annotationMap, TypeUtils.ToscaTagNamesEnum.TYPE).left().value();
+        AnnotationTypeDefinition annotationTypeObject = annotationTypeOperations.getLatestType(parsedAnnotationType);
+        if (annotationTypeObject != null) {
+            Annotation annotation = new Annotation();
+            ImportUtils.setField(annotationMap, TypeUtils.ToscaTagNamesEnum.TYPE, annotation::setType);
+            ImportUtils.setField(annotationMap, TypeUtils.ToscaTagNamesEnum.DESCRIPTION, annotation::setDescription);
+            Either<Map<String, PropertyDefinition>, ResultStatusEnum> properties = getProperties(annotationMap);
+            modifyPropertiesKeysToProperForm(properties, annotation);
+            return annotation;
+        }
+        return null;
+    }
+
+    private static Either<Boolean, ResponseFormat> modifyPropertiesKeysToProperForm(Either<Map<String, PropertyDefinition>, ResultStatusEnum> properties, Annotation annotation) {
+        Either<Boolean, ResponseFormat> result = Either.left(true);
+        if (properties.isLeft()) {
+            List<PropertyDataDefinition> propertiesList = new ArrayList<>();
+            Map<String, PropertyDefinition> value = properties.left().value();
+            if (value != null) {
+                for (Entry<String, PropertyDefinition> entry : value.entrySet()) {
+                    String name = entry.getKey();
+                    if (!PROPERTY_NAME_PATTERN_IGNORE_LENGTH.matcher(name).matches()) {
+                        log.debug("The property with invalid name {} occured upon import resource {}. ", name, annotation.getName());
+                        result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromResultStatusEnum(ResultStatusEnum.INVALID_PROPERTY_NAME, JsonPresentationFields.PROPERTY)));
+                    }
+                    PropertyDefinition propertyDefinition = entry.getValue();
+                    propertyDefinition.setValue(propertyDefinition.getName());
+                    propertyDefinition.setName(name);
+                    propertiesList.add(propertyDefinition);
+                }
+            }
+            annotation.setProperties(propertiesList);
+        }
+        else if (properties.right().value() != ResultStatusEnum.ELEMENT_NOT_FOUND) {
+            result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromResultStatusEnum(properties
+                    .right()
+                    .value(), JsonPresentationFields.PROPERTY)));
+        }
+        return result;
+    }
+
+    public static InputDefinition createModuleInput(Map<String, Object> inputValue, AnnotationTypeOperations annotationTypeOperations) {
 
         InputDefinition inputDef = new InputDefinition();
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.TYPE, type -> inputDef.setType(type));
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.REQUIRED, req -> inputDef.setRequired(Boolean.parseBoolean(req)));
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.DESCRIPTION, desc -> inputDef.setDescription(desc));
-
-        Either<Object, ResultStatusEnum> findToscaElement = ImportUtils.findToscaElement(inputValue, ToscaTagNamesEnum.DEFAULT_VALUE, ToscaElementTypeEnum.ALL);
-        if (findToscaElement.isLeft()) {
-            String propertyJsonStringValue = getPropertyJsonStringValue(findToscaElement.left().value(), inputDef.getType());
-            inputDef.setDefaultValue(propertyJsonStringValue);
-        }
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.IS_PASSWORD, pass -> inputDef.setPassword(Boolean.parseBoolean(pass)));
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.STATUS, status -> inputDef.setStatus(status));
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.LABEL, label -> inputDef.setLabel(label));
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.HIDDEN, hidden -> inputDef.setHidden(Boolean.parseBoolean(hidden)));
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.HIDDEN, immutable -> inputDef.setImmutable(Boolean.parseBoolean(immutable)));
-        ImportUtils.setField(inputValue, ToscaTagNamesEnum.LABEL, label -> inputDef.setLabel(label));
-        ImportUtils.setPropertyScheme(inputValue, inputDef);
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.TYPE, inputDef::setType);
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.REQUIRED, req -> inputDef.setRequired(Boolean.parseBoolean(req)));
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.DESCRIPTION, inputDef::setDescription);
+
+        setJsonStringField(inputValue, TypeUtils.ToscaTagNamesEnum.DEFAULT_VALUE, inputDef.getType(), inputDef::setDefaultValue);
+
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.IS_PASSWORD, pass -> inputDef.setPassword(Boolean.parseBoolean(pass)));
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.STATUS, inputDef::setStatus);
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.LABEL, inputDef::setLabel);
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.HIDDEN, hidden -> inputDef.setHidden(Boolean.parseBoolean(hidden)));
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.HIDDEN, immutable -> inputDef.setImmutable(Boolean.parseBoolean(immutable)));
+        ImportUtils.setField(inputValue, TypeUtils.ToscaTagNamesEnum.LABEL, inputDef::setLabel);
+
+        ImportUtils.setScheme(inputValue, inputDef);
         ImportUtils.setPropertyConstraints(inputValue, inputDef);
 
+        return parseAnnotationsAndAddItToInput(inputDef, inputValue, annotationTypeOperations);
+
+    }
+
+
+    public static InputDefinition parseAnnotationsAndAddItToInput(InputDefinition inputDef, Map<String, Object> inputValue, AnnotationTypeOperations annotationTypeOperations){
+        Function<String, Annotation> elementGenByName = ImportUtils::createAnnotation;
+        Function<Map<String, Object>, Annotation> func = annotation -> createModuleAnnotation(annotation, annotationTypeOperations);
+        return getElements(inputValue, TypeUtils.ToscaTagNamesEnum.ANNOTATIONS, elementGenByName, func).
+                left().map( annotations -> modifyInputWithAnnotations(inputDef, annotations)).
+                left().on(err -> { log.error("Parsing annotations or adding them to the PropertyDataDefinition object failed");
+                                    return inputDef;});
+    }
+
+    private static InputDefinition modifyInputWithAnnotations(InputDefinition inputDef, Map<String, Annotation> annotationsMap) {
+        setAnnotationsName(annotationsMap);
+        inputDef.setAnnotationsToInput(annotationsMap.values());
         return inputDef;
     }
 
+
     public static PropertyDefinition createModuleAttribute(Map<String, Object> attributeMap) {
 
         PropertyDefinition attributeDef = new PropertyDefinition();
-        ImportUtils.setField(attributeMap, ToscaTagNamesEnum.TYPE, type -> attributeDef.setType(type));
-        ImportUtils.setField(attributeMap, ToscaTagNamesEnum.DESCRIPTION, desc -> attributeDef.setDescription(desc));
-        ImportUtils.setField(attributeMap, ToscaTagNamesEnum.STATUS, status -> attributeDef.setStatus(status));
-        Either<Object, ResultStatusEnum> eitherDefaultValue = ImportUtils.findToscaElement(attributeMap, ToscaTagNamesEnum.DEFAULT_VALUE, ToscaElementTypeEnum.ALL);
-        if (eitherDefaultValue.isLeft()) {
-            String attributeDefaultValue = getPropertyJsonStringValue(eitherDefaultValue.left().value(), attributeDef.getType());
-            attributeDef.setDefaultValue(attributeDefaultValue);
-        }
-        Either<Object, ResultStatusEnum> eitherValue = ImportUtils.findToscaElement(attributeMap, ToscaTagNamesEnum.VALUE, ToscaElementTypeEnum.ALL);
-        if (eitherValue.isLeft()) {
-            String attributeValue = getPropertyJsonStringValue(eitherValue.left().value(), attributeDef.getType());
-            attributeDef.setValue(attributeValue);
-        }
-        ImportUtils.setAttributeScheme(attributeMap, attributeDef);
-        return attributeDef;
-    }
+        setField(attributeMap, TypeUtils.ToscaTagNamesEnum.TYPE, attributeDef::setType);
+        setField(attributeMap, TypeUtils.ToscaTagNamesEnum.DESCRIPTION, attributeDef::setDescription);
+        setField(attributeMap, TypeUtils.ToscaTagNamesEnum.STATUS, attributeDef::setStatus);
 
-    private static void setPropertyScheme(Map<String, Object> propertyValue, PropertyDefinition propertyDefinition) {
-        Either<SchemaDefinition, ResultStatusEnum> eitherSchema = getSchema(propertyValue);
-        if (eitherSchema.isLeft()) {
-            SchemaDefinition schemaDef = new SchemaDefinition();
-            schemaDef.setProperty(eitherSchema.left().value().getProperty());
-            propertyDefinition.setSchema(schemaDef);
-        }
+        setJsonStringField(attributeMap, TypeUtils.ToscaTagNamesEnum.DEFAULT_VALUE, attributeDef.getType(), attributeDef::setDefaultValue);
+        setJsonStringField(attributeMap, TypeUtils.ToscaTagNamesEnum.VALUE, attributeDef.getType(), attributeDef::setValue);
 
+        setScheme(attributeMap, attributeDef);
+        return attributeDef;
     }
 
-    private static void setAttributeScheme(Map<String, Object> propertyValue, PropertyDefinition propertyDefinition) {
+    private static void setScheme(Map<String, Object> propertyValue, PropertyDefinition propertyDefinition) {
         Either<SchemaDefinition, ResultStatusEnum> eitherSchema = getSchema(propertyValue);
         if (eitherSchema.isLeft()) {
             SchemaDefinition schemaDef = new SchemaDefinition();
@@ -428,7 +459,7 @@ public final class ImportUtils {
 
     private static Either<SchemaDefinition, ResultStatusEnum> getSchema(Map<String, Object> propertyValue) {
         Either<SchemaDefinition, ResultStatusEnum> result = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
-        Either<Object, ResultStatusEnum> propertyFieldEntryScheme = findToscaElement(propertyValue, ToscaTagNamesEnum.ENTRY_SCHEMA, ToscaElementTypeEnum.ALL);
+        Either<Object, ResultStatusEnum> propertyFieldEntryScheme = findToscaElement(propertyValue, TypeUtils.ToscaTagNamesEnum.ENTRY_SCHEMA, ToscaElementTypeEnum.ALL);
         if (propertyFieldEntryScheme.isLeft()) {
             if (propertyFieldEntryScheme.left().value() instanceof String) {
                 String schemaType = (String) propertyFieldEntryScheme.left().value();
@@ -443,14 +474,12 @@ public final class ImportUtils {
                 SchemaDefinition schema = new SchemaDefinition();
                 schema.setProperty(schemeProperty);
                 result = Either.left(schema);
-
             }
-
         }
         return result;
     }
 
-    public static void setField(Map<String, Object> toscaJson, ToscaTagNamesEnum tagName, Consumer<String> setter) {
+    public static void setField(Map<String, Object> toscaJson, TypeUtils.ToscaTagNamesEnum tagName, Consumer<String> setter) {
         Either<String, ResultStatusEnum> fieldStringValue = findFirstToscaStringElement(toscaJson, tagName);
         if (fieldStringValue.isLeft()) {
             setter.accept(fieldStringValue.left().value());
@@ -459,58 +488,57 @@ public final class ImportUtils {
     }
 
     private static void setPropertyFieldRequired(Map<String, Object> propertyValue, PropertyDefinition dataDefinition) {
-        Either<String, ResultStatusEnum> propertyFieldRequired = findFirstToscaBooleanElement(propertyValue, ToscaTagNamesEnum.REQUIRED);
+        Either<String, ResultStatusEnum> propertyFieldRequired = findFirstToscaBooleanElement(propertyValue, TypeUtils.ToscaTagNamesEnum.REQUIRED);
         if (propertyFieldRequired.isLeft()) {
             dataDefinition.setRequired(Boolean.parseBoolean(propertyFieldRequired.left().value()));
         }
     }
 
     public static Either<Map<String, PropertyDefinition>, ResultStatusEnum> getProperties(Map<String, Object> toscaJson) {
-        Function<String, PropertyDefinition> elementGenByName = elementName -> createProperties(elementName);
-        Function<Map<String, Object>, PropertyDefinition> func = map -> createModuleProperty(map);
+        Function<String, PropertyDefinition> elementGenByName = ImportUtils::createProperties;
+        Function<Map<String, Object>, PropertyDefinition> func = ImportUtils::createModuleProperty;
 
-        return getElements(toscaJson, ToscaTagNamesEnum.PROPERTIES, elementGenByName, func);
+        return getElements(toscaJson, TypeUtils.ToscaTagNamesEnum.PROPERTIES, elementGenByName, func);
 
     }
 
-    public static Either<Map<String, InputDefinition>, ResultStatusEnum> getInputs(Map<String, Object> toscaJson) {
-        Function<String, InputDefinition> elementGenByName = elementName -> createInputs(elementName);
-        Function<Map<String, Object>, InputDefinition> func = map -> createModuleInput(map);
+    public static Either<Map<String, InputDefinition>, ResultStatusEnum> getInputs(Map<String, Object> toscaJson, AnnotationTypeOperations annotationTypeOperations) {
+        Function<String, InputDefinition> elementGenByName = ImportUtils::createInputs;
+        Function<Map<String, Object>, InputDefinition> func = object -> createModuleInput(object, annotationTypeOperations);
 
-        return getElements(toscaJson, ToscaTagNamesEnum.INPUTS, elementGenByName, func);
+        return getElements(toscaJson, TypeUtils.ToscaTagNamesEnum.INPUTS, elementGenByName, func);
 
     }
 
     public static Either<Map<String, PropertyDefinition>, ResultStatusEnum> getAttributes(Map<String, Object> toscaJson) {
-        Function<String, PropertyDefinition> elementGenByName = elementName -> createAttribute(elementName);
-        Function<Map<String, Object>, PropertyDefinition> func = map -> createModuleAttribute(map);
+        Function<String, PropertyDefinition> elementGenByName = ImportUtils::createAttribute;
+        Function<Map<String, Object>, PropertyDefinition> func = ImportUtils::createModuleAttribute;
 
-        return getElements(toscaJson, ToscaTagNamesEnum.ATTRIBUTES, elementGenByName, func);
+        return getElements(toscaJson, TypeUtils.ToscaTagNamesEnum.ATTRIBUTES, elementGenByName, func);
     }
 
-    public static <ElementDefinition> Either<Map<String, ElementDefinition>, ResultStatusEnum> getElements(Map<String, Object> toscaJson, ToscaTagNamesEnum elementTagName, Function<String, ElementDefinition> elementGenByName,
-            Function<Map<String, Object>, ElementDefinition> func) {
-        Either<Map<String, ElementDefinition>, ResultStatusEnum> eitherResult = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
+    public static <T> Either<Map<String, T>, ResultStatusEnum>  getElements(Map<String, Object> toscaJson, TypeUtils.ToscaTagNamesEnum elementTagName, Function<String, T> elementGenByName,
+                                                                           Function<Map<String, Object>, T> func) {
+        Either<Map<String, T>, ResultStatusEnum> eitherResult = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
         Either<Map<String, Object>, ResultStatusEnum> toscaAttributes = findFirstToscaMapElement(toscaJson, elementTagName);
         if (toscaAttributes.isLeft()) {
             Map<String, Object> jsonAttributes = toscaAttributes.left().value();
-            Map<String, ElementDefinition> moduleAttributes = new HashMap<>();
+            Map<String, T> moduleAttributes = new HashMap<>();
             Iterator<Entry<String, Object>> propertiesNameValue = jsonAttributes.entrySet().iterator();
             while (propertiesNameValue.hasNext()) {
                 Entry<String, Object> attributeNameValue = propertiesNameValue.next();
                 if (attributeNameValue.getValue() instanceof Map) {
                     @SuppressWarnings("unchecked")
-                    ElementDefinition attribute = func.apply((Map<String, Object>) attributeNameValue.getValue());
-                    moduleAttributes.put(String.valueOf(attributeNameValue.getKey()), attribute);
-                } else {
-
-                    ElementDefinition element = elementGenByName.apply(String.valueOf(attributeNameValue.getValue()));
-
+                    T attribute = func.apply((Map<String, Object>) attributeNameValue.getValue());
+                    if (attribute != null){
+                        moduleAttributes.put(String.valueOf(attributeNameValue.getKey()), attribute);
+                    }
+                }
+                else {
+                    T element = elementGenByName.apply(String.valueOf(attributeNameValue.getValue()));
                     moduleAttributes.put(String.valueOf(attributeNameValue.getKey()), element);
                 }
-
             }
-
             if (moduleAttributes.size() > 0) {
                 eitherResult = Either.left(moduleAttributes);
             }
@@ -534,6 +562,8 @@ public final class ImportUtils {
         return property;
     }
 
+
+
     private static InputDefinition createInputs(String name) {
         InputDefinition input = new InputDefinition();
 
@@ -541,10 +571,18 @@ public final class ImportUtils {
         return input;
     }
 
+    private static Annotation createAnnotation(String name) {
+        Annotation annotation = new Annotation();
+        annotation.setName(name);
+        return annotation;
+    }
+
+
+
     public static Either<List<HeatParameterDefinition>, ResultStatusEnum> getHeatParameters(Map<String, Object> heatData, String artifactType) {
 
         Either<List<HeatParameterDefinition>, ResultStatusEnum> eitherResult = Either.right(ResultStatusEnum.ELEMENT_NOT_FOUND);
-        Either<Map<String, Object>, ResultStatusEnum> toscaProperties = findFirstToscaMapElement(heatData, ToscaTagNamesEnum.PARAMETERS);
+        Either<Map<String, Object>, ResultStatusEnum> toscaProperties = findFirstToscaMapElement(heatData, TypeUtils.ToscaTagNamesEnum.PARAMETERS);
         if (toscaProperties.isLeft()) {
             Map<String, Object> jsonProperties = toscaProperties.left().value();
             List<HeatParameterDefinition> moduleProperties = new ArrayList<>();
@@ -570,7 +608,7 @@ public final class ImportUtils {
 
             }
 
-            if (moduleProperties.size() > 0) {
+            if (!isEmpty(moduleProperties)) {
                 eitherResult = Either.left(moduleProperties);
             }
 
@@ -583,7 +621,7 @@ public final class ImportUtils {
         HeatParameterDefinition property = new HeatParameterDefinition();
         Object value = propertyNameValue.getValue();
         if (value != null) {
-            property.setDefaultValue(isJson ? new Gson().toJson(value).toString() : StringEscapeUtils.escapeJava(String.valueOf(value)));
+            property.setDefaultValue(isJson ? new Gson().toJson(value) : StringEscapeUtils.escapeJava(String.valueOf(value)));
         }
         property.setName(String.valueOf(propertyNameValue.getKey()));
         moduleProperties.add(property);
@@ -592,31 +630,35 @@ public final class ImportUtils {
     private static Either<HeatParameterDefinition, ResultStatusEnum> createModuleHeatParameter(Map<String, Object> propertyValue) {
         HeatParameterDefinition propertyDef = new HeatParameterDefinition();
         String type;
-        Either<String, ResultStatusEnum> propertyFieldType = findFirstToscaStringElement(propertyValue, ToscaTagNamesEnum.TYPE);
+        Either<String, ResultStatusEnum> propertyFieldType = findFirstToscaStringElement(propertyValue, TypeUtils.ToscaTagNamesEnum.TYPE);
         if (propertyFieldType.isLeft()) {
             type = propertyFieldType.left().value();
             propertyDef.setType(type);
         } else {
             return Either.right(ResultStatusEnum.INVALID_PROPERTY_TYPE);
         }
-        Either<String, ResultStatusEnum> propertyFieldDescription = findFirstToscaStringElement(propertyValue, ToscaTagNamesEnum.DESCRIPTION);
+        Either<String, ResultStatusEnum> propertyFieldDescription = findFirstToscaStringElement(propertyValue, TypeUtils.ToscaTagNamesEnum.DESCRIPTION);
         if (propertyFieldDescription.isLeft()) {
             propertyDef.setDescription(propertyFieldDescription.left().value());
         }
 
-        Either<Object, ResultStatusEnum> propertyFieldDefaultVal = findToscaElement(propertyValue, ToscaTagNamesEnum.DEFAULT_VALUE, ToscaElementTypeEnum.ALL);
+        Either<Object, ResultStatusEnum> propertyFieldDefaultVal = findToscaElement(propertyValue, TypeUtils.ToscaTagNamesEnum.DEFAULT_VALUE, ToscaElementTypeEnum.ALL);
         if (propertyFieldDefaultVal.isLeft()) {
             if (propertyFieldDefaultVal.left().value() == null) {
                 return Either.right(ResultStatusEnum.INVALID_PROPERTY_VALUE);
             }
             Object value = propertyFieldDefaultVal.left().value();
-            String defaultValue = type.equals(HeatParameterType.JSON.getType()) ? new Gson().toJson(value).toString() : StringEscapeUtils.escapeJava(String.valueOf(value));
+            String defaultValue = type.equals(HeatParameterType.JSON.getType()) ? new Gson().toJson(value) : StringEscapeUtils.escapeJava(String.valueOf(value));
             propertyDef.setDefaultValue(defaultValue);
             propertyDef.setCurrentValue(defaultValue);
         }
 
         return Either.left(propertyDef);
     }
+    public static boolean containsGetInput(Object propValue) {
+        String value = getPropertyJsonStringValue(propValue, ToscaPropertyType.MAP.getType());
+        return value != null && value.contains(TypeUtils.ToscaTagNamesEnum.GET_INPUT.getElementName());
+    }
 
     public static String getPropertyJsonStringValue(Object value, String type) {
         Gson gson = new Gson();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
index ca8b2e1fd9..8a111f359e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
@@ -20,16 +20,8 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-
-import org.openecomp.sdc.be.components.property.PropertyDecelerationOrchestrator;
+import fj.data.Either;
+import org.openecomp.sdc.be.components.property.PropertyDeclarationOrchestrator;
 import org.openecomp.sdc.be.components.validation.ComponentValidations;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
@@ -38,24 +30,18 @@ import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.be.model.ComponentInstInputsMap;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.model.tosca.converters.PropertyValueConverter;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import javax.inject.Inject;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Component("inputsBusinessLogic")
 public class InputsBusinessLogic extends BaseBusinessLogic {
@@ -63,10 +49,15 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
     private static final String CREATE_INPUT = "CreateInput";
     private static final String UPDATE_INPUT = "UpdateInput";
 
-    private static final Logger log = LoggerFactory.getLogger(InputsBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(InputsBusinessLogic.class);
+    private static final String FAILED_TO_FOUND_COMPONENT_ERROR = "Failed to found component {}, error: {}";
+    private static final String GET_PROPERTIES_BY_INPUT = "get Properties by input";
+    private static final String FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR = "Failed to found input {} under component {}, error: {}";
+    private static final String GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP = "Going to execute rollback on create group.";
+    private static final String GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP = "Going to execute commit on create group.";
 
     @Inject
-    private PropertyDecelerationOrchestrator propertyDecelerationOrchestrator;
+    private PropertyDeclarationOrchestrator propertyDeclarationOrchestrator;
     @Inject
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
 
@@ -79,12 +70,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
      */
     public Either<List<InputDefinition>, ResponseFormat> getInputs(String userId, String componentId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Inputs", false);
-
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
-
+        validateUserExists(userId, "get Inputs", false);
 
         ComponentParametersView filters = new ComponentParametersView();
         filters.disableAll();
@@ -93,7 +79,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(componentId, filters);
         if(getComponentEither.isRight()){
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-            log.debug("Failed to found component {}, error: {}", componentId, actionStatus);
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
 
         }
@@ -106,13 +92,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
     public Either<List<ComponentInstanceInput>, ResponseFormat> getComponentInstanceInputs(String userId, String componentId, String componentInstanceId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Inputs", false);
-
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
-
-
+        validateUserExists(userId, "get Inputs", false);
         ComponentParametersView filters = new ComponentParametersView();
         filters.disableAll();
         filters.setIgnoreInputs(false);
@@ -122,7 +102,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(componentId, filters);
         if(getComponentEither.isRight()){
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-            log.debug("Failed to found component {}, error: {}", componentId, actionStatus);
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
 
         }
@@ -147,10 +127,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
      */
 
     public Either<List<ComponentInstanceProperty>, ResponseFormat> getComponentInstancePropertiesByInputId(String userId, String componentId, String instanceId, String inputId) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, GET_PROPERTIES_BY_INPUT, false);
         String parentId = componentId;
         org.openecomp.sdc.be.model.Component component = null;
         ComponentParametersView filters = new ComponentParametersView();
@@ -164,7 +141,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
             if(getComponentEither.isRight()){
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                log.debug("Failed to found component {}, error: {}", parentId, actionStatus);
+                log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, parentId, actionStatus);
                 return Either.right(componentsUtils.getResponseFormat(actionStatus));
 
             }
@@ -186,7 +163,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
         if(getComponentEither.isRight()){
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-            log.debug("Failed to found component {}, error: {}", parentId, actionStatus);
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, parentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
 
         }
@@ -195,7 +172,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
         if(!op.isPresent()){
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-            log.debug("Failed to found input {} under component {}, error: {}", inputId, parentId, actionStatus);
+            log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, parentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
         }
 
@@ -242,8 +219,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
     }
 
     private InputDefinition getInputFromInputsListById(List<InputDefinition> componentsOldInputs, InputDefinition input) {
-        Optional<InputDefinition> foundInput = componentsOldInputs.stream().filter(in -> in.getUniqueId().equals(input.getUniqueId())).findFirst();
-        return foundInput.isPresent() ? foundInput.get() : null;
+        return componentsOldInputs.stream().filter(in -> in.getUniqueId().equals(input.getUniqueId())).findFirst().orElse(null);
     }
 
     public Either<List<InputDefinition>, ResponseFormat> updateInputsValue(ComponentTypeEnum componentType, String componentId, List<InputDefinition> inputs, String userId, boolean shouldLockComp, boolean inTransaction) {
@@ -253,12 +229,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         org.openecomp.sdc.be.model.Component component = null;
 
         try {
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "get input", false);
-
-            if (resp.isRight()) {
-                result = Either.right(resp.right().value());
-                return result;
-            }
+            validateUserExists(userId, "get input", false);
 
             ComponentParametersView componentParametersView = new ComponentParametersView();
             componentParametersView.disableAll();
@@ -299,7 +270,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
                 InputDefinition currInput = getInputFromInputsListById(componentsOldInputs, newInput);
                 if (currInput == null) {
                     ActionStatus actionStatus = ActionStatus.COMPONENT_NOT_FOUND;
-                    log.debug("Failed to found newInput {} under component {}, error: {}", newInput.getUniqueId(), componentId, actionStatus.name());
+                    log.debug("Failed to found newInput {} under component {}, error: {}", newInput.getUniqueId(), componentId, actionStatus);
                     result = Either.right(componentsUtils.getResponseFormat(actionStatus));
                     return result;
                 }
@@ -322,12 +293,12 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
             result = Either.left(returnInputs);
             return result;
         } finally {
-                if (false == inTransaction) {
+                if (!inTransaction) {
                     if (result == null || result.isRight()) {
-                        log.debug("Going to execute rollback on create group.");
+                        log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP);
                         titanDao.rollback();
                     } else {
-                        log.debug("Going to execute commit on create group.");
+                        log.debug(GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP);
                         titanDao.commit();
                     }
                 }
@@ -339,11 +310,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
     }
 
     public Either<List<ComponentInstanceInput>, ResponseFormat> getInputsForComponentInput(String userId, String componentId, String inputId) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
-        String parentId = componentId;
+        validateUserExists(userId, GET_PROPERTIES_BY_INPUT, false);
         org.openecomp.sdc.be.model.Component component = null;
         ComponentParametersView filters = new ComponentParametersView();
         filters.disableAll();
@@ -352,11 +319,11 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         filters.setIgnoreComponentInstancesInputs(false);
         filters.setIgnoreProperties(false);
 
-        Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(parentId, filters);
+        Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(componentId, filters);
 
         if(getComponentEither.isRight()){
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-            log.debug("Failed to found component {}, error: {}", parentId, actionStatus);
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
 
         }
@@ -365,7 +332,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
         if(!op.isPresent()){
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-            log.debug("Failed to found input {} under component {}, error: {}", inputId, parentId, actionStatus);
+            log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, componentId, actionStatus);
             return Either.right(componentsUtils.getResponseFormat(actionStatus));
         }
 
@@ -379,12 +346,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         org.openecomp.sdc.be.model.Component component = null;
 
         try {
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-
-            if (resp.isRight()) {
-                result = Either.right(resp.right().value());
-                return result;
-            }
+            validateUserExists(userId, GET_PROPERTIES_BY_INPUT, false);
 
             ComponentParametersView componentParametersView = new ComponentParametersView();
             componentParametersView.disableAll();
@@ -392,6 +354,8 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
             componentParametersView.setIgnoreComponentInstancesInputs(false);
             componentParametersView.setIgnoreComponentInstances(false);
             componentParametersView.setIgnoreComponentInstancesProperties(false);
+            componentParametersView.setIgnorePolicies(false);
+            componentParametersView.setIgnoreGroups(false);
             componentParametersView.setIgnoreUsers(false);
 
             Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(componentId, componentType, componentParametersView);
@@ -416,7 +380,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
                 return result;
             }
 
-            result =  propertyDecelerationOrchestrator.declarePropertiesToInputs(component, componentInstInputsMapUi)
+            result =  propertyDeclarationOrchestrator.declarePropertiesToInputs(component, componentInstInputsMapUi)
                     .left()
                     .bind(inputsToCreate -> prepareInputsForCreation(userId, componentId, inputsToCreate))
                     .right()
@@ -428,10 +392,10 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
             if (!inTransaction) {
                 if (result == null || result.isRight()) {
-                    log.debug("Going to execute rollback on create group.");
+                    log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP);
                     titanDao.rollback();
                 } else {
-                    log.debug("Going to execute commit on create group.");
+                    log.debug(GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP);
                     titanDao.commit();
                 }
             }
@@ -457,10 +421,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
     public Either<List<InputDefinition>, ResponseFormat> createInputsInGraph(Map<String, InputDefinition> inputs, org.openecomp.sdc.be.model.Component component) {
 
-        List<InputDefinition> resList = inputs.values().stream().collect(Collectors.toList());
-        Either<List<InputDefinition>, ResponseFormat> result = Either.left(resList);
         List<InputDefinition> resourceProperties = component.getInputs();
-
         Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes = getAllDataTypes(applicationDataTypeCache);
         if (allDataTypes.isRight()) {
             return Either.right(allDataTypes.right().value());
@@ -479,7 +440,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
         }
         if (resourceProperties != null) {
-            Map<String, InputDefinition> generatedInputs = resourceProperties.stream().collect(Collectors.toMap(i -> i.getName(), i -> i));
+            Map<String, InputDefinition> generatedInputs = resourceProperties.stream().collect(Collectors.toMap(PropertyDataDefinition::getName, i -> i));
             Either<Map<String, InputDefinition>, String> mergeEither = ToscaDataDefinition.mergeDataMaps(generatedInputs, inputs);
             if(mergeEither.isRight()){
                 return Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_ALREADY_EXIST, mergeEither.right().value()));
@@ -487,14 +448,12 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
             inputs = mergeEither.left().value();
         }
 
-        Either<List<InputDefinition>, StorageOperationStatus> assotiateInputsEither = toscaOperationFacade.createAndAssociateInputs(inputs, component.getUniqueId());
-        if(assotiateInputsEither.isRight()){
-            log.debug("Failed to create inputs under component {}. Status is {}", component.getUniqueId(), assotiateInputsEither.right().value());
-            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(assotiateInputsEither.right().value())));
+        Either<List<InputDefinition>, StorageOperationStatus> associateInputsEither = toscaOperationFacade.createAndAssociateInputs(inputs, component.getUniqueId());
+        if(associateInputsEither.isRight()){
+            log.debug("Failed to create inputs under component {}. Status is {}", component.getUniqueId(), associateInputsEither.right().value());
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(associateInputsEither.right().value())));
         }
-        result  = Either.left(assotiateInputsEither.left().value());
-
-        return result;
+        return Either.left(associateInputsEither.left().value());
     }
 
     /**
@@ -502,24 +461,17 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
      *
      * @param componentId
      * @param userId
-     *
      * @param inputId
      * @return
      */
     public Either<InputDefinition, ResponseFormat> deleteInput(String componentId, String userId, String inputId) {
 
         Either<InputDefinition, ResponseFormat> deleteEither = null;
-        if (log.isDebugEnabled())
+        if (log.isDebugEnabled()) {
             log.debug("Going to delete input id: {}", inputId);
-
-        // Validate user (exists)
-        Either<User, ResponseFormat> userEither = validateUserExists(userId, "Delete input", true);
-        if (userEither.isRight()) {
-            deleteEither = Either.right(userEither.right().value());
-            return deleteEither;
         }
 
-        // Get component using componentType, componentId
+        validateUserExists(userId, "Delete input", true);
 
         ComponentParametersView componentParametersView = new ComponentParametersView();
         componentParametersView.disableAll();
@@ -528,6 +480,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         componentParametersView.setIgnoreComponentInstancesInputs(false);
         componentParametersView.setIgnoreComponentInstancesProperties(false);
         componentParametersView.setIgnorePolicies(false);
+        componentParametersView.setIgnoreGroups(false);
         componentParametersView.setIgnoreUsers(false);
 
         Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> componentEither = toscaOperationFacade.getToscaElement(componentId, componentParametersView);
@@ -565,7 +518,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
                 deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
                 return deleteEither;
             }
-            StorageOperationStatus storageOperationStatus = propertyDecelerationOrchestrator.unDeclarePropertiesAsInputs(component, inputForDelete);
+            StorageOperationStatus storageOperationStatus = propertyDeclarationOrchestrator.unDeclarePropertiesAsInputs(component, inputForDelete);
             if (storageOperationStatus != StorageOperationStatus.OK) {
                 log.debug("Component id: {} update properties declared as input for input id: {} failed", componentId, inputId);
                 deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
@@ -599,20 +552,18 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
             PropertyValueConverter converter = type.getConverter();
             // get inner type
             String innerType = null;
-            if (newInputDefinition != null) {
-                SchemaDefinition schema = newInputDefinition.getSchema();
-                if (schema != null) {
-                    PropertyDataDefinition prop = schema.getProperty();
-                    if (prop != null) {
-                        innerType = prop.getType();
-                    }
-                }
-                String convertedValue = null;
-                if (newInputDefinition.getDefaultValue() != null) {
-                    convertedValue = converter.convert(newInputDefinition.getDefaultValue(), innerType, dataTypes);
-                    newInputDefinition.setDefaultValue(convertedValue);
+            SchemaDefinition schema = newInputDefinition.getSchema();
+            if (schema != null) {
+                PropertyDataDefinition prop = schema.getProperty();
+                if (prop != null) {
+                    innerType = prop.getType();
                 }
             }
+            String convertedValue;
+            if (newInputDefinition.getDefaultValue() != null) {
+                convertedValue = converter.convert(newInputDefinition.getDefaultValue(), innerType, dataTypes);
+                newInputDefinition.setDefaultValue(convertedValue);
+            }
         }
         return Either.left(newInputDefinition);
     }
@@ -621,10 +572,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
         Either<InputDefinition, ResponseFormat> result = null;
         try {
 
-            Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-            if (resp.isRight()) {
-                return Either.right(resp.right().value());
-            }
+            validateUserExists(userId, GET_PROPERTIES_BY_INPUT, false);
             ComponentParametersView filters = new ComponentParametersView();
             filters.disableAll();
             filters.setIgnoreComponentInstances(false);
@@ -635,7 +583,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
             Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(componentId, filters);
             if(getComponentEither.isRight()){
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                log.debug("Failed to found component {}, error: {}", componentId, actionStatus);
+                log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
                 return Either.right(componentsUtils.getResponseFormat(actionStatus));
 
             }
@@ -643,7 +591,7 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
             Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
             if(!op.isPresent()){
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                log.debug("Failed to found input {} under component {}, error: {}", inputId, componentId, actionStatus);
+                log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, componentId, actionStatus);
                 return Either.right(componentsUtils.getResponseFormat(actionStatus));
             }
 
@@ -665,13 +613,13 @@ public class InputsBusinessLogic extends BaseBusinessLogic {
 
         } finally {
 
-            if (false == inTransaction) {
+            if (!inTransaction) {
 
                 if (result == null || result.isRight()) {
-                    log.debug("Going to execute rollback on create group.");
+                    log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP);
                     titanDao.rollback();
                 } else {
-                    log.debug("Going to execute commit on create group.");
+                    log.debug(GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP);
                     titanDao.commit();
                 }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java
index 6d23cac8db..7a1c96e1ef 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceLifecycleTypeImportManager.java
@@ -20,26 +20,19 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.InterfaceDefinition;
 import org.openecomp.sdc.be.model.Operation;
 import org.openecomp.sdc.be.model.operations.api.IInterfaceLifecycleOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import javax.annotation.Resource;
+import java.util.*;
 
 @Component("interfaceLifecycleTypeImportManager")
 public class InterfaceLifecycleTypeImportManager {
@@ -52,7 +45,7 @@ public class InterfaceLifecycleTypeImportManager {
     @Resource
     private CommonImportManager commonImportManager;
 
-    private static final Logger log = LoggerFactory.getLogger(InterfaceLifecycleTypeImportManager.class);
+    private static final Logger log = Logger.getLogger(InterfaceLifecycleTypeImportManager.class);
 
     public Either<List<InterfaceDefinition>, ResponseFormat> createLifecycleTypes(String interfaceLifecycleTypesYml) {
 
@@ -67,7 +60,7 @@ public class InterfaceLifecycleTypeImportManager {
     }
 
     private Either<List<InterfaceDefinition>, ActionStatus> createLifecyclyTypeFromYml(String interfaceLifecycleTypesYml) {
-        return commonImportManager.createElementTypesFromYml(interfaceLifecycleTypesYml, (lifecycleTypeName, lifecycleTypeJsonData) -> createLifecycleType(lifecycleTypeName, lifecycleTypeJsonData));
+        return commonImportManager.createElementTypesFromYml(interfaceLifecycleTypesYml, this::createLifecycleType);
 
     }
 
@@ -104,7 +97,7 @@ public class InterfaceLifecycleTypeImportManager {
         InterfaceDefinition interfaceDef = new InterfaceDefinition();
         interfaceDef.setType(interfaceDefinition);
 
-        Map<String, Operation> operations = new HashMap<String, Operation>();
+        Map<String, Operation> operations = new HashMap<>();
 
         for (Map.Entry<String, Object> entry : toscaJson.entrySet()) {
             Operation operation = new Operation();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java
index 85f8c57c9f..e61e925e97 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InterfaceOperationBusinessLogic.java
@@ -17,15 +17,8 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.Sets;
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
@@ -37,13 +30,7 @@ import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.datamodel.utils.UiComponentDataConverter;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.InterfaceOperation;
 import org.openecomp.sdc.be.model.jsontitan.utils.InterfaceUtils;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
@@ -56,9 +43,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.common.collect.Sets;
-
-import fj.data.Either;
+import java.util.*;
 
 @Component("interfaceOperationBusinessLogic")
 public class InterfaceOperationBusinessLogic extends ComponentBusinessLogic{
@@ -75,6 +60,9 @@ public class InterfaceOperationBusinessLogic extends ComponentBusinessLogic{
     @Autowired
     private ArtifactCassandraDao artifactCassandraDao;
 
+    @Autowired
+    private UiComponentDataConverter uiComponentDataConverter;
+
     public void setInterfaceOperation(InterfaceOperation interfaceOperation) {
         this.interfaceOperation = interfaceOperation;
     }
@@ -95,9 +83,7 @@ public class InterfaceOperationBusinessLogic extends ComponentBusinessLogic{
 
     public Either<Resource, ResponseFormat> deleteInterfaceOperation(String resourceId, Set<String> interfaceOperationToDelete, User user, boolean lock) {
         Resource resourceToDelete = initResourceToDeleteWFOp(resourceId, interfaceOperationToDelete);
-        Either<Resource, ResponseFormat> eitherDelete = validateUserAndRole(resourceToDelete, user, "deleteInterfaceOperation");
-        if (eitherDelete != null)
-            return eitherDelete;
+        validateUserAndRole(resourceToDelete, user, "deleteInterfaceOperation");
         if (CollectionUtils.isEmpty(interfaceOperationToDelete)){
             LOGGER.debug("Invalid parameter interfaceOperationToDelete was empty");
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_PROPERTY));
@@ -253,10 +239,8 @@ public class InterfaceOperationBusinessLogic extends ComponentBusinessLogic{
     }
 
     private Either<Resource, ResponseFormat> createOrUpdateInterfaceOperation(String resourceId, Resource resourceUpdate, User user, boolean isUpdate, String errorContext, boolean lock) {
-        Either<Resource, ResponseFormat> eitherCreator = validateUserAndRole(resourceUpdate, user, errorContext);
-        if (eitherCreator != null)
-            return eitherCreator;
-
+        validateUserAndRole(resourceUpdate, user, errorContext);
+        
         Either<Resource, ResponseFormat> resourceEither = getResourceDetails(resourceId);
         if (resourceEither.isRight()){
             return resourceEither;
@@ -370,18 +354,9 @@ public class InterfaceOperationBusinessLogic extends ComponentBusinessLogic{
         return resourceToDelete;
     }
 
-    private Either<Resource, ResponseFormat> validateUserAndRole(Resource resourceUpdate, User user, String errorContext) {
-        Either<User, ResponseFormat> userEither = validateUser(user, errorContext, resourceUpdate, null, false);
-        if (userEither.isRight()) {
-            return Either.right(userEither.right().value());
-        }
-        user = userEither.left().value();
-
-        Either<Boolean, ResponseFormat> userRoleEither = validateUserRole(user, resourceUpdate, new ArrayList<>(), null, null);
-        if (userRoleEither.isRight()) {
-            return Either.right(userRoleEither.right().value());
-        }
-        return null;
+    private void validateUserAndRole(Resource resourceUpdate, User user, String errorContext) {
+    	user = validateUser(user, errorContext, resourceUpdate, null, false);
+        validateUserRole(user, resourceUpdate, new ArrayList<>(), null, null);
     }
 
 
@@ -417,12 +392,6 @@ public class InterfaceOperationBusinessLogic extends ComponentBusinessLogic{
     }
 
     @Override
-    public Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(String componentId,
-                                                                                                              ComponentTypeEnum componentTypeEnum, String userId, String searchText) {
-        return null;
-    }
-
-    @Override
     public Either<UiComponentDataTransfer, ResponseFormat> getUiComponentDataTransferByComponentId(String resourceId,
                                                                                                    List<String> dataParamsToReturn) {
         ComponentParametersView paramsToRetuen = new ComponentParametersView(dataParamsToReturn);
@@ -441,8 +410,16 @@ public class InterfaceOperationBusinessLogic extends ComponentBusinessLogic{
         }
 
         Resource resource = resourceResultEither.left().value();
-        UiComponentDataTransfer dataTransfer = UiComponentDataConverter.getUiDataTransferFromResourceByParams(resource,
+        UiComponentDataTransfer dataTransfer = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resource,
                 dataParamsToReturn);
         return Either.left(dataTransfer);
     }
+
+	@Override
+	public Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(
+			String componentId, String userId) {
+		return null;
+	}
+
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/MonitoringBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/MonitoringBusinessLogic.java
index 31701c7916..b0bdf45c5a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/MonitoringBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/MonitoringBusinessLogic.java
@@ -20,21 +20,19 @@
 
 package org.openecomp.sdc.be.components.impl;
 
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.impl.MonitoringDao;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.monitoring.MonitoringEvent;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
-
 @Component("monitoringBusinessLogic")
 public class MonitoringBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(MonitoringBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(MonitoringBusinessLogic.class);
 
     @javax.annotation.Resource
     private MonitoringDao monitoringDao;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/OnDeleteEntityOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/OnDeleteEntityOperation.java
new file mode 100644
index 0000000000..b4bbebb909
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/OnDeleteEntityOperation.java
@@ -0,0 +1,16 @@
+package org.openecomp.sdc.be.components.impl;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.Component;
+
+public interface OnDeleteEntityOperation {
+
+    /**
+     * side effect operation to be executed when a given entity is deleted
+     * @param container the container which holds the entity to be deleted
+     * @param deletedEntityId the id of the entity that was deleted
+     * @return the status of the on delete operation
+     */
+    ActionStatus onDelete(Component container, String deletedEntityId);
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyBusinessLogic.java
index 37a853ccdd..6b37318171 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyBusinessLogic.java
@@ -1,34 +1,27 @@
 package org.openecomp.sdc.be.components.impl;
 
-import static java.util.stream.Collectors.toMap;
-import static org.openecomp.sdc.be.components.validation.PolicyUtils.getExcludedPolicyTypesByComponent;
-import static org.openecomp.sdc.be.components.validation.PolicyUtils.getNextPolicyCounter;
-import static org.openecomp.sdc.be.components.validation.PolicyUtils.validatePolicyFields;
-
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.elements.PolicyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.PolicyDefinition;
-import org.openecomp.sdc.be.model.PolicyTypeDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static java.util.stream.Collectors.toMap;
+import static org.openecomp.sdc.be.components.validation.PolicyUtils.*;
 
 /**
  * Provides specified business logic to create, retrieve, update, delete a policy
@@ -37,7 +30,7 @@ import fj.data.Either;
 public class PolicyBusinessLogic extends BaseBusinessLogic {
 
     private static final String FAILED_TO_VALIDATE_COMPONENT = "#{} - failed to validate the component {} before policy processing. ";
-    private static final Logger log = LoggerFactory.getLogger(PolicyBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(PolicyBusinessLogic.class);
 
     /**
      * Adds the newly created policy of the specified type to the component
@@ -75,14 +68,14 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
     /**
      * Retrieves the policy of the component by UniqueId
      *
-     * @param componentType
-     * @param componentId
-     * @param policyId
-     * @param userId
-     * @return
+     * @param componentType the type of the component
+     * @param componentId   the ID of the component
+     * @param policyId      the ID of the policy
+     * @param userId        the ID of the user
+     * @return              either policy or error response
      */
     public Either<PolicyDefinition, ResponseFormat> getPolicy(ComponentTypeEnum componentType, String componentId, String policyId, String userId) {
-        Either<PolicyDefinition, ResponseFormat> result = null;
+        Either<PolicyDefinition, ResponseFormat> result;
         log.trace("#getPolicy - starting to retrieve the policy {} of the component {}. ", policyId, componentId);
         try {
             result = validateContainerComponentAndUserBeforeReadOperation(componentType, componentId, userId)
@@ -100,7 +93,7 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
      *
      * @param componentType the type of the component
      * @param componentId   the id of the component which the policy resides under
-     * @param policy
+     * @param policy        the policy to update
      * @param userId        the user modifier id
      * @param shouldLock    the flag defining if the component should be locked
      * @return a policy or an error in a response format
@@ -158,8 +151,6 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
 
         Either<PolicyDefinition, ResponseFormat> result = null;
         log.debug("updating the policy id {} targets with the components {}. ", policyId, componentId);
-        Component component = null;
-
         try {
             //not right error response
             result = validateAndLockComponentAndUserBeforeWriteOperation(componentTypeEnum, componentId, userId, true)
@@ -176,25 +167,41 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
     }
 
     private Either<PolicyDefinition, ResponseFormat> validateAndUpdatePolicyTargets(Component component, String policyId, Map<PolicyTargetType, List<String>> targets) {
-        if (!validateTargetsExistAndTypesCorrect(component.getUniqueId(), targets)) {
-            log.debug("Error finding all the targets: {} .", targets);
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.POLICY_TARGET_DOES_NOT_EXIST, StringUtils.join(targets.values())));
-        }
-        return updateTargets(component.getUniqueId(), component.getPolicyById(policyId), targets, policyId);
+        return validateTargetsExistAndTypesCorrect(component.getUniqueId(), targets)
+                .left()
+                .bind(cmp ->updateTargets(component.getUniqueId(), component.getPolicyById(policyId), targets, policyId));
 
     }
 
-    private boolean validateTargetsExistAndTypesCorrect(String componentId, Map<PolicyTargetType, List<String>> targets) {
+    private Either<Component, ResponseFormat> validateTargetsExistAndTypesCorrect(String componentId, Map<PolicyTargetType, List<String>> targets) {
         Either<Component, StorageOperationStatus> componentEither = toscaOperationFacade.getToscaFullElement(componentId);
+        if (componentEither.isRight()) {
+            return Either.right(componentsUtils.getResponseFormat(componentEither.right().value()));
+        }
         Component parentComponent = componentEither.left().value();
+        return validateTargetExists(parentComponent, targets.entrySet());
+    }
 
-        return targets.entrySet().stream().noneMatch(t -> checkTargetNotExistOnComponentByType(parentComponent, t));
+
+
+    private Either<Component, ResponseFormat> validateTargetExists(Component parentComponent, Set<Map.Entry<PolicyTargetType, List<String>>> entries) {
+        for(Map.Entry<PolicyTargetType, List<String>> entry : entries){
+            Either<Component, ResponseFormat> result = checkTargetNotExistOnComponentByType(parentComponent, entry);
+            if(result.isRight()){
+                return result;
+            }
+        }
+        return Either.left(parentComponent);
     }
 
-    private boolean checkTargetNotExistOnComponentByType(Component parentComponent, Map.Entry<PolicyTargetType, List<String>> targetEntry) {
+    private Either<Component, ResponseFormat> checkTargetNotExistOnComponentByType(Component parentComponent, Map.Entry<PolicyTargetType, List<String>> targetEntry) {
 
-        return targetEntry.getValue().stream()
-                .anyMatch(id -> checkNotPresenceInComponentByType(parentComponent, id, targetEntry.getKey().toString()));
+        for(String id : targetEntry.getValue()){
+            if(checkNotPresenceInComponentByType(parentComponent, id, targetEntry.getKey().getName())){
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.POLICY_TARGET_DOES_NOT_EXIST, id));
+            }
+        }
+        return Either.left(parentComponent);
     }
 
     private boolean checkNotPresenceInComponentByType(Component parentComponent, String uniqueId, String type) {
@@ -246,7 +253,8 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
         log.trace("#updatePolicyProperties - starting to update properties of the policy {} on the component {}. ", policyId, componentId);
         Wrapper<Component> component = new Wrapper<>();
         try {
-            result = validateAndLockComponentAndUserBeforeWriteOperation(componentType, componentId, userId, shouldLock).left().bind(c -> setComponentValidateUpdatePolicyProperties(policyId, properties, component, c));
+            result = validateAndLockComponentAndUserBeforeWriteOperation(componentType, componentId, userId, shouldLock).left()
+                    .bind(c -> setComponentValidateUpdatePolicyProperties(policyId, properties, component, c));
         } catch (Exception e) {
             log.error("#updatePolicyProperties - the exception {} occurred upon update properties of the policy {} for the component {}: ", policyId, componentId, e);
             result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
@@ -260,9 +268,14 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
 
     private Either<List<PropertyDataDefinition>, ResponseFormat> setComponentValidateUpdatePolicyProperties(String policyId, PropertyDataDefinition[] properties, Wrapper<Component> component, Component c) {
         component.setInnerElement(c);
+        Set<String> updatedPropertyNames = Arrays.stream(properties).map(PropertyDataDefinition::getName).collect(Collectors.toSet());
         return validateAndUpdatePolicyProperties(c, policyId, properties)
                 .left()
-                .map(PolicyDefinition::getProperties);
+                .map(policyDefinition -> getFilteredProperties(policyDefinition.getProperties(), updatedPropertyNames));
+    }
+
+    private List<PropertyDataDefinition> getFilteredProperties(List<PropertyDataDefinition> all, Set<String> filtered) {
+        return all.stream().filter(pd -> filtered.contains(pd.getName())).collect(Collectors.toList());
     }
 
     private void unlockComponent(boolean shouldLock, Either<PolicyDefinition, ResponseFormat> result, Wrapper<Component> component) {
@@ -333,18 +346,12 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
     }
 
     private Either<Component, ResponseFormat> validateContainerComponentAndUserBeforeReadOperation(ComponentTypeEnum componentType, String componentId, String userId) {
-        Either<Component, ResponseFormat> result = null;
+        Either<Component, ResponseFormat> result;
         log.trace("#validateContainerComponentAndUserBeforeReadOperation - starting to validate the user {} before policy processing. ", userId);
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Policy", false);
-        if (resp.isRight()) {
-            log.error("#validateContainerComponentAndUserBeforeReadOperation - failed to validate the user {} before policy processing. ", userId);
-            result = Either.right(resp.right().value());
-        } else {
-            result = validateComponentExists(componentType, componentId);
-            if (result.isRight()) {
-                log.error(FAILED_TO_VALIDATE_COMPONENT, "#validateContainerComponentAndUserBeforeReadOperation", componentId);
-            }
-            return result;
+        validateUserExists(userId, "create Policy", false);
+        result = validateComponentExists(componentType, componentId);
+        if (result.isRight()) {
+            log.error(FAILED_TO_VALIDATE_COMPONENT, "#validateContainerComponentAndUserBeforeReadOperation", componentId);
         }
         return result;
     }
@@ -394,10 +401,10 @@ public class PolicyBusinessLogic extends BaseBusinessLogic {
         Map<String, PropertyDataDefinition> oldProperties = policy.getProperties().stream().collect(toMap(PropertyDataDefinition::getName, Function.identity()));
         for (PropertyDataDefinition newProperty : newProperties) {
             if (!oldProperties.containsKey(newProperty.getName())) {
-                log.error("#updatePropertyValues - failed to update properites of the policy {}. Properties were not found on the policy. ");
+                log.error("#updatePropertyValues - failed to update properites of the policy {}. Properties were not found on the policy. ", policy.getName());
                 return Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND, newProperty.getName()));
             }
-            Either<String, ResponseFormat> newPropertyValueEither = updatePropertyObjectValue(newProperty, true);
+            Either<String, ResponseFormat> newPropertyValueEither = updateInputPropertyObjectValue(newProperty);
             if (newPropertyValueEither.isRight()) {
                 return Either.right(newPropertyValueEither.right().value());
             }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeBusinessLogic.java
index a65a23e5f4..cb4b6ff58c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeBusinessLogic.java
@@ -1,8 +1,7 @@
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.List;
-import java.util.Set;
-
+import fj.data.Either;
+import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.components.validation.UserValidations;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
@@ -10,17 +9,21 @@ import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.PolicyTypeDefinition;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PolicyTypeOperation;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Collections.emptySet;
 
 @Component
 public class PolicyTypeBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(PolicyTypeBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(PolicyTypeBusinessLogic.class);
     private PolicyTypeOperation policyTypeOperation;
     private TitanDao titanDao;
     private ComponentsUtils componentsUtils;
@@ -33,21 +36,24 @@ public class PolicyTypeBusinessLogic {
         this.userValidations = userValidations;
     }
 
-    public Either<List<PolicyTypeDefinition>, ResponseFormat> getAllPolicyTypes(String userId, String internalComponentType) {
-        try {
-            Set<String> excludedPolicyTypes = ConfigurationManager.getConfigurationManager().getConfiguration().getExcludedPolicyTypesMapping().get(internalComponentType);
-            return userValidations.validateUserExists(userId, "get policy types", true)
-                                  .left()
-                                  .bind(user -> getPolicyTypes(excludedPolicyTypes));
-        } finally {
-            titanDao.commit();
+    @Transactional
+    public List<PolicyTypeDefinition> getAllPolicyTypes(String userId, String internalComponentType) {
+        Set<String> excludedPolicyTypes = getExcludedPolicyTypes(internalComponentType);
+        userValidations.validateUserExists(userId, "get policy types", true);
+        return getPolicyTypes(excludedPolicyTypes);
+    }
+
+    public Set<String> getExcludedPolicyTypes(String internalComponentType) {
+        if (StringUtils.isEmpty(internalComponentType)) {
+            return emptySet();
         }
+        Map<String, Set<String>> excludedPolicyTypesMapping = ConfigurationManager.getConfigurationManager().getConfiguration().getExcludedPolicyTypesMapping();
+        Set<String> excludedTypes = excludedPolicyTypesMapping.get(internalComponentType);
+        return excludedTypes == null ? emptySet() : excludedTypes;
     }
 
-    private Either<List<PolicyTypeDefinition>, ResponseFormat> getPolicyTypes(Set<String> excludedTypes) {
-        return policyTypeOperation.getAllPolicyTypes(excludedTypes)
-                                  .right()
-                                  .bind(this::convertToResponseFormatOrNotFoundErrorToEmptyList);
+    private List<PolicyTypeDefinition> getPolicyTypes(Set<String> excludedTypes) {
+        return policyTypeOperation.getAllPolicyTypes(excludedTypes);
     }
 
     private Either<List<PolicyTypeDefinition>, ResponseFormat> convertToResponseFormatOrNotFoundErrorToEmptyList(StorageOperationStatus err) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java
index 7efff56003..f40e0e97f5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java
@@ -20,15 +20,10 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import javax.annotation.Resource;
-
+import fj.data.Either;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.CommonImportManager.ElementTypeEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
+import org.openecomp.sdc.be.components.impl.model.ToscaTypeImportData;
 import org.openecomp.sdc.be.components.impl.utils.PolicyTypeImportUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
@@ -37,39 +32,42 @@ import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.IGroupOperation;
 import org.openecomp.sdc.be.model.operations.api.IPolicyTypeOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.utils.TypeUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
 
 @Component("policyTypeImportManager")
 public class PolicyTypeImportManager {
 
-    @Resource
-    private IPolicyTypeOperation policyTypeOperation;
-    @Resource
-    private ComponentsUtils componentsUtils;
-    @Autowired
-    protected IGroupOperation groupOperation;
-    @Autowired
-    private ToscaOperationFacade toscaOperationFacade;
-
-    @Resource
-    private CommonImportManager commonImportManager;
+    private final IPolicyTypeOperation policyTypeOperation;
+    private final ComponentsUtils componentsUtils;
+    private final IGroupOperation groupOperation;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final CommonImportManager commonImportManager;
+
+    public PolicyTypeImportManager(IPolicyTypeOperation policyTypeOperation, ComponentsUtils componentsUtils, IGroupOperation groupOperation, ToscaOperationFacade toscaOperationFacade, CommonImportManager commonImportManager) {
+        this.policyTypeOperation = policyTypeOperation;
+        this.componentsUtils = componentsUtils;
+        this.groupOperation = groupOperation;
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.commonImportManager = commonImportManager;
+    }
 
-    public Either<List<ImmutablePair<PolicyTypeDefinition, Boolean>>, ResponseFormat> createPolicyTypes(String policyTypesYml) {
-        return commonImportManager.createElementTypes(policyTypesYml, this::createPolicyTypesFromYml, this::upsertPolicyTypesByDao, ElementTypeEnum.PolicyType);
+    public Either<List<ImmutablePair<PolicyTypeDefinition, Boolean>>, ResponseFormat> createPolicyTypes(ToscaTypeImportData toscaTypeImportData) {
+        return commonImportManager.createElementTypes(toscaTypeImportData, this::createPolicyTypesFromYml, this::upsertPolicyTypesByDao);
     }
 
     private Either<List<PolicyTypeDefinition>, ActionStatus> createPolicyTypesFromYml(String policyTypesYml) {
-
         return commonImportManager.createElementTypesFromYml(policyTypesYml, this::createPolicyType);
     }
 
     private Either<List<ImmutablePair<PolicyTypeDefinition, Boolean>>, ResponseFormat> upsertPolicyTypesByDao(List<PolicyTypeDefinition> policyTypesToCreate) {
-        return commonImportManager.createElementTypesByDao(policyTypesToCreate, this::validatePolicyType, policyType -> new ImmutablePair<>(ElementTypeEnum.PolicyType, policyType.getType()),
-                policyTypeName -> policyTypeOperation.getLatestPolicyTypeByType(policyTypeName), policyType -> policyTypeOperation.addPolicyType(policyType), this::updatePolicyType);
+        return commonImportManager.createElementTypesByDao(policyTypesToCreate, this::validatePolicyType, policyType -> new ImmutablePair<>(ElementTypeEnum.POLICY_TYPE, policyType.getType()),
+                policyTypeOperation::getLatestPolicyTypeByType, policyTypeOperation::addPolicyType, this::updatePolicyType);
     }
 
     private Either<PolicyTypeDefinition, StorageOperationStatus> updatePolicyType(PolicyTypeDefinition newPolicyType, PolicyTypeDefinition oldPolicyType) {
@@ -115,25 +113,25 @@ public class PolicyTypeImportManager {
 
         if (toscaJson != null) {
             // Description
-            final Consumer<String> descriptionSetter = description -> policyType.setDescription(description);
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DESCRIPTION.getElementName(), descriptionSetter);
+            final Consumer<String> descriptionSetter = policyType::setDescription;
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DESCRIPTION.getElementName(), descriptionSetter);
             // Derived From
-            final Consumer<String> derivedFromSetter = derivedFrom -> policyType.setDerivedFrom(derivedFrom);
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.DERIVED_FROM.getElementName(), derivedFromSetter);
+            final Consumer<String> derivedFromSetter = policyType::setDerivedFrom;
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DERIVED_FROM.getElementName(), derivedFromSetter);
             // Properties
-            commonImportManager.setProperties(toscaJson, (values) -> policyType.setProperties(values));
+            CommonImportManager.setProperties(toscaJson, policyType::setProperties);
             // Metadata
-            final Consumer<Map<String, String>> metadataSetter = metadata -> policyType.setMetadata(metadata);
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.METADATA.getElementName(), metadataSetter);
+            final Consumer<Map<String, String>> metadataSetter = policyType::setMetadata;
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.METADATA.getElementName(), metadataSetter);
             // Targets
-            final Consumer <List<String>> targetsSetter = targets -> policyType.setTargets(targets);
-            commonImportManager.setField(toscaJson, ToscaTagNamesEnum.TARGETS.getElementName(), targetsSetter);
+            final Consumer <List<String>> targetsSetter = policyType::setTargets;
+            commonImportManager.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.TARGETS.getElementName(), targetsSetter);
 
             policyType.setType(groupTypeName);
 
             policyType.setHighestVersion(true);
 
-            policyType.setVersion(ImportUtils.Constants.FIRST_CERTIFIED_VERSION_VERSION);
+            policyType.setVersion(TypeUtils.FIRST_CERTIFIED_VERSION_VERSION);
         }
         return policyType;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java
index f6a789b248..dac241ba2f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ProductBusinessLogic.java
@@ -20,14 +20,8 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.api.CategoryTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -39,30 +33,29 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
-import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @org.springframework.stereotype.Component("productBusinessLogic")
 public class ProductBusinessLogic extends ComponentBusinessLogic {
 
     private static final String PRODUCT_FULL_NAME = "full";
     private static final String PRODUCT_ABBREVIATED_NAME = "abbreviated";
-    private static final Logger log = LoggerFactory.getLogger(ProductBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ProductBusinessLogic.class);
     private static final String INITIAL_VERSION = "0.1";
+    private static final String CREATE_PRODUCT = "Create Product";
     private static List<Role> creationRoles;
     private static List<Role> updateRoles;
     private static List<Role> contactsRoles;
@@ -80,17 +73,11 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
     }
 
     @Autowired
-    private IElementOperation elementDao;
-
-    @Autowired
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
 
     @Autowired
     private ICacheMangerOperation cacheManagerOperation;
 
-    @Autowired
-    ToscaOperationFacade toscaOperationFacade;
-
     public Either<Product, ResponseFormat> createProduct(Product product, User user) {
         AuditingActionEnum actionEnum = AuditingActionEnum.CREATE_RESOURCE;
         ComponentTypeEnum typeEnum = ComponentTypeEnum.PRODUCT;
@@ -98,17 +85,9 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
         // validate user - should be first to get the maximum auditing info in
         // case of subsequent failures
         log.debug("get user from DB");
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "Create Product", product, actionEnum, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
-
+        user = validateUser(user, CREATE_PRODUCT, product, actionEnum, false);
         // validate user role
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, product, creationRoles, actionEnum, null);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
+        validateUserRole(user, product, creationRoles, actionEnum, null);
 
         if (product == null) {
             log.debug("Invalid product json. Check product servlet log for createProduct entry params");
@@ -127,7 +106,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
 
         log.debug("send product {} to dao for create", product.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
 
-        Either<Boolean, ResponseFormat> lockResult = lockComponentByName(product.getSystemName(), product, "Create Product");
+        Either<Boolean, ResponseFormat> lockResult = lockComponentByName(product.getSystemName(), product, CREATE_PRODUCT);
         if (lockResult.isRight()) {
             ResponseFormat responseFormat = lockResult.right().value();
             componentsUtils.auditComponentAdmin(responseFormat, user, product, actionEnum, ComponentTypeEnum.PRODUCT);
@@ -218,10 +197,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
             return tagsValidation;
         }
 
-        Either<Boolean, ResponseFormat> validateIconResponse = validateIcon(user, product, actionEnum);
-        if (validateIconResponse.isRight()) {
-            return validateIconResponse;
-        }
+        validateIcon(user, product, actionEnum);
 
         Either<Boolean, ResponseFormat> projectCodeValidation = validateProjectCode(user, product, actionEnum);
         if (projectCodeValidation.isRight()) {
@@ -242,21 +218,14 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
             return productFullNameValidation;
         }
 
-        Either<Boolean, ResponseFormat> descValidation = validateDescriptionAndCleanup(user, product, actionEnum);
-        if (descValidation.isRight()) {
-            return descValidation;
-        }
+        validateDescriptionAndCleanup(user, product, actionEnum);
 
         return Either.left(true);
     }
 
     public Either<Map<String, Boolean>, ResponseFormat> validateProductNameExists(String productName, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "validate Product Name Exists", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
-
+        validateUserExists(userId, "validate Product Name Exists", false);
         Either<Boolean, StorageOperationStatus> dataModelResponse = toscaOperationFacade.validateComponentNameUniqueness(productName, null, ComponentTypeEnum.PRODUCT);
         // DE242223
         titanDao.commit();
@@ -298,26 +267,16 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
                 return Either.right(responseFormat);
             }
 
-            User contactUser = new User();
-            contactUser.setUserId(contact);
-            Either<User, ResponseFormat> validateUser = validateUserExists(contact, "Create Product", false);
-            if (validateUser.isRight()) {
-                log.debug("Cannot set contact with userId {} as product contact, error: {}", contact, validateUser.right().value());
+            User contactUser;
+            try{
+                contactUser = validateUserExists(contact, CREATE_PRODUCT, false);
+                validateUserRole(contactUser, contactsRoles);
+            } catch(ComponentException e){
+                log.debug("Cannot set contact with userId {} as product contact, error: {}", contact, e.getActionStatus());
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_PRODUCT_CONTACT, contact);
                 componentsUtils.auditComponentAdmin(responseFormat, user, product, actionEnum, ComponentTypeEnum.PRODUCT);
-                return Either.right(responseFormat);
+                throw new ComponentException(e.getActionStatus(), e.getParams());
             }
-
-            contactUser = validateUser.left().value();
-
-            Either<Boolean, ResponseFormat> validateUserRole = validateUserRole(contactUser, contactsRoles);
-            if (validateUserRole.isRight()) {
-                log.debug("Cannot set contact with userId {} as product contact, error: {}", contact, validateUserRole.right().value());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_PRODUCT_CONTACT, contact);
-                componentsUtils.auditComponentAdmin(responseFormat, user, product, actionEnum, ComponentTypeEnum.PRODUCT);
-                return Either.right(responseFormat);
-            }
-
         }
 
         if (!isProductCreatorInContacts) {
@@ -326,7 +285,9 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
         }
 
         // passed - setting all contacts userIds to lowercase
-        List<String> tempContacts = contacts.stream().map(e -> e.toLowerCase()).collect(Collectors.toList());
+        List<String> tempContacts = contacts.stream()
+                .map(String::toLowerCase)
+                .collect(Collectors.toList());
         ValidationUtils.removeDuplicateFromList(tempContacts);
         product.setContacts(tempContacts);
 
@@ -339,11 +300,11 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
             log.debug("Grouping list is empty for product: {}", product.getName());
             return Either.left(true);
         }
-        Map<String, Map<String, Set<String>>> nonDuplicatedCategories = new HashMap<String, Map<String, Set<String>>>();
+        Map<String, Map<String, Set<String>>> nonDuplicatedCategories = new HashMap<>();
         // remove duplicated entries
         for (CategoryDefinition cat : categories) {
             String catName = cat.getName();
-            if (ValidationUtils.validateStringNotEmpty(catName) == false) {
+            if (!ValidationUtils.validateStringNotEmpty(catName)) {
                 // error missing cat name
                 log.debug("Missing category name for product: {}", product.getName());
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_CATEGORY, ComponentTypeEnum.PRODUCT.getValue());
@@ -352,7 +313,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
             }
             Map<String, Set<String>> catEntry = nonDuplicatedCategories.get(catName);
             if (catEntry == null) {
-                catEntry = new HashMap<String, Set<String>>();
+                catEntry = new HashMap<>();
                 nonDuplicatedCategories.put(catName, catEntry);
             }
             List<SubCategoryDefinition> subcategories = cat.getSubcategories();
@@ -365,7 +326,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
             }
             for (SubCategoryDefinition subcat : subcategories) {
                 String subCatName = subcat.getName();
-                if (ValidationUtils.validateStringNotEmpty(subCatName) == false) {
+                if (!ValidationUtils.validateStringNotEmpty(subCatName)) {
                     // error missing sub cat name for cat
                     log.debug("Missing or empty sub-category for category {} in product {}", catName, product.getName());
                     ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_SUBCATEGORY);
@@ -374,13 +335,13 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
                 }
                 Set<String> subcatEntry = catEntry.get(subCatName);
                 if (subcatEntry == null) {
-                    subcatEntry = new HashSet<String>();
+                    subcatEntry = new HashSet<>();
                     catEntry.put(subCatName, subcatEntry);
                 }
                 List<GroupingDefinition> groupings = subcat.getGroupings();
                 for (GroupingDefinition group : groupings) {
                     String groupName = group.getName();
-                    if (ValidationUtils.validateStringNotEmpty(groupName) == false) {
+                    if (!ValidationUtils.validateStringNotEmpty(groupName)) {
                         // error missing grouping for sub cat name and cat
                         log.debug("Missing or empty groupng name for sub-category: {} for categor: {} in product: {}", subCatName, catName, product.getName());
                         ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_SUBCATEGORY);
@@ -407,7 +368,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
         boolean catExist;
         // convert non-duplicated to data modeling format and update in the
         // input object
-        List<CategoryDefinition> newCatList = new ArrayList<CategoryDefinition>();
+        List<CategoryDefinition> newCatList = new ArrayList<>();
 
         // over all categories from request
         for (Map.Entry<String, Map<String, Set<String>>> entry : nonDuplicatedCategories.entrySet()) {
@@ -485,15 +446,8 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
 
     public Either<Product, ResponseFormat> getProduct(String productId, User user) {
         String ecompErrorContext = "Get product";
-        Either<User, ResponseFormat> validateEmptyResult = validateUserNotEmpty(user, ecompErrorContext);
-        if (validateEmptyResult.isRight()) {
-            return Either.right(validateEmptyResult.right().value());
-        }
-
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(user, ecompErrorContext, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
+        validateUserNotEmpty(user, ecompErrorContext);
+        validateUserExists(user, ecompErrorContext, false);
 
         Either<Product, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(productId);
 
@@ -511,15 +465,8 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
 
     public Either<Product, ResponseFormat> deleteProduct(String productId, User user) {
         String ecompErrorContext = "Delete product";
-        Either<User, ResponseFormat> validateEmptyResult = validateUserNotEmpty(user, ecompErrorContext);
-        if (validateEmptyResult.isRight()) {
-            return Either.right(validateEmptyResult.right().value());
-        }
-
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(user, ecompErrorContext, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
+        validateUserNotEmpty(user, ecompErrorContext);
+        validateUserExists(user, ecompErrorContext, false);
 
         Either<Product, StorageOperationStatus> storageStatus = toscaOperationFacade.deleteToscaComponent(productId);
 
@@ -599,13 +546,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
     // normalizations.
     private Either<Boolean, ResponseFormat> validateTagsListAndRemoveDuplicates(User user, Product product, String oldProductName, AuditingActionEnum actionEnum) {
         List<String> tagsList = product.getTags();
-
-        Either<Boolean, ResponseFormat> validateTags = validateComponentTags(tagsList, oldProductName, ComponentTypeEnum.PRODUCT);
-        if (validateTags.isRight()) {
-            ResponseFormat responseFormat = validateTags.right().value();
-            componentsUtils.auditComponentAdmin(responseFormat, user, product, actionEnum, ComponentTypeEnum.PRODUCT);
-            return Either.right(responseFormat);
-        }
+        validateComponentTags(tagsList, oldProductName, ComponentTypeEnum.PRODUCT, user, product, actionEnum);
         ValidationUtils.removeDuplicateFromList(tagsList);
         return Either.left(true);
     }
@@ -617,18 +558,9 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
 
     public Either<Product, ResponseFormat> updateProductMetadata(String productId, Product updatedProduct, User user) {
         ComponentTypeEnum typeEnum = ComponentTypeEnum.PRODUCT;
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "Update Product", updatedProduct, null, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
-
+        user = validateUser(user, "Update Product", updatedProduct, null, false);
         // validate user role
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, updatedProduct, updateRoles, null, null);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
-
+        validateUserRole(user, updatedProduct, updateRoles, null, null);
         if (updatedProduct == null) {
             log.debug("Invalid product json. Check product servlet log for updateProduct entry params");
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -744,7 +676,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
 
     private Either<Boolean, ResponseFormat> validateAndUpdateProductName(User user, Product currentProduct, Product updatedProduct) {
         String updatedProductName = updatedProduct.getName();
-        String tags = "";
+        String tags;
         String currentProductName = currentProduct.getName();
         if (updatedProductName != null) {
             Either<Boolean, ResponseFormat> validatProductNameResponse = validateProductNameAndCleanup(user, updatedProduct, null);
@@ -789,15 +721,14 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
     }
 
     private Either<Boolean, ResponseFormat> validateAndUpdateCategory(User user, Product currentProduct, Product updatedProduct) {
-        List<CategoryDefinition> categoryUpdated = updatedProduct.getCategories();
 
-        Either<Boolean, ResponseFormat> validatCategoryResponse = validateGrouping(user, updatedProduct, null);
-        if (validatCategoryResponse.isRight()) {
-            ResponseFormat errorResponse = validatCategoryResponse.right().value();
+        Either<Boolean, ResponseFormat> validateCategoryResponse = validateGrouping(user, updatedProduct, null);
+        if (validateCategoryResponse.isRight()) {
+            ResponseFormat errorResponse = validateCategoryResponse.right().value();
             return Either.right(errorResponse);
         }
 
-        categoryUpdated = updatedProduct.getCategories();
+        List<CategoryDefinition> categoryUpdated = updatedProduct.getCategories();
         if (categoryUpdated != null) {
             currentProduct.setCategories(categoryUpdated);
         }
@@ -848,10 +779,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
     }
 
     public Either<Product, ResponseFormat> getProductByNameAndVersion(String productName, String productVersion, String userId) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Service By Name And Version", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get Service By Name And Version", false);
         Either<Product, StorageOperationStatus> storageStatus = toscaOperationFacade.getComponentByNameAndVersion(ComponentTypeEnum.PRODUCT, productName, productVersion);
         if (storageStatus.isRight()) {
             log.debug("failed to get service by name {} and version {}", productName, productVersion);
@@ -867,7 +795,7 @@ public class ProductBusinessLogic extends ComponentBusinessLogic {
     }
 
     @Override
-    public Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(String componentId, ComponentTypeEnum componentTypeEnum, String userId, String searchText) {
+    public Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(String componentId, String userId) {
         return null;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java
index aeab3cd592..5f40606177 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java
@@ -20,14 +20,8 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.function.Supplier;
-
-import javax.servlet.ServletContext;
-
+import com.google.gson.JsonElement;
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
@@ -41,37 +35,35 @@ import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.IComplexDefaultValue;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.operations.api.IElementOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.model.tosca.converters.PropertyValueConverter;
-import org.openecomp.sdc.be.model.tosca.validators.DataTypeValidatorConverter;
 import org.openecomp.sdc.be.model.tosca.validators.PropertyTypeValidator;
 import org.openecomp.sdc.be.resources.data.EntryData;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.gson.JsonElement;
-
-import fj.data.Either;
+import javax.servlet.ServletContext;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Supplier;
 
 @Component("propertyBusinessLogic")
 public class PropertyBusinessLogic extends BaseBusinessLogic {
 
     private static final String CREATE_PROPERTY = "CreateProperty";
 
-    private static final Logger log = LoggerFactory.getLogger(PropertyBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(PropertyBusinessLogic.class);
 
     private static final String EMPTY_VALUE = null;
 
-    private DataTypeValidatorConverter dataTypeValidatorConverter = DataTypeValidatorConverter.getInstance();
-
     protected static IElementOperation getElementDao(Class<IElementOperation> class1, ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
 
@@ -81,8 +73,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
     }
 
     public Either<Map<String, DataTypeDefinition>, ResponseFormat> getAllDataTypes() {
-        Either<Map<String, DataTypeDefinition>, ResponseFormat> eitherAllDataTypes = getAllDataTypes(applicationDataTypeCache);
-        return eitherAllDataTypes;
+        return getAllDataTypes(applicationDataTypeCache);
     }
 
     /**
@@ -92,17 +83,13 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
      * @param propertyName
      * @param newPropertyDefinition
      * @param userId
-     * @return Either<PropertyDefinition, ActionStatus>
+     * @return either properties or response format
      */
     public Either<EntryData<String, PropertyDefinition>, ResponseFormat> createProperty(String resourceId, String propertyName, PropertyDefinition newPropertyDefinition, String userId) {
 
         Either<EntryData<String, PropertyDefinition>, ResponseFormat> result = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Property", false);
-        if (resp.isRight()) {
-            result = Either.right(resp.right().value());
-            return result;
-        }
+        validateUserExists(userId, "create Property", false);
 
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, NodeTypeEnum.Resource);
         if (!lockResult.equals(StorageOperationStatus.OK)) {
@@ -131,11 +118,9 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
             // verify property not exist in resource
             List<PropertyDefinition> resourceProperties = resource.getProperties();
 
-            if (resourceProperties != null) {
-                if (isPropertyExist(resourceProperties, resourceId, propertyName, newPropertyDefinition.getType())) {
-                    result = Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_ALREADY_EXIST, propertyName));
-                    return result;
-                }
+            if (resourceProperties != null && isPropertyExist(resourceProperties, resourceId, propertyName, newPropertyDefinition.getType())) {
+                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_ALREADY_EXIST, propertyName));
+                return result;
             }
 
             Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes = getAllDataTypes(applicationDataTypeCache);
@@ -152,27 +137,8 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
                 result = Either.right(defaultValuesValidation.right().value());
                 return result;
             }
-            // convert property
-            ToscaPropertyType type = getType(newPropertyDefinition.getType());
-            if (type != null) {
-                PropertyValueConverter converter = type.getConverter();
-                // get inner type
-                String innerType = null;
-                if (newPropertyDefinition != null) {
-                    SchemaDefinition schema = newPropertyDefinition.getSchema();
-                    if (schema != null) {
-                        PropertyDataDefinition prop = schema.getProperty();
-                        if (prop != null) {
-                            innerType = prop.getType();
-                        }
-                    }
-                    String convertedValue = null;
-                    if (newPropertyDefinition.getDefaultValue() != null) {
-                        convertedValue = converter.convert(newPropertyDefinition.getDefaultValue(), innerType, allDataTypes.left().value());
-                        newPropertyDefinition.setDefaultValue(convertedValue);
-                    }
-                }
-            }
+            convertProperty(newPropertyDefinition, allDataTypes);
+
 
             // add the new property to resource on graph
             // need to get StorageOpaerationStatus and convert to ActionStatus
@@ -184,7 +150,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
             }
 
             PropertyDefinition createdPropertyDefinition = either.left().value();
-            EntryData<String, PropertyDefinition> property = new EntryData<String, PropertyDefinition>(propertyName, createdPropertyDefinition);
+            EntryData<String, PropertyDefinition> property = new EntryData<>(propertyName, createdPropertyDefinition);
             result = Either.left(property);
             return result;
 
@@ -196,21 +162,33 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
 
     }
 
+    private void convertProperty(PropertyDefinition newPropertyDefinition, Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes) {
+        ToscaPropertyType type = getType(newPropertyDefinition.getType());
+        if (type != null) {
+            String innerType = null;
+            SchemaDefinition schema = newPropertyDefinition.getSchema();
+            if (schema != null && schema.getProperty() != null) {
+                innerType = schema.getProperty().getType();
+            }
+            if (newPropertyDefinition.getDefaultValue() != null) {
+                newPropertyDefinition.setDefaultValue(
+                        type.getConverter().convert(
+                                newPropertyDefinition.getDefaultValue(), innerType, allDataTypes.left().value()));
+            }
+        }
+    }
+
     /**
      * Get property of resource
      *
      * @param resourceId
      * @param propertyId
      * @param userId
-     * @return
+     * @return either properties or response format
      */
     public Either<Entry<String, PropertyDefinition>, ResponseFormat> getProperty(String resourceId, String propertyId, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "create Component Instance", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
-
+        validateUserExists(userId, "create Component Instance", false);
         // Get the resource from DB
         Either<Resource, StorageOperationStatus> status =  toscaOperationFacade.getToscaElement(resourceId);
         if (status.isRight()) {
@@ -239,16 +217,13 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
      * @param resourceId
      * @param propertyId
      * @param userId
-     * @return
+     * @return either properties or response format
      */
     public Either<Entry<String, PropertyDefinition>, ResponseFormat> deleteProperty(String resourceId, String propertyId, String userId) {
 
         Either<Entry<String, PropertyDefinition>, ResponseFormat> result = null;
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "delete Property", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "delete Property", false);
 
         StorageOperationStatus lockResult = graphLockOperation.lockComponent(resourceId, NodeTypeEnum.Resource);
         if (!lockResult.equals(StorageOperationStatus.OK)) {
@@ -303,7 +278,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
      * @param propertyId
      * @param newPropertyDefinition
      * @param userId
-     * @return
+     * @return either properties or response format
      */
     public Either<EntryData<String, PropertyDefinition>, ResponseFormat> updateProperty(String resourceId, String propertyId, PropertyDefinition newPropertyDefinition, String userId) {
 
@@ -347,7 +322,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
                 return result;
             }
 
-            Either<PropertyDefinition, StorageOperationStatus> either = handleProperty(propertyId, newPropertyDefinition, dataTypes);
+            Either<PropertyDefinition, StorageOperationStatus> either = handleProperty(newPropertyDefinition, dataTypes);
             if (either.isRight()) {
                 log.debug("Problem while updating property with id {}. Reason - {}", propertyId, either.right().value());
                 result = Either.right(componentsUtils.getResponseFormatByResource(componentsUtils.convertFromStorageResponse(either.right().value()), resource.getName()));
@@ -361,7 +336,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
                 return result;
             }
 
-            EntryData<String, PropertyDefinition> property = new EntryData<String, PropertyDefinition>(propertyName, either.left().value());
+            EntryData<String, PropertyDefinition> property = new EntryData<>(propertyName, either.left().value());
             result = Either.left(property);
             return result;
 
@@ -387,7 +362,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
         return result;
     }
 
-    private Either<PropertyDefinition, StorageOperationStatus> handleProperty(String propertyId, PropertyDefinition newPropertyDefinition, Map<String, DataTypeDefinition> dataTypes) {
+    private Either<PropertyDefinition, StorageOperationStatus> handleProperty(PropertyDefinition newPropertyDefinition, Map<String, DataTypeDefinition> dataTypes) {
 
         StorageOperationStatus validateAndUpdateProperty = validateAndUpdateProperty(newPropertyDefinition, dataTypes);
         if (validateAndUpdateProperty != StorageOperationStatus.OK) {
@@ -407,21 +382,16 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
         ToscaPropertyType type = getType(propertyType);
 
         if (type == null) {
-
             DataTypeDefinition dataTypeDefinition = dataTypes.get(propertyType);
             if (dataTypeDefinition == null) {
                 log.debug("The type {} of property cannot be found.", propertyType);
                 return StorageOperationStatus.INVALID_TYPE;
             }
-
-            StorageOperationStatus status = validateAndUpdateComplexValue(propertyDefinition, propertyType, value, dataTypeDefinition, dataTypes);
-
-            return status;
-
+            return validateAndUpdateComplexValue(propertyDefinition, propertyType, value, dataTypeDefinition, dataTypes);
         }
-        String innerType = null;
+        String innerType;
 
-        Either<String, TitanOperationStatus> checkInnerType = getInnerType(type, () -> propertyDefinition.getSchema());
+        Either<String, TitanOperationStatus> checkInnerType = getInnerType(type, propertyDefinition::getSchema);
         if (checkInnerType.isRight()) {
             return StorageOperationStatus.INVALID_TYPE;
         }
@@ -430,7 +400,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
         log.trace("After validating property type {}", propertyType);
 
         boolean isValidProperty = isValidValue(type, value, innerType, dataTypes);
-        if (false == isValidProperty) {
+        if (!isValidProperty) {
             log.info("The value {} of property from type {} is invalid", value, type);
             return StorageOperationStatus.INVALID_VALUE;
         }
@@ -440,20 +410,19 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
         if (isEmptyValue(value)) {
             log.debug("Default value was not sent for property {}. Set default value to {}", propertyDefinition.getName(), EMPTY_VALUE);
             propertyDefinition.setDefaultValue(EMPTY_VALUE);
-        } else if (false == isEmptyValue(value)) {
+        } else if (!isEmptyValue(value)) {
             String convertedValue = converter.convert(value, innerType, dataTypes);
             propertyDefinition.setDefaultValue(convertedValue);
         }
         return StorageOperationStatus.OK;
     }
 
-    protected StorageOperationStatus validateAndUpdateComplexValue(IComplexDefaultValue propertyDefinition, String propertyType,
-
-            String value, DataTypeDefinition dataTypeDefinition, Map<String, DataTypeDefinition> dataTypes) {
+    private StorageOperationStatus validateAndUpdateComplexValue(IComplexDefaultValue propertyDefinition, String propertyType,
+                                                                 String value, DataTypeDefinition dataTypeDefinition, Map<String, DataTypeDefinition> dataTypes) {
 
         ImmutablePair<JsonElement, Boolean> validateResult = dataTypeValidatorConverter.validateAndUpdate(value, dataTypeDefinition, dataTypes);
 
-        if (validateResult.right.booleanValue() == false) {
+        if (validateResult.right) {
             log.debug("The value {} of property from type {} is invalid", propertyType, propertyType);
             return StorageOperationStatus.INVALID_VALUE;
         }
@@ -467,29 +436,24 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
         return StorageOperationStatus.OK;
     }
 
-    protected void updateValue(IComplexDefaultValue propertyDefinition, JsonElement jsonElement) {
+    private void updateValue(IComplexDefaultValue propertyDefinition, JsonElement jsonElement) {
 
         propertyDefinition.setDefaultValue(getValueFromJsonElement(jsonElement));
 
     }
 
+    @Override
     protected String getValueFromJsonElement(JsonElement jsonElement) {
-        String value = null;
-
         if (jsonElement == null || jsonElement.isJsonNull()) {
-            value = EMPTY_VALUE;
-        } else {
-            if (jsonElement.toString().isEmpty()) {
-                value = "";
-            } else {
-                value = jsonElement.toString();
-            }
+            return EMPTY_VALUE;
         }
-
-        return value;
+        if(jsonElement.toString().isEmpty()){
+            return "";
+        }
+        return jsonElement.toString();
     }
 
-    protected Either<String, TitanOperationStatus> getInnerType(ToscaPropertyType type, Supplier<SchemaDefinition> schemeGen) {
+    private Either<String, TitanOperationStatus> getInnerType(ToscaPropertyType type, Supplier<SchemaDefinition> schemeGen) {
         String innerType = null;
         if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
 
@@ -507,26 +471,18 @@ public class PropertyBusinessLogic extends BaseBusinessLogic {
         }
         return Either.left(innerType);
     }
+
+    @Override
     protected boolean isValidValue(ToscaPropertyType type, String value, String innerType, Map<String, DataTypeDefinition> dataTypes) {
         if (isEmptyValue(value)) {
             return true;
         }
-
         PropertyTypeValidator validator = type.getValidator();
-
-        boolean isValid = validator.isValid(value, innerType, dataTypes);
-        if (true == isValid) {
-            return true;
-        } else {
-            return false;
-        }
-
+        return validator.isValid(value, innerType, dataTypes);
     }
 
+    @Override
     public boolean isEmptyValue(String value) {
-        if (value == null) {
-            return true;
-        }
-        return false;
+        return value == null;
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/RequirementsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/RequirementsBusinessLogic.java
index 6454379af8..eb4bb33d70 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/RequirementsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/RequirementsBusinessLogic.java
@@ -21,13 +21,12 @@
 package org.openecomp.sdc.be.components.impl;
 
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
 @Component("requirementsBusinessLogic")
 public class RequirementsBusinessLogic {
-    private static final Logger log = LoggerFactory.getLogger(RequirementsBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(RequirementsBusinessLogic.class);
 
     @javax.annotation.Resource
     private ComponentsUtils componentsUtils;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index fd1a272174..5678a628c5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -7,9 +7,9 @@
  * 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.
@@ -21,42 +21,24 @@
 package org.openecomp.sdc.be.components.impl;
 
 
-import static org.openecomp.sdc.be.tosca.CsarUtils.VF_NODE_TYPE_ARTIFACTS_PATH_PATTERN;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletContext;
-
+import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.csar.CsarArtifactsAndGroupsBusinessLogic;
+import org.openecomp.sdc.be.components.csar.CsarBusinessLogic;
+import org.openecomp.sdc.be.components.csar.CsarInfo;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationInfo;
 import org.openecomp.sdc.be.components.impl.ImportUtils.ResultStatusEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaElementTypeEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction.LifecycleChanceActionEnum;
-import org.openecomp.sdc.be.components.merge.resource.MergeResourceBLFactory;
-import org.openecomp.sdc.be.components.merge.resource.MergeResourceBusinessLogic;
+import org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic;
+import org.openecomp.sdc.be.components.merge.utils.MergeInstanceUtils;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.config.ConfigurationManager;
@@ -65,110 +47,81 @@ import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datamodel.api.HighestFilterEnum;
 import org.openecomp.sdc.be.datamodel.utils.ArtifactUtils;
 import org.openecomp.sdc.be.datamodel.utils.UiComponentDataConverter;
+import org.openecomp.sdc.be.datatypes.elements.ArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.RequirementDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.CreatedFrom;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.info.NodeTypeInfoToUpdateArtifacts;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.CapabilityRequirementRelationship;
-import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.CsarInfo;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.GroupDefinition;
-import org.openecomp.sdc.be.model.GroupProperty;
-import org.openecomp.sdc.be.model.GroupTypeDefinition;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.NodeTypeInfo;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.ParsedToscaYamlInfo;
-import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.RelationshipImpl;
-import org.openecomp.sdc.be.model.RelationshipInfo;
-import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
-import org.openecomp.sdc.be.model.RequirementDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.UploadCapInfo;
-import org.openecomp.sdc.be.model.UploadComponentInstanceInfo;
-import org.openecomp.sdc.be.model.UploadPropInfo;
-import org.openecomp.sdc.be.model.UploadReqInfo;
-import org.openecomp.sdc.be.model.UploadResourceInfo;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.operations.InterfaceOperation;
-import org.openecomp.sdc.be.model.jsontitan.utils.InterfaceUtils;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
-import org.openecomp.sdc.be.model.operations.api.ICacheMangerOperation;
-import org.openecomp.sdc.be.model.operations.api.ICapabilityTypeOperation;
-import org.openecomp.sdc.be.model.operations.api.IElementOperation;
-import org.openecomp.sdc.be.model.operations.api.IInterfaceLifecycleOperation;
-import org.openecomp.sdc.be.model.operations.api.IPropertyOperation;
-import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.model.operations.impl.CsarOperation;
+import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.be.model.operations.api.*;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.be.tosca.CsarUtils;
 import org.openecomp.sdc.be.tosca.CsarUtils.NonMetaArtifactInfo;
 import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
 import org.openecomp.sdc.be.user.IUserBusinessLogic;
-import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.be.utils.CommonBeUtils;
+import org.openecomp.sdc.be.utils.TypeUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.FunctionalInterfaces;
 import org.openecomp.sdc.common.datastructure.Wrapper;
 import org.openecomp.sdc.common.kpi.api.ASDCKpiApi;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.WebApplicationContext;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.parser.ParserException;
 
-import com.google.gson.Gson;
+import javax.servlet.ServletContext;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.regex.Pattern;
 
-import fj.data.Either;
+import static java.util.stream.Collectors.*;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections.MapUtils.isEmpty;
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.openecomp.sdc.be.components.impl.ImportUtils.findFirstToscaStringElement;
+import static org.openecomp.sdc.be.components.impl.ImportUtils.getPropertyJsonStringValue;
+import static org.openecomp.sdc.be.tosca.CsarUtils.VF_NODE_TYPE_ARTIFACTS_PATH_PATTERN;
 
 @org.springframework.stereotype.Component("resourceBusinessLogic")
 public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
+    private static final String DELETE_RESOURCE = "Delete Resource";
+    private static final String IN_RESOURCE = "  in resource {} ";
     private static final String PLACE_HOLDER_RESOURCE_TYPES = "validForResourceTypes";
     public static final String INITIAL_VERSION = "0.1";
-
-    private Pattern STR_REPLACE_PATTERN = Pattern.compile("^[ ]*\\{[ ]*" + "str_replace" + "=");
-    private Pattern TOKEN_PATTERN = Pattern.compile("[ ]*\\{[ ]*" + "token" + "=");
-    private Pattern GET_PROPERTY_PATTERN = Pattern.compile("[ ]*\\{[ ]*" + "get_property" + "=");
-    private Pattern CONCAT_PATTERN = Pattern.compile("[ ]*\\{[ ]*" + "concat" + "=");
-    private Pattern GET_ATTRIBUTE_PATTERN = Pattern.compile("[ ]*\\{[ ]*" + "get_attribute" + "=");
-
-    private static final Logger log = LoggerFactory.getLogger(ResourceBusinessLogic.class);
-
-    private static Pattern pattern = Pattern.compile("\\..(.*?)\\..");
+    private static final Logger log = Logger.getLogger(ResourceBusinessLogic.class);
+    private static final String CERTIFICATION_ON_IMPORT = "certification on import";
+    private static final String CREATE_RESOURCE = "Create Resource";
+    private static final String VALIDATE_DERIVED_BEFORE_UPDATE = "validate derived before update";
+    private static final String CATEGORY_IS_EMPTY = "Resource category is empty";
+    private static final String CREATE_RESOURCE_VALIDATE_CAPABILITY_TYPES = "Create Resource - validateCapabilityTypesCreate";
+    private static final String COMPONENT_INSTANCE_WITH_NAME = "component instance with name ";
+    private static final String COMPONENT_INSTANCE_WITH_NAME_IN_RESOURCE = "component instance with name {}  in resource {} ";
 
     /**
      * Default constructor
@@ -187,18 +140,11 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
     private LifecycleBusinessLogic lifecycleBusinessLogic;
 
     @Autowired
-    private IPropertyOperation propertyOperation;
-
-    @Autowired
-    private CsarOperation csarOperation;
-
-    @Autowired
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
 
     @Autowired
     private ResourceImportManager resourceImportManager;
 
-
     @Autowired
     private InputsBusinessLogic inputsBusinessLogic;
 
@@ -209,30 +155,19 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
     private ICacheMangerOperation cacheManagerOperation;
 
     @Autowired
-    private ApplicationDataTypeCache dataTypeCache;
-
-    @Autowired
-    private MergeResourceBLFactory mergeResourceBLFactory;
+    private ResourceDataMergeBusinessLogic resourceDataMergeBusinessLogic;
 
     @Autowired
     private CsarArtifactsAndGroupsBusinessLogic csarArtifactsAndGroupsBusinessLogic;
 
     @Autowired
-    private InterfaceOperation interfaceOperation;
-
-    private Gson gson = new Gson();
-
-    public void setInterfaceOperation(InterfaceOperation interfaceOperation) {
-        this.interfaceOperation = interfaceOperation;
-    }
+    private MergeInstanceUtils mergeInstanceUtils;
 
-    public CsarOperation getCsarOperation() {
-        return csarOperation;
-    }
+    @Autowired
+    private UiComponentDataConverter uiComponentDataConverter;
 
-    public void setCsarOperation(CsarOperation csarOperation) {
-        this.csarOperation = csarOperation;
-    }
+    @Autowired
+    private CsarBusinessLogic csarBusinessLogic;
 
     public LifecycleBusinessLogic getLifecycleBusinessLogic() {
         return lifecycleBusinessLogic;
@@ -274,10 +209,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         this.artifactsBusinessLogic = artifactsManager;
     }
 
-    public void setPropertyOperation(IPropertyOperation propertyOperation) {
-        this.propertyOperation = propertyOperation;
-    }
-
     public ApplicationDataTypeCache getApplicationDataTypeCache() {
         return applicationDataTypeCache;
     }
@@ -286,10 +217,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         this.applicationDataTypeCache = applicationDataTypeCache;
     }
 
-    public void setInterfaceTypeOperation(IInterfaceLifecycleOperation interfaceTypeOperation) {
-        this.interfaceTypeOperation = interfaceTypeOperation;
-    }
-
     /**
      * the method returns a list of all the resources that are certified, the
      * returned resources are only abstract or only none abstract according to
@@ -299,12 +226,9 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
      * @param userId      TODO
      * @return
      */
-    public Either<List<Resource>, ResponseFormat> getAllCertifiedResources(boolean getAbstract,
-                                                                           HighestFilterEnum highestFilter, String userId) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get All Certified Resources", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+    public List<Resource> getAllCertifiedResources(boolean getAbstract,
+                                                   HighestFilterEnum highestFilter, String userId) {
+        User user = validateUserExists(userId, "get All Certified Resources", false);
         Boolean isHighest = null;
         switch (highestFilter) {
             case ALL:
@@ -322,20 +246,16 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 .getAllCertifiedResources(getAbstract, isHighest);
 
         if (getResponse.isRight()) {
-            return Either.right(componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(getResponse.right().value())));
+            throw new StorageException(getResponse.right().value());
         }
 
-        return Either.left(getResponse.left().value());
+        return getResponse.left().value();
     }
 
     public Either<Map<String, Boolean>, ResponseFormat> validateResourceNameExists(String resourceName,
                                                                                    ResourceTypeEnum resourceTypeEnum, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "validate Resource Name Exists", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "validate Resource Name Exists", false);
 
         Either<Boolean, StorageOperationStatus> dataModelResponse = toscaOperationFacade
                 .validateComponentNameUniqueness(resourceName, resourceTypeEnum, ComponentTypeEnum.RESOURCE);
@@ -355,109 +275,60 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return Either.right(responseFormat);
     }
 
-    public Either<Resource, ResponseFormat> createResource(Resource resource, AuditingActionEnum auditingAction,
-                                                           User user, Map<String, byte[]> csarUIPayload, String payloadName) {
-        Either<Resource, ResponseFormat> createResourceResponse = validateResourceBeforeCreate(resource, user, false);
-        if (createResourceResponse.isRight()) {
-            return createResourceResponse;
-        }
-
-        // Creating resource either by DAO or from CSAR
-        String csarUUID = null;
-        if (payloadName == null) {
-            csarUUID = resource.getCsarUUID();
-        } else {
-            csarUUID = payloadName;
-        }
-        if (csarUUID != null && !csarUUID.isEmpty()) {
-            // check if VF with the same Csar UUID or with he same name already
-            // exists
-            Either<Integer, StorageOperationStatus> validateCsarUuidUniquenessRes = toscaOperationFacade
-                    .validateCsarUuidUniqueness(csarUUID);
-            if (validateCsarUuidUniquenessRes.isRight()) {
-                log.debug("Failed to validate uniqueness of CsarUUID {} for resource", csarUUID,
-                        resource.getSystemName());
-                return Either.right(componentsUtils.getResponseFormat(
-                        componentsUtils.convertFromStorageResponse(validateCsarUuidUniquenessRes.right().value())));
-            }
-
-            Integer existingResourceRes = validateCsarUuidUniquenessRes.left().value();
-            if (existingResourceRes.intValue() > 0) {
-                log.debug("Failed to create resource {}, csarUUID {} already exist for a different VF ",
-                        resource.getSystemName(), csarUUID);
-                ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.VSP_ALREADY_EXISTS,
-                        csarUUID);
-                componentsUtils.auditResource(errorResponse, user, resource, auditingAction);
-                return Either.right(errorResponse);
-            }
-
+    public Resource createResource(Resource resource, AuditingActionEnum auditingAction,
+                                   User user, Map<String, byte[]> csarUIPayload, String payloadName) {
+        validateResourceBeforeCreate(resource, user, false);
+        String csarUUID = payloadName == null ? resource.getCsarUUID() : payloadName;
+        if (StringUtils.isNotEmpty(csarUUID)) {
+            csarBusinessLogic.validateCsarBeforeCreate(resource, auditingAction, user, csarUUID);
             log.debug("CsarUUID is {} - going to create resource from CSAR", csarUUID);
-            createResourceResponse = createResourceFromCsar(resource, user, Either.left(csarUIPayload), csarUUID);
-            return createResourceResponse;
+            return createResourceFromCsar(resource, user, csarUIPayload, csarUUID);
         }
 
         return createResourceByDao(resource, user, auditingAction, false, false);
     }
 
-    public Either<Resource, ResponseFormat> validateAndUpdateResourceFromCsar(Resource resource, User user,
-                                                                              Map<String, byte[]> csarUIPayload, String payloadName, String resourceUniqueId) {
-        Either<Resource, ResponseFormat> updateResourceResponse = null;
-        Either<Resource, ResponseFormat> validateResourceResponse = null;
-        Wrapper<ResponseFormat> responseWrapper = new Wrapper<ResponseFormat>();
-        String csarUUID = null;
+    public Resource validateAndUpdateResourceFromCsar(Resource resource, User user,
+                                                      Map<String, byte[]> csarUIPayload, String payloadName, String resourceUniqueId) {
+        String csarUUID = payloadName;
         String csarVersion = null;
+        Resource updatedResource = null;
         if (payloadName == null) {
             csarUUID = resource.getCsarUUID();
             csarVersion = resource.getCsarVersion();
-        } else {
-            csarUUID = payloadName;
         }
         if (csarUUID != null && !csarUUID.isEmpty()) {
-            Resource oldResource = getResourceByUniqueId(responseWrapper, resourceUniqueId);
-            if (responseWrapper.isEmpty()) {
-                validateCsarUuidMatching(responseWrapper, oldResource, resource, csarUUID, resourceUniqueId, user);
-            }
-            if (responseWrapper.isEmpty()) {
-                validateCsarIsNotAlreadyUsed(responseWrapper, oldResource, resource, csarUUID, user);
-            }
-            if (responseWrapper.isEmpty()) {
-                if (oldResource != null && ValidationUtils.hasBeenCertified(oldResource.getVersion())) {
-                    overrideImmutableMetadata(oldResource, resource);
-                }
-                validateResourceResponse = validateResourceBeforeCreate(resource, user, false);
-                if (validateResourceResponse.isRight()) {
-                    responseWrapper.setInnerElement(validateResourceResponse.right().value());
-                }
-            }
-            if (responseWrapper.isEmpty()) {
-                String oldCsarVersion = oldResource.getCsarVersion();
-                log.debug("CsarUUID is {} - going to update resource with UniqueId {} from CSAR", csarUUID,
-                        resourceUniqueId);
-                // (on boarding flow): If the update includes same csarUUID and
-                // same csarVersion as already in the VF - no need to import the
-                // csar (do only metadata changes if there are).
-                if (csarVersion != null && oldCsarVersion != null && oldCsarVersion.equals(csarVersion)) {
-                    updateResourceResponse = updateResourceMetadata(resourceUniqueId, resource, oldResource, user,
-                            false);
-                } else {
-                    updateResourceResponse = updateResourceFromCsar(oldResource, resource, user,
-                            AuditingActionEnum.UPDATE_RESOURCE_METADATA, false, Either.left(csarUIPayload), csarUUID);
-                }
+            Resource oldResource = getResourceByUniqueId(resourceUniqueId);
+            validateCsarUuidMatching(oldResource, resource, csarUUID, resourceUniqueId, user);
+            validateCsarIsNotAlreadyUsed(oldResource, resource, csarUUID, user);
+            if (oldResource != null && ValidationUtils.hasBeenCertified(oldResource.getVersion())) {
+                overrideImmutableMetadata(oldResource, resource);
+            }
+            validateResourceBeforeCreate(resource, user, false);
+            String oldCsarVersion = oldResource.getCsarVersion();
+            log.debug("CsarUUID is {} - going to update resource with UniqueId {} from CSAR", csarUUID,
+                    resourceUniqueId);
+            // (on boarding flow): If the update includes same csarUUID and
+            // same csarVersion as already in the VF - no need to import the
+            // csar (do only metadata changes if there are).
+            if (csarVersion != null && oldCsarVersion != null && oldCsarVersion.equals(csarVersion)) {
+                updatedResource = updateResourceMetadata(resourceUniqueId, resource, oldResource, user,
+                        false);
+            } else {
+                updatedResource = updateResourceFromCsar(oldResource, resource, user,
+                        AuditingActionEnum.UPDATE_RESOURCE_METADATA, false, csarUIPayload, csarUUID);
             }
         } else {
             log.debug("Failed to update resource {}, csarUUID or payload name is missing", resource.getSystemName());
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.MISSING_CSAR_UUID,
                     resource.getName());
             componentsUtils.auditResource(errorResponse, user, resource, AuditingActionEnum.CREATE_RESOURCE);
-            responseWrapper.setInnerElement(errorResponse);
+            throw new ComponentException(ActionStatus.MISSING_CSAR_UUID, resource.getName());
         }
-        if (responseWrapper.isEmpty()) {
-            return updateResourceResponse;
-        }
-        return Either.right(responseWrapper.getInnerElement());
+        return updatedResource;
     }
 
-    private void validateCsarIsNotAlreadyUsed(Wrapper<ResponseFormat> responseWrapper, Resource oldResource,
+    private void validateCsarIsNotAlreadyUsed(Resource oldResource,
                                               Resource resource, String csarUUID, User user) {
         // (on boarding flow): If the update includes a csarUUID: verify this
         // csarUUID is not in use by another VF, If it is - use same error as
@@ -471,19 +342,19 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             if (!StorageOperationStatus.NOT_FOUND.equals(resourceLinkedToCsarRes.right().value())) {
                 log.debug("Failed to find previous resource by CSAR {} and system name {}", csarUUID,
                         resource.getSystemName());
-                responseWrapper.setInnerElement(componentsUtils.getResponseFormat(
-                        componentsUtils.convertFromStorageResponse(resourceLinkedToCsarRes.right().value())));
+                throw new StorageException(resourceLinkedToCsarRes.right().value());
             }
         } else if (!resourceLinkedToCsarRes.left().value().getUniqueId().equals(oldResource.getUniqueId())
                 && !resourceLinkedToCsarRes.left().value().getName().equals(oldResource.getName())) {
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.VSP_ALREADY_EXISTS, csarUUID,
                     resourceLinkedToCsarRes.left().value().getName());
             componentsUtils.auditResource(errorResponse, user, resource, AuditingActionEnum.UPDATE_RESOURCE_METADATA);
-            responseWrapper.setInnerElement(errorResponse);
+            throw new ComponentException(ActionStatus.VSP_ALREADY_EXISTS, csarUUID,
+                    resourceLinkedToCsarRes.left().value().getName());
         }
     }
 
-    private void validateCsarUuidMatching(Wrapper<ResponseFormat> responseWrapper, Resource resource,
+    private void validateCsarUuidMatching(Resource resource,
                                           Resource oldResource, String csarUUID, String resourceUniqueId, User user) {
         // (on boarding flow): If the update includes csarUUID which is
         // different from the csarUUID of the VF - fail with
@@ -497,18 +368,16 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(
                     ActionStatus.RESOURCE_LINKED_TO_DIFFERENT_VSP, resource.getName(), csarUUID, oldCsarUUID);
             componentsUtils.auditResource(errorResponse, user, resource, AuditingActionEnum.UPDATE_RESOURCE_METADATA);
-            responseWrapper.setInnerElement(errorResponse);
+            throw new ComponentException(ActionStatus.RESOURCE_LINKED_TO_DIFFERENT_VSP, resource.getName(), csarUUID, oldCsarUUID);
         }
     }
 
-    private Resource getResourceByUniqueId(Wrapper<ResponseFormat> responseWrapper, String resourceUniqueId) {
+    private Resource getResourceByUniqueId(String resourceUniqueId) {
         Either<Resource, StorageOperationStatus> oldResourceRes = toscaOperationFacade.getToscaFullElement(resourceUniqueId);
         if (oldResourceRes.isRight()) {
             log.debug("Failed to find previous resource by UniqueId {}, status: {}", resourceUniqueId,
                     oldResourceRes.right().value());
-            responseWrapper.setInnerElement(componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(oldResourceRes.right().value())));
-            return null;
+            throw new StorageException(oldResourceRes.right().value());
         }
         return oldResourceRes.left().value();
     }
@@ -517,216 +386,128 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         resource.setName(oldRresource.getName());
         resource.setIcon(oldRresource.getIcon());
         resource.setTags(oldRresource.getTags());
-        resource.setVendorName(oldRresource.getVendorName());
         resource.setCategories(oldRresource.getCategories());
         resource.setDerivedFrom(oldRresource.getDerivedFrom());
     }
 
-    private Either<Resource, ResponseFormat> updateResourceFromCsar(Resource oldRresource, Resource newRresource,
-                                                                    User user, AuditingActionEnum updateResource, boolean inTransaction,
-                                                                    Either<Map<String, byte[]>, StorageOperationStatus> csarUIPayload, String csarUUID) {
-
-        // check state
-        if (LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.equals(oldRresource.getLifecycleState())) {
-            if (!oldRresource.getLastUpdaterUserId().equals(user.getUserId())) {
-                log.debug("Current user is not last updater, last updater userId: {}, current user userId: {}",
-                        oldRresource.getLastUpdaterUserId(), user.getUserId());
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
-            }
-        }
-        String lockedResourceId = oldRresource.getUniqueId();
+    private Resource updateResourceFromCsar(Resource oldResource, Resource newResource,
+                                            User user, AuditingActionEnum updateResource, boolean inTransaction,
+                                            Map<String, byte[]> csarUIPayload, String csarUUID) {
+        Resource updatedResource = null;
+        validateLifecycleState(oldResource, user);
+        String lockedResourceId = oldResource.getUniqueId();
         List<ArtifactDefinition> createdArtifacts = new ArrayList<>();
-
-        Either<Map<String, byte[]>, StorageOperationStatus> csar = null;
-        if (csarUIPayload != null && csarUIPayload.left() != null && csarUIPayload.left().value() != null) {
-            csar = csarUIPayload;
-        } else {
-            csar = csarOperation.getCsar(csarUUID, user);
-        }
-        if (csar.isRight()) {
-            log.debug("Failed to get csar for casrUUID{} ", csarUUID);
-            return Either.right(componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(csar.right().value())));
-        }
-
-        Either<ImmutablePair<String, String>, ResponseFormat> toscaYamlCsarStatus = validateAndParseCsar(newRresource,
-                user, csarUUID, csar);
-        if (toscaYamlCsarStatus.isRight()) {
-            return Either.right(toscaYamlCsarStatus.right().value());
-        }
-        Either<String, ResponseFormat> checksum = CsarValidationUtils.getToscaYamlChecksum(csar.left().value(),
-                csarUUID, componentsUtils);
-        if (checksum.isRight()) {
-            log.debug("Failed to calculate checksum for casrUUID{} error {} ", csarUUID, checksum.right().value());
-            return Either.right(checksum.right().value());
-        }
-        if (!checksum.left().value().equals(
-                oldRresource.getComponentMetadataDefinition().getMetadataDataDefinition().getImportedToscaChecksum())) {
-            log.debug("The checksum of main template yaml of csar with csarUUID {} is not equal to the previous one, existing checksum is {}, new one is {}.", csarUUID,
-                    oldRresource.getComponentMetadataDefinition().getMetadataDataDefinition()
-                            .getImportedToscaChecksum(),
-                    checksum.left().value());
-            oldRresource.getComponentMetadataDefinition().getMetadataDataDefinition()
-            .setImportedToscaChecksum(checksum.left().value());
-        }
-
-        Either<Boolean, ResponseFormat> lockResult = lockComponent(lockedResourceId, oldRresource,
+        CsarInfo csarInfo = csarBusinessLogic.getCsarInfo(newResource, oldResource, user, csarUIPayload, csarUUID);
+        Either<Boolean, ResponseFormat> lockResult = lockComponent(lockedResourceId, oldResource,
                 "update Resource From Csar");
         if (lockResult.isRight()) {
-            return Either.right(lockResult.right().value());
+            throw new ComponentException(lockResult.right().value());
         }
 
-        String yamlFileName = toscaYamlCsarStatus.left().value().getKey();
-        String yamlFileContents = toscaYamlCsarStatus.left().value().getValue();
-        CsarInfo csarInfo = new CsarInfo(newRresource.getName(), user, csarUUID, csar.left().value(), yamlFileContents,
-                true);
-        Map<String, NodeTypeInfo> nodeTypesInfo = extractNodeTypesInfo(csarInfo);
-        Either<Resource, ResponseFormat> result = null;
+        Map<String, NodeTypeInfo> nodeTypesInfo = csarInfo.extractNodeTypesInfo();
 
         Either<Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>>, ResponseFormat> findNodeTypesArtifactsToHandleRes = findNodeTypesArtifactsToHandle(
-                nodeTypesInfo, csarInfo, oldRresource);
+                nodeTypesInfo, csarInfo, oldResource);
         if (findNodeTypesArtifactsToHandleRes.isRight()) {
             log.debug("failed to find node types for update with artifacts during import csar {}. ",
                     csarInfo.getCsarUUID());
-            result = Either.right(findNodeTypesArtifactsToHandleRes.right().value());
-            return result;
+            throw new ComponentException(findNodeTypesArtifactsToHandleRes.right().value());
         }
         Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle = findNodeTypesArtifactsToHandleRes
                 .left().value();
         try {
-            result = updateResourceFromYaml(oldRresource, newRresource, updateResource, createdArtifacts, yamlFileName,
-                    yamlFileContents, csarInfo, nodeTypesInfo, nodeTypesArtifactsToHandle, null, false);
+            updatedResource = updateResourceFromYaml(oldResource, newResource, updateResource, createdArtifacts, csarInfo.getMainTemplateName(),
+                    csarInfo.getMainTemplateContent(), csarInfo, nodeTypesInfo, nodeTypesArtifactsToHandle, null, false);
 
-        } finally {
-            if (result == null || result.isRight()) {
-                log.warn("operation failed. do rollback");
-                titanDao.rollback();
-            } else {
-                log.debug("operation success. do commit");
-                titanDao.commit();
-            }
+            connectUiRelations(oldResource, updatedResource);
+
+        } catch (ComponentException|StorageException e){
+            rollback(inTransaction, newResource, createdArtifacts, null);
+            throw e;
+        }
+        finally {
+            titanDao.commit();
             log.debug("unlock resource {}", lockedResourceId);
             graphLockOperation.unlockComponent(lockedResourceId, NodeTypeEnum.Resource);
         }
-        return result;
+        return updatedResource;
 
     }
 
-    private Either<Resource, ResponseFormat> updateResourceFromYaml(Resource oldRresource, Resource newRresource,
-            AuditingActionEnum updateResource, List<ArtifactDefinition> createdArtifacts,
-            String yamlFileName, String yamlFileContent, CsarInfo csarInfo, Map<String, NodeTypeInfo> nodeTypesInfo,
-            Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle,
-            String nodeName, boolean isNested) {
-        Either<Resource, ResponseFormat> result;
-        Either<Map<String, Resource>, ResponseFormat> parseNodeTypeInfoYamlEither;
-        boolean inTransaction = true;
-        boolean shouldLock = false;
-
-        Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> prepareForUpdate;
-        Resource preparedResource;
-        Either<ParsedToscaYamlInfo, ResponseFormat> uploadComponentInstanceInfoMap = parseResourceInfoFromYaml(
-                yamlFileName, newRresource, yamlFileContent, csarInfo.getCreatedNodesToscaResourceNames(),
-                nodeTypesInfo, nodeName);
-        if (uploadComponentInstanceInfoMap.isRight()) {
-            ResponseFormat responseFormat = uploadComponentInstanceInfoMap.right().value();
-            componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), newRresource, updateResource);
-            result = Either.right(responseFormat);
-            return result;
+    private void validateLifecycleState(Resource oldResource, User user) {
+        if (LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.equals(oldResource.getLifecycleState()) &&
+                !oldResource.getLastUpdaterUserId().equals(user.getUserId())) {
+            log.debug("#validateLifecycleState - Current user is not last updater, last updater userId: {}, current user userId: {}",
+                    oldResource.getLastUpdaterUserId(), user.getUserId());
+            throw new ComponentException(ActionStatus.RESTRICTED_OPERATION);
         }
+    }
 
-        Map<String, UploadComponentInstanceInfo> instances = uploadComponentInstanceInfoMap.left().value()
-                .getInstances();
+    private Either<Resource, ResponseFormat> connectUiRelations(Resource oldResource, Resource newResource) {
+        Either<Resource, ResponseFormat> result;
 
-            prepareForUpdate = updateExistingResourceByImport(newRresource, oldRresource, csarInfo.getModifier(),
-                    inTransaction, shouldLock, isNested);
-            if (prepareForUpdate.isRight()) {
-                log.debug("Failed to prepare resource for update : {}", prepareForUpdate.right().value());
-                result = Either.right(prepareForUpdate.right().value());
-                return result;
-            }
-            preparedResource = prepareForUpdate.left().value().left;
+        List<RequirementCapabilityRelDef> updatedUiRelations = mergeInstanceUtils.updateUiRelationsInResource(oldResource, newResource);
 
-            log.trace("YAML topology file found in CSAR, file name: {}, contents: {}", yamlFileName, yamlFileContent);
+        StorageOperationStatus status = toscaOperationFacade.associateResourceInstances(newResource.getUniqueId(), updatedUiRelations);
+        if (status == StorageOperationStatus.OK) {
+            newResource.getComponentInstancesRelations().addAll(updatedUiRelations);
+            result = Either.left(newResource);
+        } else {
+            result = Either.right(componentsUtils.getResponseFormatByResource(componentsUtils.convertFromStorageResponse(status), newResource));
+        }
 
-            Either<Resource, ResponseFormat> genericResourceEither = handleResourceGenericType(preparedResource);
-            if (genericResourceEither.isRight()) {
-                log.debug("failed to get resource generic type. status is {}", genericResourceEither.right().value());
-                ResponseFormat responseFormat = genericResourceEither.right().value();
-                componentsUtils.auditResource(genericResourceEither.right().value(), csarInfo.getModifier(),
-                        preparedResource, updateResource);
-                return Either.right(responseFormat);
-            }
+        return result;
+    }
 
-            parseNodeTypeInfoYamlEither = this.handleNodeTypes(yamlFileName, preparedResource, yamlFileContent,
+    private Resource updateResourceFromYaml(Resource oldRresource, Resource newRresource,
+                                            AuditingActionEnum actionEnum, List<ArtifactDefinition> createdArtifacts,
+                                            String yamlFileName, String yamlFileContent, CsarInfo csarInfo, Map<String, NodeTypeInfo> nodeTypesInfo,
+                                            Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle,
+                                            String nodeName, boolean isNested) {
+        boolean inTransaction = true;
+        boolean shouldLock = false;
+        Resource preparedResource = null;
+        ParsedToscaYamlInfo uploadComponentInstanceInfoMap = null;
+        try {
+            uploadComponentInstanceInfoMap = csarBusinessLogic.getParsedToscaYamlInfo(yamlFileContent, yamlFileName, nodeTypesInfo, csarInfo, nodeName);
+            Map<String, UploadComponentInstanceInfo> instances = uploadComponentInstanceInfoMap.getInstances();
+            preparedResource = updateExistingResourceByImport(newRresource, oldRresource, csarInfo.getModifier(),
+                    inTransaction, shouldLock, isNested).left;
+            log.trace("YAML topology file found in CSAR, file name: {}, contents: {}", yamlFileName, yamlFileContent);
+            handleResourceGenericType(preparedResource);
+            handleNodeTypes(yamlFileName, preparedResource, yamlFileContent,
                     shouldLock, nodeTypesArtifactsToHandle, createdArtifacts, nodeTypesInfo, csarInfo, nodeName);
-            if (parseNodeTypeInfoYamlEither.isRight()) {
-                ResponseFormat responseFormat = parseNodeTypeInfoYamlEither.right().value();
-                componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), preparedResource, updateResource);
-                result = Either.right(responseFormat);
-                return result;
-            }
-
-            Map<String, InputDefinition> inputs = uploadComponentInstanceInfoMap.left().value().getInputs();
-            Either<Resource, ResponseFormat> createInputsOnResource = createInputsOnResource(preparedResource,
-                    csarInfo.getModifier(), inputs, inTransaction);
-            if (createInputsOnResource.isRight()) {
-                log.debug("failed to create resource inputs status is {}", createInputsOnResource.right().value());
-                ResponseFormat responseFormat = createInputsOnResource.right().value();
-                componentsUtils.auditResource(createInputsOnResource.right().value(), csarInfo.getModifier(),
-                        preparedResource, updateResource);
-                result = Either.right(responseFormat);
-                return result;
-            }
-            preparedResource = createInputsOnResource.left().value();
-
-            Either<Resource, ResponseFormat> createResourcesInstancesEither = createResourceInstances(
-                    csarInfo.getModifier(), yamlFileName, preparedResource, instances, inTransaction, shouldLock,
-                    csarInfo.getCreatedNodes());
-            if (createResourcesInstancesEither.isRight()) {
-                log.debug("failed to create resource instances status is {}",
-                        createResourcesInstancesEither.right().value());
-                ResponseFormat responseFormat = createResourcesInstancesEither.right().value();
-                componentsUtils.auditResource(createResourcesInstancesEither.right().value(), csarInfo.getModifier(),
-                        preparedResource, updateResource);
-                result = Either.right(responseFormat);
-                return result;
-            }
-            preparedResource = createResourcesInstancesEither.left().value();
-
-            createResourcesInstancesEither = createResourceInstancesRelations(csarInfo.getModifier(), yamlFileName,
-                    preparedResource, instances);
-            if (createResourcesInstancesEither.isRight()) {
-                log.debug("failed to create relation between resource instances status is {}",
-                        createResourcesInstancesEither.right().value());
-                result = Either.right(createResourcesInstancesEither.right().value());
-                return result;
-            }
-
-            preparedResource = createResourcesInstancesEither.left().value();
-
-            Either<Map<String, GroupDefinition>, ResponseFormat> validateUpdateVfGroupNamesRes = groupBusinessLogic
-                    .validateUpdateVfGroupNames(uploadComponentInstanceInfoMap.left().value().getGroups(),
-                            preparedResource.getSystemName());
-            if (validateUpdateVfGroupNamesRes.isRight()) {
-
-                return Either.right(validateUpdateVfGroupNamesRes.right().value());
-            }
-            // add groups to resource
-            Map<String, GroupDefinition> groups;
-
-            if (!validateUpdateVfGroupNamesRes.left().value().isEmpty()) {
-                groups = validateUpdateVfGroupNamesRes.left().value();
-            } else {
-                groups = uploadComponentInstanceInfoMap.left().value().getGroups();
-            }
-            Either<Resource, ResponseFormat> updatedGroupsOnResource = updateGroupsOnResource(preparedResource,
-                    csarInfo.getModifier(), groups);
-            if (updatedGroupsOnResource.isRight()) {
-
-                return updatedGroupsOnResource;
-            }
-            preparedResource = updatedGroupsOnResource.left().value();
-
+            preparedResource = createInputsOnResource(preparedResource,  uploadComponentInstanceInfoMap.getInputs());
+            preparedResource = createResourceInstances(yamlFileName, preparedResource, instances, csarInfo.getCreatedNodes());
+            preparedResource = createResourceInstancesRelations(csarInfo.getModifier(), yamlFileName, preparedResource, instances);
+        } catch (ComponentException e) {
+            ResponseFormat responseFormat = e.getResponseFormat() == null ? componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams()) : e.getResponseFormat();
+            log.debug("#updateResourceFromYaml - failed to update resource from yaml {} .The error is {}", yamlFileName, responseFormat);
+            componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), preparedResource == null ? oldRresource : preparedResource, actionEnum);
+            throw e;
+        } catch (StorageException e){
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(e.getStorageOperationStatus()));
+            log.debug("#updateResourceFromYaml - failed to update resource from yaml {} .The error is {}", yamlFileName, responseFormat);
+            componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), preparedResource == null ? oldRresource : preparedResource, actionEnum);
+            throw e;
+        }
+        Either<Map<String, GroupDefinition>, ResponseFormat> validateUpdateVfGroupNamesRes = groupBusinessLogic
+                .validateUpdateVfGroupNames(uploadComponentInstanceInfoMap.getGroups(),
+                        preparedResource.getSystemName());
+        if (validateUpdateVfGroupNamesRes.isRight()) {
+
+            throw new ComponentException(validateUpdateVfGroupNamesRes.right().value());
+        }
+        // add groups to resource
+        Map<String, GroupDefinition> groups;
+
+        if (!validateUpdateVfGroupNamesRes.left().value().isEmpty()) {
+            groups = validateUpdateVfGroupNamesRes.left().value();
+        } else {
+            groups = uploadComponentInstanceInfoMap.getGroups();
+        }
+        handleGroupsProperties(preparedResource, groups);
+        preparedResource =  updateGroupsOnResource(preparedResource, groups);
         NodeTypeInfoToUpdateArtifacts nodeTypeInfoToUpdateArtifacts = new NodeTypeInfoToUpdateArtifacts(nodeName,
                 nodeTypesArtifactsToHandle);
 
@@ -734,25 +515,18 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 csarInfo, preparedResource, nodeTypeInfoToUpdateArtifacts, inTransaction, shouldLock);
         if (updateArtifactsEither.isRight()) {
             log.debug("failed to update artifacts {}", updateArtifactsEither.right().value());
-            result = Either.right(updateArtifactsEither.right().value());
-            return result;
+            throw new ComponentException(updateArtifactsEither.right().value());
         }
-        preparedResource = updateArtifactsEither.left().value();
+        preparedResource = getResourceWithGroups(updateArtifactsEither.left().value().getUniqueId());
 
-        ActionStatus mergingPropsAndInputsStatus = mergeResourceEntities(oldRresource, preparedResource);
+        ActionStatus mergingPropsAndInputsStatus = resourceDataMergeBusinessLogic.mergeResourceEntities(oldRresource, preparedResource);
         if (mergingPropsAndInputsStatus != ActionStatus.OK) {
             ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(mergingPropsAndInputsStatus,
                     preparedResource);
-            return Either.right(responseFormat);
+            throw new ComponentException(responseFormat);
         }
-
-        Either<List<ComponentInstance>, ResponseFormat> eitherSetPosition = compositionBusinessLogic
-                .setPositionsForComponentInstances(preparedResource, csarInfo.getModifier().getUserId());
-        result = eitherSetPosition.isRight() ? Either.right(eitherSetPosition.right().value())
-                : Either.left(preparedResource);
-
-        return result;
-
+        compositionBusinessLogic.setPositionsForComponentInstances(preparedResource, csarInfo.getModifier().getUserId());
+        return preparedResource;
     }
 
     private Either<Resource, ResponseFormat> createOrUpdateArtifacts(ArtifactOperationEnum operation, List<ArtifactDefinition> createdArtifacts,
@@ -785,100 +559,30 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(resource);
     }
 
-    private ActionStatus mergeResourceEntities(Resource oldResource, Resource newResource) {
-        Either<MergeResourceBusinessLogic, ActionStatus> mergeResourceBLEither = mergeResourceBLFactory
-                .getInstance(oldResource, newResource);
-        if (mergeResourceBLEither.isRight()) {
-            return mergeResourceBLEither.right().value();
-        }
-        MergeResourceBusinessLogic mergeResourceBusinessLogic = mergeResourceBLEither.left().value();
-        return mergeResourceBusinessLogic.mergeResourceEntities(oldResource, newResource);
-    }
-
-    private Either<Resource, ResponseFormat> handleResourceGenericType(Resource resource) {
-        Either<Resource, ResponseFormat> genericResourceEither = fetchAndSetDerivedFromGenericType(resource);
-        if (genericResourceEither.isRight()) {
-            return genericResourceEither;
-        }
+    private Resource handleResourceGenericType(Resource resource) {
+        Resource genericResource = fetchAndSetDerivedFromGenericType(resource);
         if (resource.shouldGenerateInputs()) {
-            generateAndAddInputsFromGenericTypeProperties(resource, genericResourceEither.left().value());
+            generateAndAddInputsFromGenericTypeProperties(resource, genericResource);
         }
-        return genericResourceEither;
+        return genericResource;
     }
 
     private Either<Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>>, ResponseFormat> findNodeTypesArtifactsToHandle(
             Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo, Resource oldResource) {
 
-        Map<String, List<ArtifactDefinition>> extractedVfcsArtifacts = CsarUtils
-                .extractVfcsArtifactsFromCsar(csarInfo.getCsar());
         Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle = new HashMap<>();
-        Either<Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>>, ResponseFormat> nodeTypesArtifactsToHandleRes;
+        Either<Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>>, ResponseFormat> nodeTypesArtifactsToHandleRes
+                = Either.left(nodeTypesArtifactsToHandle);
 
         try {
-            nodeTypesArtifactsToHandleRes = Either.left(nodeTypesArtifactsToHandle);
-            Map<String, ImmutablePair<String, String>> extractedVfcToscaNames = extractVfcToscaNames(nodeTypesInfo,
-                    oldResource.getName(), csarInfo);
-            Either<EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>, ResponseFormat> curNodeTypeArtifactsToHandleRes;
-            EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>> curNodeTypeArtifactsToHandle = null;
+            Map<String, List<ArtifactDefinition>> extractedVfcsArtifacts = CsarUtils.extractVfcsArtifactsFromCsar(csarInfo.getCsar());
+            Map<String, ImmutablePair<String, String>> extractedVfcToscaNames =
+                    extractVfcToscaNames(nodeTypesInfo, oldResource.getName(), csarInfo);
             log.debug("Going to fetch node types for resource with name {} during import csar with UUID {}. ",
                     oldResource.getName(), csarInfo.getCsarUUID());
-
-            for (Entry<String, ImmutablePair<String, String>> currVfcToscaNameEntry : extractedVfcToscaNames
-                    .entrySet()) {
-                String currVfcToscaName = currVfcToscaNameEntry.getValue().getLeft();
-                String previousVfcToscaName = currVfcToscaNameEntry.getValue().getRight();
-                String currNamespace = currVfcToscaNameEntry.getKey();
-                log.debug("Going to fetch node type with tosca name {}. ", currVfcToscaName);
-
-                Either<Resource, StorageOperationStatus> curVfcRes = toscaOperationFacade
-                        .getLatestByToscaResourceName(currVfcToscaName);
-                Resource curNodeType = null;
-                if (curVfcRes.isRight() && curVfcRes.right().value() == StorageOperationStatus.NOT_FOUND) {
-                    curVfcRes = toscaOperationFacade.getLatestByToscaResourceName(previousVfcToscaName);
-                }
-                if (curVfcRes.isRight() && curVfcRes.right().value() != StorageOperationStatus.NOT_FOUND) {
-                    log.debug("Error occured during fetching node type with tosca name {}, error: {}", currVfcToscaName,
-                            curVfcRes.right().value());
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-                            componentsUtils.convertFromStorageResponse(curVfcRes.right().value()),
-                            csarInfo.getCsarUUID());
-                    componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), oldResource,    AuditingActionEnum.CREATE_RESOURCE);
-                    nodeTypesArtifactsToHandleRes = Either.right(responseFormat);
-                    break;
-                } else if (curVfcRes.isLeft()) {
-                    curNodeType = curVfcRes.left().value();
-                }
-                if (!MapUtils.isEmpty(extractedVfcsArtifacts)) {
-                    List<ArtifactDefinition> currArtifacts = new ArrayList<>();
-                    if (extractedVfcsArtifacts.containsKey(currNamespace)) {
-                        handleAndAddExtractedVfcsArtifacts(currArtifacts, extractedVfcsArtifacts.get(currNamespace));
-                    }
-                    curNodeTypeArtifactsToHandleRes = findNodeTypeArtifactsToHandle(curNodeType, currArtifacts);
-                    if (curNodeTypeArtifactsToHandleRes.isRight()) {
-                        nodeTypesArtifactsToHandleRes = Either.right(curNodeTypeArtifactsToHandleRes.right().value());
-                        break;
-                    }
-                    curNodeTypeArtifactsToHandle = curNodeTypeArtifactsToHandleRes.left().value();
-
-                } else if (curNodeType != null) {
-                    // delete all artifacts if have not received artifacts from
-                    // csar
-                    curNodeTypeArtifactsToHandle = new EnumMap<>(ArtifactOperationEnum.class);
-                    List<ArtifactDefinition> artifactsToDelete = new ArrayList<>();
-                    // delete all informational artifacts
-                    artifactsToDelete.addAll(curNodeType.getArtifacts().values().stream()
-                            .filter(a -> a.getArtifactGroupType() == ArtifactGroupTypeEnum.INFORMATIONAL)
-                            .collect(Collectors.toList()));
-                    // delete all deployment artifacts
-                    artifactsToDelete.addAll(curNodeType.getDeploymentArtifacts().values());
-                    if (!artifactsToDelete.isEmpty()) {
-                        curNodeTypeArtifactsToHandle.put(ArtifactOperationEnum.DELETE, artifactsToDelete);
-                    }
-                }
-                if (MapUtils.isNotEmpty(curNodeTypeArtifactsToHandle)) {
-                    nodeTypesArtifactsToHandle.put(currVfcToscaNameEntry.getKey(), curNodeTypeArtifactsToHandle);
-                }
-            }
+            extractedVfcToscaNames.forEach((namespace, vfcToscaNames) -> findAddNodeTypeArtifactsToHandle(csarInfo, nodeTypesArtifactsToHandle, oldResource,
+                    extractedVfcsArtifacts,
+                    namespace, vfcToscaNames));
         } catch (Exception e) {
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
             nodeTypesArtifactsToHandleRes = Either.right(responseFormat);
@@ -887,86 +591,142 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return nodeTypesArtifactsToHandleRes;
     }
 
-    private Either<EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>, ResponseFormat> findNodeTypeArtifactsToHandle(
+    private void findAddNodeTypeArtifactsToHandle(CsarInfo csarInfo, Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle,
+                                                  Resource resource, Map<String, List<ArtifactDefinition>> extractedVfcsArtifacts, String namespace, ImmutablePair<String, String> vfcToscaNames){
+
+        EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>> curNodeTypeArtifactsToHandle = null;
+        log.debug("Going to fetch node type with tosca name {}. ", vfcToscaNames.getLeft());
+        Resource curNodeType = findVfcResource(csarInfo, resource, vfcToscaNames.getLeft(), vfcToscaNames.getRight(), null);
+        if (!isEmpty(extractedVfcsArtifacts)) {
+            List<ArtifactDefinition> currArtifacts = new ArrayList<>();
+            if (extractedVfcsArtifacts.containsKey(namespace)) {
+                handleAndAddExtractedVfcsArtifacts(currArtifacts, extractedVfcsArtifacts.get(namespace));
+            }
+            curNodeTypeArtifactsToHandle = findNodeTypeArtifactsToHandle(curNodeType, currArtifacts);
+        } else if (curNodeType != null) {
+            // delete all artifacts if have not received artifacts from
+            // csar
+            curNodeTypeArtifactsToHandle = new EnumMap<>(ArtifactOperationEnum.class);
+            List<ArtifactDefinition> artifactsToDelete = new ArrayList<>();
+            // delete all informational artifacts
+            artifactsToDelete.addAll(curNodeType.getArtifacts().values().stream()
+                    .filter(a -> a.getArtifactGroupType() == ArtifactGroupTypeEnum.INFORMATIONAL)
+                    .collect(toList()));
+            // delete all deployment artifacts
+            artifactsToDelete.addAll(curNodeType.getDeploymentArtifacts().values());
+            if (!artifactsToDelete.isEmpty()) {
+                curNodeTypeArtifactsToHandle.put(ArtifactOperationEnum.DELETE, artifactsToDelete);
+            }
+        }
+        if (isNotEmpty(curNodeTypeArtifactsToHandle)) {
+            nodeTypesArtifactsToHandle.put(namespace, curNodeTypeArtifactsToHandle);
+        }
+    }
+
+    private Resource findVfcResource(CsarInfo csarInfo, Resource resource, String currVfcToscaName, String previousVfcToscaName, StorageOperationStatus status) {
+        if (status != null && status != StorageOperationStatus.NOT_FOUND) {
+            log.debug("Error occured during fetching node type with tosca name {}, error: {}", currVfcToscaName, status);
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), csarInfo.getCsarUUID());
+            componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, AuditingActionEnum.CREATE_RESOURCE);
+            throw new ComponentException(componentsUtils.convertFromStorageResponse(status), csarInfo.getCsarUUID());
+        } else if (StringUtils.isNotEmpty(currVfcToscaName)) {
+            return (Resource)toscaOperationFacade.getLatestByToscaResourceName(currVfcToscaName)
+                    .left()
+                    .on(st -> findVfcResource(csarInfo, resource, previousVfcToscaName, null, st));
+        }
+        return null;
+    }
+
+    private EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>> findNodeTypeArtifactsToHandle(
             Resource curNodeType, List<ArtifactDefinition> extractedArtifacts) {
 
-        Either<EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>, ResponseFormat> nodeTypeArtifactsToHandleRes = null;
         EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle = null;
-        Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
         try {
             List<ArtifactDefinition> artifactsToUpload = new ArrayList<>(extractedArtifacts);
             List<ArtifactDefinition> artifactsToUpdate = new ArrayList<>();
             List<ArtifactDefinition> artifactsToDelete = new ArrayList<>();
-            if (curNodeType != null) {
-                Map<String, ArtifactDefinition> existingArtifacts = new HashMap<>();
-                if (curNodeType.getDeploymentArtifacts() != null) {
-                    existingArtifacts.putAll(curNodeType.getDeploymentArtifacts());
-                }
-                if (curNodeType.getArtifacts() != null) {
-                    existingArtifacts
-                            .putAll(curNodeType.getArtifacts().entrySet().stream()
-                                    .filter(e -> e.getValue()
-                                            .getArtifactGroupType() == ArtifactGroupTypeEnum.INFORMATIONAL)
-                                    .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())));
-                }
-                for (ArtifactDefinition currNewArtifact : extractedArtifacts) {
-                    ArtifactDefinition foundArtifact;
-
-                    if (!existingArtifacts.isEmpty()) {
-                        foundArtifact = existingArtifacts.values().stream()
-                                .filter(a -> a.getArtifactName().equals(currNewArtifact.getArtifactName())).findFirst()
-                                .orElse(null);
-                        if (foundArtifact != null) {
-                            if (foundArtifact.getArtifactType().equals(currNewArtifact.getArtifactType())) {
-                                if (!foundArtifact.getArtifactChecksum()
-                                        .equals(currNewArtifact.getArtifactChecksum())) {
-                                    foundArtifact.setPayload(currNewArtifact.getPayloadData());
-                                    foundArtifact.setPayloadData(
-                                            Base64.encodeBase64String(currNewArtifact.getPayloadData()));
-                                    foundArtifact.setArtifactChecksum(GeneralUtility
-                                            .calculateMD5Base64EncodedByByteArray(currNewArtifact.getPayloadData()));
-                                    artifactsToUpdate.add(foundArtifact);
-                                }
-                                existingArtifacts.remove(foundArtifact.getArtifactLabel());
-                                artifactsToUpload.remove(currNewArtifact);
-                            } else {
-                                log.debug("Can't upload two artifact with the same name {}.",
-                                        currNewArtifact.getArtifactName());
-                                ResponseFormat responseFormat = ResponseFormatManager.getInstance().getResponseFormat(
-                                        ActionStatus.ARTIFACT_ALRADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR,
-                                        currNewArtifact.getArtifactName(), currNewArtifact.getArtifactType(),
-                                        foundArtifact.getArtifactType());
-                                responseWrapper.setInnerElement(responseFormat);
-                                break;
-                            }
-                        }
-                    }
-                }
-                if (responseWrapper.isEmpty()) {
-                    artifactsToDelete.addAll(existingArtifacts.values());
-                }
+            processExistingNodeTypeArtifacts(extractedArtifacts, artifactsToUpload, artifactsToUpdate, artifactsToDelete,
+                    collectExistingArtifacts(curNodeType));
+            nodeTypeArtifactsToHandle = putFoundArtifacts(artifactsToUpload, artifactsToUpdate, artifactsToDelete);
+        } catch (Exception e) {
+            log.debug("Exception occured when findNodeTypeArtifactsToHandle, error is:{}", e.getMessage(), e);
+            throw new ComponentException(ActionStatus.GENERAL_ERROR);
+        }
+        return nodeTypeArtifactsToHandle;
+    }
+
+    private EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>> putFoundArtifacts(List<ArtifactDefinition> artifactsToUpload, List<ArtifactDefinition> artifactsToUpdate, List<ArtifactDefinition> artifactsToDelete) {
+        EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle = null;
+        if (!artifactsToUpload.isEmpty() || !artifactsToUpdate.isEmpty() || !artifactsToDelete.isEmpty()) {
+            nodeTypeArtifactsToHandle = new EnumMap<>(ArtifactOperationEnum.class);
+            if (!artifactsToUpload.isEmpty()) {
+                nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.CREATE, artifactsToUpload);
             }
-            if (responseWrapper.isEmpty()) {
-                if (!artifactsToUpload.isEmpty() || !artifactsToUpdate.isEmpty() || !artifactsToDelete.isEmpty()) {
-                    nodeTypeArtifactsToHandle = new EnumMap<>(ArtifactOperationEnum.class);
-                    if (!artifactsToUpload.isEmpty())
-                        nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.CREATE, artifactsToUpload);
-                    if (!artifactsToUpdate.isEmpty())
-                        nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.UPDATE, artifactsToUpdate);
-                    if (!artifactsToDelete.isEmpty())
-                        nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.DELETE, artifactsToDelete);
-                }
-                nodeTypeArtifactsToHandleRes = Either.left(nodeTypeArtifactsToHandle);
+            if (!artifactsToUpdate.isEmpty()) {
+                nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.UPDATE, artifactsToUpdate);
             }
-            if (!responseWrapper.isEmpty()) {
-                nodeTypeArtifactsToHandleRes = Either.right(responseWrapper.getInnerElement());
+            if (!artifactsToDelete.isEmpty()) {
+                nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.DELETE, artifactsToDelete);
             }
-        } catch (Exception e) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
-            responseWrapper.setInnerElement(responseFormat);
-            log.debug("Exception occured when findNodeTypeArtifactsToHandle, error is:{}", e.getMessage(), e);
         }
-        return nodeTypeArtifactsToHandleRes;
+        return nodeTypeArtifactsToHandle;
+    }
+
+    private void processExistingNodeTypeArtifacts(List<ArtifactDefinition> extractedArtifacts, List<ArtifactDefinition> artifactsToUpload,
+                                                  List<ArtifactDefinition> artifactsToUpdate, List<ArtifactDefinition> artifactsToDelete,
+                                                  Map<String, ArtifactDefinition> existingArtifacts) {
+        if (!existingArtifacts.isEmpty()) {
+            extractedArtifacts.stream().forEach(a -> processNodeTypeArtifact(artifactsToUpload, artifactsToUpdate, existingArtifacts, a));
+            artifactsToDelete.addAll(existingArtifacts.values());
+        }
+    }
+
+    private void processNodeTypeArtifact(List<ArtifactDefinition> artifactsToUpload, List<ArtifactDefinition> artifactsToUpdate, Map<String, ArtifactDefinition> existingArtifacts, ArtifactDefinition currNewArtifact) {
+        Optional<ArtifactDefinition> foundArtifact = existingArtifacts.values()
+                .stream()
+                .filter(a -> a.getArtifactName().equals(currNewArtifact.getArtifactName()))
+                .findFirst();
+        if (foundArtifact.isPresent()) {
+            if (foundArtifact.get().getArtifactType().equals(currNewArtifact.getArtifactType())) {
+                updateFoundArtifact(artifactsToUpdate, currNewArtifact, foundArtifact.get());
+                existingArtifacts.remove(foundArtifact.get().getArtifactLabel());
+                artifactsToUpload.remove(currNewArtifact);
+            } else {
+                log.debug("Can't upload two artifact with the same name {}.", currNewArtifact.getArtifactName());
+                throw new ComponentException(ActionStatus.ARTIFACT_ALRADY_EXIST_IN_DIFFERENT_TYPE_IN_CSAR,
+                        currNewArtifact.getArtifactName(), currNewArtifact.getArtifactType(),
+                        foundArtifact.get().getArtifactType());
+            }
+        }
+    }
+
+    private void updateFoundArtifact(List<ArtifactDefinition> artifactsToUpdate, ArtifactDefinition currNewArtifact, ArtifactDefinition foundArtifact) {
+        if (!foundArtifact.getArtifactChecksum().equals(currNewArtifact.getArtifactChecksum())) {
+            foundArtifact.setPayload(currNewArtifact.getPayloadData());
+            foundArtifact.setPayloadData(
+                    Base64.encodeBase64String(currNewArtifact.getPayloadData()));
+            foundArtifact.setArtifactChecksum(GeneralUtility
+                    .calculateMD5Base64EncodedByByteArray(currNewArtifact.getPayloadData()));
+            artifactsToUpdate.add(foundArtifact);
+        }
+    }
+
+    private Map<String, ArtifactDefinition> collectExistingArtifacts(Resource curNodeType) {
+        Map<String, ArtifactDefinition> existingArtifacts = new HashMap<>();
+        if (curNodeType == null) {
+            return existingArtifacts;
+        }
+        if (MapUtils.isNotEmpty(curNodeType.getDeploymentArtifacts())) {
+            existingArtifacts.putAll(curNodeType.getDeploymentArtifacts());
+        }
+        if (MapUtils.isNotEmpty(curNodeType.getArtifacts())) {
+            existingArtifacts
+                    .putAll(curNodeType.getArtifacts().entrySet()
+                            .stream()
+                            .filter(e -> e.getValue().getArtifactGroupType() == ArtifactGroupTypeEnum.INFORMATIONAL)
+                            .collect(toMap(Map.Entry::getKey, Map.Entry::getValue)));
+        }
+        return existingArtifacts;
     }
 
     /**
@@ -987,7 +747,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                         resource.getName());
                 Either<? extends Component, ResponseFormat> checkoutRes = lifecycleBusinessLogic.changeComponentState(
                         resource.getComponentType(), resource.getUniqueId(), user, LifeCycleTransitionEnum.CHECKOUT,
-                        new LifecycleChangeInfoWithAction("certification on import",
+                        new LifecycleChangeInfoWithAction(CERTIFICATION_ON_IMPORT,
                                 LifecycleChanceActionEnum.CREATE_FROM_CSAR),
                         inTransaction, true);
                 if (checkoutRes.isRight()) {
@@ -1099,216 +859,42 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
     private void extractNodeTypes(Map<String, Object> nodes, Map<String, Object> mappedToscaTemplate) {
         Either<Map<String, Object>, ResultStatusEnum> eitherNodeTypes = ImportUtils
-                .findFirstToscaMapElement(mappedToscaTemplate, ToscaTagNamesEnum.NODE_TYPES);
+                .findFirstToscaMapElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.NODE_TYPES);
         if (eitherNodeTypes.isLeft()) {
             nodes.putAll(eitherNodeTypes.left().value());
         }
     }
 
-    public Either<Resource, ResponseFormat> createResourceFromCsar(Resource resource, User user,
-                                                                   Either<Map<String, byte[]>, StorageOperationStatus> csarUIPayload, String csarUUID) {
+    public Resource createResourceFromCsar(Resource resource, User user,
+                                           Map<String, byte[]> csarUIPayload, String csarUUID) {
         log.trace("************* created successfully from YAML, resource TOSCA ");
 
-        Either<Map<String, byte[]>, StorageOperationStatus> csar = null;
-        if (csarUIPayload != null && csarUIPayload.left() != null && csarUIPayload.left().value() != null) {
-            csar = csarUIPayload;
-        } else {
-            csar = csarOperation.getCsar(csarUUID, user);
-        }
-
-        Either<ImmutablePair<String, String>, ResponseFormat> toscaYamlCsarStatus = validateAndParseCsar(resource, user,
-                csarUUID, csar);
-        if (toscaYamlCsarStatus.isRight()) {
-            return Either.right(toscaYamlCsarStatus.right().value());
-        }
-        Either<String, ResponseFormat> toscaYamlChecksum = CsarValidationUtils.getToscaYamlChecksum(csar.left().value(),
-                csarUUID, componentsUtils);
-        if (toscaYamlChecksum.isRight()) {
-            log.debug("Failed to calculate checksum for CSAR {}, error  {}", csarUUID,
-                    toscaYamlChecksum.right().value());
-            return Either.right(toscaYamlChecksum.right().value());
-        }
-        resource.getComponentMetadataDefinition().getMetadataDataDefinition()
-                .setImportedToscaChecksum(toscaYamlChecksum.left().value());
-
-        String yamlFileName = toscaYamlCsarStatus.left().value().getKey();
-        String yamlFileContents = toscaYamlCsarStatus.left().value().getValue();
-        log.trace("YAML topology file found in CSAR, file name: {}, contents: {}", yamlFileName, yamlFileContents);
+        CsarInfo csarInfo = csarBusinessLogic.getCsarInfo(resource, null, user, csarUIPayload, csarUUID);
 
-        CsarInfo csarInfo = new CsarInfo(resource.getName(), user, csarUUID, csar.left().value(), yamlFileContents,
-                false);
-        Map<String, NodeTypeInfo> nodeTypesInfo = extractNodeTypesInfo(csarInfo);
+        Map<String, NodeTypeInfo> nodeTypesInfo = csarInfo.extractNodeTypesInfo();
         Either<Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>>, ResponseFormat> findNodeTypesArtifactsToHandleRes = findNodeTypesArtifactsToHandle(
                 nodeTypesInfo, csarInfo, resource);
         if (findNodeTypesArtifactsToHandleRes.isRight()) {
             log.debug("failed to find node types for update with artifacts during import csar {}. ",
                     csarInfo.getCsarUUID());
-            return Either.right(findNodeTypesArtifactsToHandleRes.right().value());
+            throw new ComponentException(findNodeTypesArtifactsToHandleRes.right().value());
         }
-        Either<Resource, ResponseFormat> createResourceFromYaml = createResourceFromYaml(resource, yamlFileContents,
-                yamlFileName, nodeTypesInfo, csarInfo, findNodeTypesArtifactsToHandleRes.left().value(), true, false,
+        Resource vfResource = createResourceFromYaml(resource, csarInfo.getMainTemplateContent(), csarInfo.getMainTemplateName(),
+                nodeTypesInfo, csarInfo, findNodeTypesArtifactsToHandleRes.left().value(), true, false,
                 null);
-        if (createResourceFromYaml.isRight()) {
-            log.debug("Couldn't create resource from YAML");
-            return Either.right(createResourceFromYaml.right().value());
-        }
-
-        Resource vfResource = createResourceFromYaml.left().value();
         log.trace("*************VF Resource created successfully from YAML, resource TOSCA name: {}",
                 vfResource.getToscaResourceName());
-        return Either.left(vfResource);
-    }
-
-    private Map<String, NodeTypeInfo> extractNodeTypesInfo(CsarInfo csarInfo) {
-        Map<String, NodeTypeInfo> nodeTypesInfo = new HashMap<>();
-        List<Entry<String, byte[]>> globalSubstitutes = new ArrayList<>();
-        for (Map.Entry<String, byte[]> entry : csarInfo.getCsar().entrySet()) {
-            extractNodeTypeInfo(nodeTypesInfo, globalSubstitutes, entry);
-        }
-        if (CollectionUtils.isNotEmpty(globalSubstitutes)) {
-            setDerivedFrom(nodeTypesInfo, globalSubstitutes);
-        }
-        markNestedVfc(csarInfo.getMappedToscaMainTemplate(), nodeTypesInfo);
-        return nodeTypesInfo;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void setDerivedFrom(Map<String, NodeTypeInfo> nodeTypesInfo,
-                                List<Entry<String, byte[]>> globalSubstitutes) {
-        for (Map.Entry<String, byte[]> entry : globalSubstitutes) {
-            String yamlFileContents = new String(entry.getValue());
-            Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(yamlFileContents);
-            Either<Object, ResultStatusEnum> nodeTypesEither = ImportUtils.findToscaElement(mappedToscaTemplate,
-                    ToscaTagNamesEnum.NODE_TYPES, ToscaElementTypeEnum.MAP);
-            if (nodeTypesEither.isLeft()) {
-                Map<String, Object> nodeTypes = (Map<String, Object>) nodeTypesEither.left().value();
-                for (Entry<String, Object> nodeType : nodeTypes.entrySet()) {
-                    Map<String, Object> nodeTypeMap = (Map<String, Object>) nodeType.getValue();
-                    if (nodeTypeMap.containsKey(ToscaTagNamesEnum.DERIVED_FROM.getElementName())) {
-                        if (nodeTypesInfo.containsKey(nodeType.getKey())) {
-                            NodeTypeInfo nodeTypeInfo = nodeTypesInfo.get(nodeType.getKey());
-                            List<String> derivedFrom = new ArrayList<>();
-                            derivedFrom.add((String) nodeTypeMap.get(ToscaTagNamesEnum.DERIVED_FROM.getElementName()));
-                            nodeTypeInfo.setDerivedFrom(derivedFrom);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void extractNodeTypeInfo(Map<String, NodeTypeInfo> nodeTypesInfo,
-                                     List<Entry<String, byte[]>> globalSubstitutes, Map.Entry<String, byte[]> entry) {
-        if (Pattern.compile(CsarUtils.SERVICE_TEMPLATE_PATH_PATTERN).matcher(entry.getKey()).matches()) {
-            if (!isGlobalSubstitute(entry.getKey())) {
-                String yamlFileContents = new String(entry.getValue());
-                Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(yamlFileContents);
-                Either<Object, ResultStatusEnum> substitutionMappingsEither = ImportUtils.findToscaElement(
-                        mappedToscaTemplate, ToscaTagNamesEnum.SUBSTITUTION_MAPPINGS, ToscaElementTypeEnum.MAP);
-                if (substitutionMappingsEither.isLeft()) {
-                    Map<String, Object> substitutionMappings = (Map<String, Object>) substitutionMappingsEither.left()
-                            .value();
-                    if (substitutionMappings.containsKey(ToscaTagNamesEnum.NODE_TYPE.getElementName())) {
-                        NodeTypeInfo nodeTypeInfo = new NodeTypeInfo();
-                        nodeTypeInfo.setType(
-                                (String) substitutionMappings.get(ToscaTagNamesEnum.NODE_TYPE.getElementName()));
-                        nodeTypeInfo.setTemplateFileName(entry.getKey());
-                        nodeTypeInfo.setMappedToscaTemplate(mappedToscaTemplate);
-                        nodeTypesInfo.put(nodeTypeInfo.getType(), nodeTypeInfo);
-                    }
-                }
-            } else {
-                globalSubstitutes.add(entry);
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void markNestedVfc(Map<String, Object> mappedToscaTemplate, Map<String, NodeTypeInfo> nodeTypesInfo) {
-        Either<Object, ResultStatusEnum> nodeTemplatesEither = ImportUtils.findToscaElement(mappedToscaTemplate,
-                ToscaTagNamesEnum.NODE_TEMPLATES, ToscaElementTypeEnum.MAP);
-        if (nodeTemplatesEither.isLeft()) {
-            Map<String, Object> nodeTemplates = (Map<String, Object>) nodeTemplatesEither.left().value();
-            for (Entry<String, Object> nodeTemplateEntry : nodeTemplates.entrySet()) {
-                Map<String, Object> nodeTemplate = (Map<String, Object>) nodeTemplateEntry.getValue();
-                if (nodeTemplate.containsKey(ToscaTagNamesEnum.TYPE.getElementName())) {
-                    String type = (String) nodeTemplate.get(ToscaTagNamesEnum.TYPE.getElementName());
-                    if (nodeTypesInfo.containsKey(type)) {
-                        NodeTypeInfo nodeTypeInfo = nodeTypesInfo.get(type);
-                        nodeTypeInfo.setNested(true);
-                    }
-                }
-            }
-        }
-    }
-
-    private boolean isGlobalSubstitute(String fileName) {
-        return fileName.equalsIgnoreCase(Constants.GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE)
-                || fileName.equalsIgnoreCase(Constants.ABSTRACT_SUBSTITUTE_GLOBAL_TYPES_SERVICE_TEMPLATE);
+        return vfResource;
     }
 
-    private Either<ImmutablePair<String, String>, ResponseFormat> validateAndParseCsar(Resource resource, User user,
-                                                                                       String csarUUID, Either<Map<String, byte[]>, StorageOperationStatus> csar) {
-        if (csar.isRight()) {
-            StorageOperationStatus value = csar.right().value();
-            log.debug("Error when fetching csar with ID {}, error: {}", csarUUID, value);
-            BeEcompErrorManager.getInstance()
-                    .logBeDaoSystemError("Creating resource from CSAR: fetching CSAR with id " + csarUUID + " failed");
-            ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(value), csarUUID);
-            componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.CREATE_RESOURCE);
-            return Either.right(responseFormat);
-        }
-
-        Either<Boolean, ResponseFormat> validateCsarStatus = CsarValidationUtils.validateCsar(csar.left().value(),
-                csarUUID, componentsUtils);
-        if (validateCsarStatus.isRight()) {
-            ResponseFormat responseFormat = validateCsarStatus.right().value();
-            log.debug("Error when validate csar with ID {}, error: {}", csarUUID, responseFormat);
-            BeEcompErrorManager.getInstance()
-                    .logBeDaoSystemError("Creating resource from CSAR: fetching CSAR with id " + csarUUID + " failed");
-            componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.CREATE_RESOURCE);
-            return Either.right(responseFormat);
-        }
-
-        Either<ImmutablePair<String, String>, ResponseFormat> toscaYamlCsarStatus = CsarValidationUtils
-                .getToscaYaml(csar.left().value(), csarUUID, componentsUtils);
-
-        if (toscaYamlCsarStatus.isRight()) {
-            ResponseFormat responseFormat = toscaYamlCsarStatus.right().value();
-            log.debug("Error when try to get csar toscayamlFile with csar ID {}, error: {}", csarUUID, responseFormat);
-            BeEcompErrorManager.getInstance()
-                    .logBeDaoSystemError("Creating resource from CSAR: fetching CSAR with id " + csarUUID + " failed");
-            componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.CREATE_RESOURCE);
-            return Either.right(responseFormat);
-        }
-        return toscaYamlCsarStatus;
-    }
-
-    private Either<Resource, ResponseFormat> validateResourceBeforeCreate(Resource resource, User user,
-                                                                          boolean inTransaction) {
+    private Resource validateResourceBeforeCreate(Resource resource, User user, boolean inTransaction) {
         log.trace("validating resource before create");
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "Create Resource", resource,
-                AuditingActionEnum.CREATE_RESOURCE, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user.copyData(eitherCreator.left().value());
-
+        user.copyData(validateUser(user, CREATE_RESOURCE, resource, AuditingActionEnum.CREATE_RESOURCE, false));
         // validate user role
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, resource, new ArrayList<Role>(),
-                AuditingActionEnum.CREATE_RESOURCE, null);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
+        validateUserRole(user, resource, new ArrayList<>(), AuditingActionEnum.CREATE_RESOURCE, null);
         // VF / PNF "derivedFrom" should be null (or ignored)
         if (ModelConverter.isAtomicComponent(resource)) {
-            Either<Boolean, ResponseFormat> validateDerivedFromNotEmpty = validateDerivedFromNotEmpty(user, resource,
-                    AuditingActionEnum.CREATE_RESOURCE);
-            if (validateDerivedFromNotEmpty.isRight()) {
-                return Either.right(validateDerivedFromNotEmpty.right().value());
-            }
+            validateDerivedFromNotEmpty(user, resource, AuditingActionEnum.CREATE_RESOURCE);
         }
         return validateResourceBeforeCreate(resource, user, AuditingActionEnum.CREATE_RESOURCE, inTransaction, null);
 
@@ -1316,239 +902,180 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
     // resource, yamlFileContents, yamlFileName, nodeTypesInfo,csarInfo,
     // nodeTypesArtifactsToCreate, true, false, null
-    private Either<Resource, ResponseFormat> createResourceFromYaml(Resource resource, String topologyTemplateYaml,
-                                                                    String yamlName, Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo,
-                                                                    Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToCreate,
-                                                                    boolean shouldLock, boolean inTransaction, String nodeName) {
-
-        List<ArtifactDefinition> createdArtifacts = new ArrayList<ArtifactDefinition>();
-        log.trace("************* createResourceFromYaml before parse yaml ");
-        Either<ParsedToscaYamlInfo, ResponseFormat> parseResourceInfoFromYamlEither = parseResourceInfoFromYaml(
-                yamlName, resource, topologyTemplateYaml, csarInfo.getCreatedNodesToscaResourceNames(), nodeTypesInfo,
-                nodeName);
-        if (parseResourceInfoFromYamlEither.isRight()) {
-            ResponseFormat responseFormat = parseResourceInfoFromYamlEither.right().value();
+    private Resource createResourceFromYaml(Resource resource, String topologyTemplateYaml,
+                                            String yamlName, Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo,
+                                            Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToCreate,
+                                            boolean shouldLock, boolean inTransaction, String nodeName) {
+
+        List<ArtifactDefinition> createdArtifacts = new ArrayList<>();
+        Resource createdResource;
+        try{
+            ParsedToscaYamlInfo parsedToscaYamlInfo = csarBusinessLogic.getParsedToscaYamlInfo(topologyTemplateYaml, yamlName, nodeTypesInfo, csarInfo, nodeName);
+            log.debug("#createResourceFromYaml - Going to create resource {} and RIs ", resource.getName());
+            createdResource = createResourceAndRIsFromYaml(yamlName, resource,
+                    parsedToscaYamlInfo, AuditingActionEnum.IMPORT_RESOURCE, false, createdArtifacts, topologyTemplateYaml,
+                    nodeTypesInfo, csarInfo, nodeTypesArtifactsToCreate, shouldLock, inTransaction, nodeName);
+            log.debug("#createResourceFromYaml - The resource {} has been created ", resource.getName());
+        } catch (ComponentException e) {
+            ResponseFormat responseFormat = e.getResponseFormat() == null ? componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams()) : e.getResponseFormat();
             componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, AuditingActionEnum.IMPORT_RESOURCE);
-            return Either.right(responseFormat);
-        }
-        log.trace("************* createResourceFromYaml after parse yaml ");
-        ParsedToscaYamlInfo parsedToscaYamlInfo = parseResourceInfoFromYamlEither.left().value();
-        log.debug("The parsed tosca yaml info is {}", parsedToscaYamlInfo);
-        log.trace("************* createResourceFromYaml before create ");
-        Either<Resource, ResponseFormat> createdResourceResponse = createResourceAndRIsFromYaml(yamlName, resource,
-                parsedToscaYamlInfo, AuditingActionEnum.IMPORT_RESOURCE, false, createdArtifacts, topologyTemplateYaml,
-                nodeTypesInfo, csarInfo, nodeTypesArtifactsToCreate, shouldLock, inTransaction, nodeName);
-        log.trace("************* createResourceFromYaml after create ");
-        if (createdResourceResponse.isRight()) {
-            ResponseFormat responseFormat = createdResourceResponse.right().value();
+            throw e;
+        } catch (StorageException e){
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(e.getStorageOperationStatus()));
             componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, AuditingActionEnum.IMPORT_RESOURCE);
-            return Either.right(responseFormat);
+            throw e;
         }
-
-        return createdResourceResponse;
+        return createdResource;
 
     }
 
-    public Either<Map<String, Resource>, ResponseFormat> createResourcesFromYamlNodeTypesList(String yamlName,
-                                                                                              Resource resource, Map<String, Object> mappedToscaTemplate, boolean needLock,
-                                                                                              Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle,
-                                                                                              List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, Map<String, NodeTypeInfo> nodeTypesInfo,
-                                                                                              CsarInfo csarInfo) {
+    public Map<String, Resource> createResourcesFromYamlNodeTypesList(String yamlName, Resource resource, Map<String, Object> mappedToscaTemplate, boolean needLock,
+                                                                      Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle,
+                                                                      List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, Map<String, NodeTypeInfo> nodeTypesInfo,
+                                                                      CsarInfo csarInfo) {
 
-        Either<String, ResultStatusEnum> tosca_version = ImportUtils.findFirstToscaStringElement(mappedToscaTemplate,
-                ToscaTagNamesEnum.TOSCA_VERSION);
-        if (tosca_version.isRight()) {
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_TOSCA_TEMPLATE);
-            return Either.right(responseFormat);
+        Either<String, ResultStatusEnum> toscaVersion = findFirstToscaStringElement(mappedToscaTemplate,
+                TypeUtils.ToscaTagNamesEnum.TOSCA_VERSION);
+        if (toscaVersion.isRight()) {
+            throw new ComponentException(ActionStatus.INVALID_TOSCA_TEMPLATE);
         }
-        Either<Map<String, Object>, ResultStatusEnum> eitherNodeTypes = ImportUtils
-                .findFirstToscaMapElement(mappedToscaTemplate, ToscaTagNamesEnum.NODE_TYPES);
-        Either<Map<String, Resource>, ResponseFormat> result = Either.left(csarInfo.getCreatedNodes());
-        Map<String, Object> mapToConvert = new HashMap<String, Object>();
-        mapToConvert.put(ToscaTagNamesEnum.TOSCA_VERSION.getElementName(), tosca_version.left().value());
+        Map<String, Object> mapToConvert = new HashMap<>();
+        mapToConvert.put(TypeUtils.ToscaTagNamesEnum.TOSCA_VERSION.getElementName(), toscaVersion.left().value());
+        Map<String, Object> nodeTypes = getNodeTypesFromTemplate(mappedToscaTemplate);
+        createNodeTypes(yamlName, resource, needLock, nodeTypesArtifactsToHandle, nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo, mapToConvert, nodeTypes);
+        return csarInfo.getCreatedNodes();
+    }
+
+    private Map<String,Object> getNodeTypesFromTemplate(Map<String, Object> mappedToscaTemplate) {
+        return ImportUtils.findFirstToscaMapElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.NODE_TYPES)
+                .left().orValue(HashMap::new);
+    }
+
+    private void createNodeTypes(String yamlName, Resource resource, boolean needLock, Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle, List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo, Map<String, Object> mapToConvert, Map<String, Object> nodeTypes) {
+        Iterator<Entry<String, Object>> nodesNameValueIter = nodeTypes.entrySet().iterator();
         Resource vfcCreated = null;
-        if (eitherNodeTypes.isLeft()) {
-            Iterator<Entry<String, Object>> nodesNameValue = eitherNodeTypes.left().value().entrySet().iterator();
-            while (nodesNameValue.hasNext()) {
-                Entry<String, Object> nodeType = nodesNameValue.next();
-                Map<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle = nodeTypesArtifactsToHandle == null
-                        || nodeTypesArtifactsToHandle.isEmpty() ? null
-                        : nodeTypesArtifactsToHandle.get(nodeType.getKey());
-
-                if (nodeTypesInfo.containsKey(nodeType.getKey())) {
-                    log.trace("************* Going to handle nested vfc {}", nodeType.getKey());
-                    Either<Resource, ResponseFormat> handleNeatedVfcYaml = handleNestedVfc(resource,
-                            nodeTypesArtifactsToHandle, nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo,
-                            nodeType.getKey());
-                    log.trace("************* Finished to handle nested vfc {}", nodeType.getKey());
-                    if (handleNeatedVfcYaml.isRight()) {
-                        return Either.right(handleNeatedVfcYaml.right().value());
-                    }
-                    vfcCreated = handleNeatedVfcYaml.left().value();
-                } else if (csarInfo.getCreatedNodesToscaResourceNames() != null
-                        && !csarInfo.getCreatedNodesToscaResourceNames().containsKey(nodeType.getKey())) {
-                    log.trace("************* Going to create node {}", nodeType.getKey());
-                    Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> resourceCreated = this
-                            .createNodeTypeResourceFromYaml(yamlName, nodeType, csarInfo.getModifier(), mapToConvert,
-                                    resource, needLock, nodeTypeArtifactsToHandle, nodeTypesNewCreatedArtifacts, true,
-                                    csarInfo, true);
-                    log.debug("************* Finished to create node {}", nodeType.getKey());
-
-                    if (resourceCreated.isRight()) {
-                        return Either.right(resourceCreated.right().value());
-                    }
-                    vfcCreated = resourceCreated.left().value().getLeft();
-                    csarInfo.getCreatedNodesToscaResourceNames().put(nodeType.getKey(),
-                            vfcCreated.getToscaResourceName());
-                }
-                if (vfcCreated != null) {
-                    csarInfo.getCreatedNodes().put(nodeType.getKey(), vfcCreated);
-                }
-                mapToConvert.remove(ToscaTagNamesEnum.NODE_TYPES.getElementName());
+        while (nodesNameValueIter.hasNext()) {
+            Entry<String, Object> nodeType = nodesNameValueIter.next();
+            Map<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle = nodeTypesArtifactsToHandle == null
+                    || nodeTypesArtifactsToHandle.isEmpty() ? null
+                    : nodeTypesArtifactsToHandle.get(nodeType.getKey());
+
+            if (nodeTypesInfo.containsKey(nodeType.getKey())) {
+                log.trace("************* Going to handle nested vfc {}", nodeType.getKey());
+                vfcCreated = handleNestedVfc(resource,
+                        nodeTypesArtifactsToHandle, nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo,
+                        nodeType.getKey());
+                log.trace("************* Finished to handle nested vfc {}", nodeType.getKey());
+            } else if (csarInfo.getCreatedNodesToscaResourceNames() != null
+                    && !csarInfo.getCreatedNodesToscaResourceNames().containsKey(nodeType.getKey())) {
+                log.trace("************* Going to create node {}", nodeType.getKey());
+                ImmutablePair<Resource, ActionStatus> resourceCreated = createNodeTypeResourceFromYaml(yamlName, nodeType, csarInfo.getModifier(), mapToConvert,
+                        resource, needLock, nodeTypeArtifactsToHandle, nodeTypesNewCreatedArtifacts, true,
+                        csarInfo, true);
+                log.debug("************* Finished to create node {}", nodeType.getKey());
+
+                vfcCreated = resourceCreated.getLeft();
+                csarInfo.getCreatedNodesToscaResourceNames().put(nodeType.getKey(),
+                        vfcCreated.getToscaResourceName());
+            }
+            if (vfcCreated != null) {
+                csarInfo.getCreatedNodes().put(nodeType.getKey(), vfcCreated);
             }
+            mapToConvert.remove(TypeUtils.ToscaTagNamesEnum.NODE_TYPES.getElementName());
         }
-        return result;
     }
 
-    private Either<Resource, ResponseFormat> handleNestedVfc(Resource resource,
-                                                             Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodesArtifactsToHandle,
-                                                             List<ArtifactDefinition> createdArtifacts, Map<String, NodeTypeInfo> nodesInfo, CsarInfo csarInfo,
-                                                             String nodeName) {
+    private Resource handleNestedVfc(Resource resource, Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodesArtifactsToHandle,
+                                     List<ArtifactDefinition> createdArtifacts, Map<String, NodeTypeInfo> nodesInfo, CsarInfo csarInfo,
+                                     String nodeName) {
 
-        Either<Resource, ResponseFormat> handleNestedVfcRes = Either.left(resource);
         String yamlName = nodesInfo.get(nodeName).getTemplateFileName();
         Map<String, Object> nestedVfcJsonMap = nodesInfo.get(nodeName).getMappedToscaTemplate();
 
         log.debug("************* Going to create node types from yaml {}", yamlName);
-        Either<Map<String, Resource>, ResponseFormat> createNodeTypesRes = createResourcesFromYamlNodeTypesList(
-                yamlName, resource, nestedVfcJsonMap, false, nodesArtifactsToHandle, createdArtifacts, nodesInfo,
-                csarInfo);
-        if (createNodeTypesRes.isRight()) {
-            log.debug("Failed to create node types from yaml {}. Status is {}", yamlName,
-                    createNodeTypesRes.right().value());
-            return Either.right(createNodeTypesRes.right().value());
-        }
+        createResourcesFromYamlNodeTypesList(yamlName, resource, nestedVfcJsonMap, false,
+                nodesArtifactsToHandle, createdArtifacts, nodesInfo, csarInfo);
         log.debug("************* Finished to create node types from yaml {}", yamlName);
 
-        if (nestedVfcJsonMap.containsKey(ToscaTagNamesEnum.TOPOLOGY_TEMPLATE.getElementName())) {
+        if (nestedVfcJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.TOPOLOGY_TEMPLATE.getElementName())) {
             log.debug("************* Going to handle complex VFC from yaml {}", yamlName);
-            handleNestedVfcRes = handleComplexVfc(resource, nodesArtifactsToHandle, createdArtifacts, nodesInfo,
+            resource = handleComplexVfc(resource, nodesArtifactsToHandle, createdArtifacts, nodesInfo,
                     csarInfo, nodeName, yamlName);
         }
-        return handleNestedVfcRes;
+        return resource;
     }
 
-    private Either<Resource, ResponseFormat> handleComplexVfc(Resource resource,
-                                                              Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodesArtifactsToHandle,
-                                                              List<ArtifactDefinition> createdArtifacts, Map<String, NodeTypeInfo> nodesInfo, CsarInfo csarInfo,
-                                                              String nodeName, String yamlName) {
+    private Resource handleComplexVfc(Resource resource, Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodesArtifactsToHandle,
+                                      List<ArtifactDefinition> createdArtifacts, Map<String, NodeTypeInfo> nodesInfo, CsarInfo csarInfo,
+                                      String nodeName, String yamlName) {
 
-        Either<Resource, ResponseFormat> result = null;
         Resource oldComplexVfc = null;
-        Resource newComplexVfc = null;
-
-        Either<Resource, ResponseFormat> buildCvfcRes = buildValidComplexVfc(resource, csarInfo, nodeName, nodesInfo);
-        if (buildCvfcRes.isRight()) {
-            log.debug("Failed to validate complex VFC for node {}. ", nodeName);
-            result = buildCvfcRes;
-        }
-        if (result == null) {
-            newComplexVfc = buildCvfcRes.left().value();
-            Either<Resource, StorageOperationStatus> oldComplexVfcRes = toscaOperationFacade
-                    .getFullLatestComponentByToscaResourceName(newComplexVfc.getToscaResourceName());
-            if (oldComplexVfcRes.isRight() && oldComplexVfcRes.right().value() == StorageOperationStatus.NOT_FOUND) {
-                oldComplexVfcRes = toscaOperationFacade.getFullLatestComponentByToscaResourceName(
-                        buildNestedToscaResourceName(ResourceTypeEnum.CVFC.name(), csarInfo.getVfResourceName(),
-                                nodeName).getRight());
-            }
-            if (oldComplexVfcRes.isRight() && oldComplexVfcRes.right().value() != StorageOperationStatus.NOT_FOUND) {
-                log.debug("Failed to fetch previous complex VFC by tosca resource name {}. Status is {}. ",
-                        newComplexVfc.getToscaResourceName(), oldComplexVfcRes.right().value());
-                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
-            } else if (oldComplexVfcRes.isLeft()) {
-                log.debug("validate derived before update");
-                Either<Boolean, ResponseFormat> eitherValidation = validateNestedDerivedFromDuringUpdate(
-                        oldComplexVfcRes.left().value(), newComplexVfc,
-                        ValidationUtils.hasBeenCertified(oldComplexVfcRes.left().value().getVersion()));
-                if (eitherValidation.isLeft()) {
-                    oldComplexVfc = oldComplexVfcRes.left().value();
-                }
-            }
-        }
-        if (result == null) {
-            result = handleComplexVfc(nodesArtifactsToHandle, createdArtifacts, nodesInfo, csarInfo, nodeName, yamlName,
-                    oldComplexVfc, newComplexVfc);
-        }
-        if (result.isLeft()) {
-            newComplexVfc = result.left().value();
-            csarInfo.getCreatedNodesToscaResourceNames().put(nodeName, newComplexVfc.getToscaResourceName());
-            LifecycleChangeInfoWithAction lifecycleChangeInfo = new LifecycleChangeInfoWithAction(
-                    "certification on import", LifecycleChanceActionEnum.CREATE_FROM_CSAR);
-            log.debug("Going to certify cvfc {}. ", newComplexVfc.getName());
-            result = propagateStateToCertified(csarInfo.getModifier(), newComplexVfc, lifecycleChangeInfo, true, false,
-                    true);
-            if (result.isRight()) {
-                log.debug("Failed to certify complex VFC resource {}. ", newComplexVfc.getName());
-            }
-        }
-        if (result.isLeft()) {
-            csarInfo.getCreatedNodes().put(nodeName, result.left().value());
-            csarInfo.getCvfcToCreateQueue().remove();
+        Resource newComplexVfc = buildValidComplexVfc(resource, csarInfo, nodeName, nodesInfo);
+        Either<Resource, StorageOperationStatus> oldComplexVfcRes = toscaOperationFacade
+                .getFullLatestComponentByToscaResourceName(newComplexVfc.getToscaResourceName());
+        if (oldComplexVfcRes.isRight() && oldComplexVfcRes.right().value() == StorageOperationStatus.NOT_FOUND) {
+            oldComplexVfcRes = toscaOperationFacade.getFullLatestComponentByToscaResourceName(
+                    buildNestedToscaResourceName(ResourceTypeEnum.CVFC.name(), csarInfo.getVfResourceName(),
+                            nodeName).getRight());
+        }
+        if (oldComplexVfcRes.isRight() && oldComplexVfcRes.right().value() != StorageOperationStatus.NOT_FOUND) {
+            log.debug("Failed to fetch previous complex VFC by tosca resource name {}. Status is {}. ",
+                    newComplexVfc.getToscaResourceName(), oldComplexVfcRes.right().value());
+            throw new ComponentException(ActionStatus.GENERAL_ERROR);
+        } else if (oldComplexVfcRes.isLeft()) {
+            log.debug(VALIDATE_DERIVED_BEFORE_UPDATE);
+            Either<Boolean, ResponseFormat> eitherValidation = validateNestedDerivedFromDuringUpdate(
+                    oldComplexVfcRes.left().value(), newComplexVfc,
+                    ValidationUtils.hasBeenCertified(oldComplexVfcRes.left().value().getVersion()));
+            if (eitherValidation.isLeft()) {
+                oldComplexVfc = oldComplexVfcRes.left().value();
+            }
+        }
+        newComplexVfc = handleComplexVfc(nodesArtifactsToHandle, createdArtifacts, nodesInfo, csarInfo, nodeName, yamlName,
+                oldComplexVfc, newComplexVfc);
+        csarInfo.getCreatedNodesToscaResourceNames().put(nodeName, newComplexVfc.getToscaResourceName());
+        LifecycleChangeInfoWithAction lifecycleChangeInfo = new LifecycleChangeInfoWithAction(
+                CERTIFICATION_ON_IMPORT, LifecycleChanceActionEnum.CREATE_FROM_CSAR);
+        log.debug("Going to certify cvfc {}. ", newComplexVfc.getName());
+        Either<Resource, ResponseFormat> result = propagateStateToCertified(csarInfo.getModifier(), newComplexVfc, lifecycleChangeInfo, true, false,
+                true);
+        if (result.isRight()) {
+            log.debug("Failed to certify complex VFC resource {}. ", newComplexVfc.getName());
         }
-        return result;
+        csarInfo.getCreatedNodes().put(nodeName, result.left().value());
+        csarInfo.removeNodeFromQueue();
+        return result.left().value();
     }
 
-    private Either<Resource, ResponseFormat> handleComplexVfc(
-            Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodesArtifactsToHandle,
-            List<ArtifactDefinition> createdArtifacts, Map<String, NodeTypeInfo> nodesInfo, CsarInfo csarInfo,
-            String nodeName, String yamlName, Resource oldComplexVfc, Resource newComplexVfc) {
+    private Resource handleComplexVfc(Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodesArtifactsToHandle,
+                                      List<ArtifactDefinition> createdArtifacts, Map<String, NodeTypeInfo> nodesInfo, CsarInfo csarInfo,
+                                      String nodeName, String yamlName, Resource oldComplexVfc, Resource newComplexVfc) {
 
-        Either<Resource, ResponseFormat> handleComplexVfcRes;
+        Resource handleComplexVfcRes;
         Map<String, Object> mappedToscaTemplate = nodesInfo.get(nodeName).getMappedToscaTemplate();
         String yamlContent = new String(csarInfo.getCsar().get(yamlName));
         Map<String, NodeTypeInfo> newNodeTypesInfo = nodesInfo.entrySet().stream()
-                .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue().getUnmarkedCopy()));
-        markNestedVfc(mappedToscaTemplate, newNodeTypesInfo);
+                .collect(toMap(Entry::getKey, e -> e.getValue().getUnmarkedCopy()));
+        CsarInfo.markNestedVfc(mappedToscaTemplate, newNodeTypesInfo);
         if (oldComplexVfc == null) {
             handleComplexVfcRes = createResourceFromYaml(newComplexVfc, yamlContent, yamlName, newNodeTypesInfo,
                     csarInfo, nodesArtifactsToHandle, false, true, nodeName);
-            if (handleComplexVfcRes.isRight()) {
-                log.debug("Failed to create resource {} from YAML {}. ", newComplexVfc.getName(), yamlName);
-            }
         } else {
             handleComplexVfcRes = updateResourceFromYaml(oldComplexVfc, newComplexVfc,
                     AuditingActionEnum.UPDATE_RESOURCE_METADATA, createdArtifacts, yamlContent, yamlName, csarInfo,
                     newNodeTypesInfo, nodesArtifactsToHandle, nodeName, true);
-            if (handleComplexVfcRes.isRight()) {
-                log.debug("Failed to update resource {} from YAML {}. ", oldComplexVfc.getName(), yamlName);
-            }
         }
         return handleComplexVfcRes;
     }
 
-    private Either<Resource, ResponseFormat> buildValidComplexVfc(Resource resource, CsarInfo csarInfo, String nodeName,
-                                                                  Map<String, NodeTypeInfo> nodesInfo) {
+    private Resource buildValidComplexVfc(Resource resource, CsarInfo csarInfo, String nodeName,
+                                          Map<String, NodeTypeInfo> nodesInfo) {
 
-        Either<Resource, ResponseFormat> result = null;
         Resource complexVfc = buildComplexVfcMetadata(resource, csarInfo, nodeName, nodesInfo);
         log.debug("************* Going to validate complex VFC from yaml {}", complexVfc.getName());
-
-        if (!csarInfo.getCvfcToCreateQueue().contains(nodeName)) {
-            csarInfo.getCvfcToCreateQueue().add(nodeName);
-        } else {
-            log.debug("Failed to validate complex VFC {}. Loop detected, VSP {}. ", complexVfc.getName(),
-                    csarInfo.getVfResourceName());
-            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.CFVC_LOOP_DETECTED,
-                    csarInfo.getVfResourceName(), complexVfc.getName()));
-        }
-        if (result == null) {
-            result = validateResourceBeforeCreate(complexVfc, csarInfo.getModifier(),
-                    AuditingActionEnum.IMPORT_RESOURCE, true, csarInfo);
-            if (result.isRight()) {
-                log.debug("Failed to validate complex VFC {}. ", complexVfc.getName());
-            }
-        }
-        return result;
+        csarInfo.addNodeToQueue(nodeName);
+        return validateResourceBeforeCreate(complexVfc, csarInfo.getModifier(),
+                AuditingActionEnum.IMPORT_RESOURCE, true, csarInfo);
     }
 
     private String getNodeTypeActualName(String fullName) {
@@ -1559,29 +1086,19 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return nameWithouNamespacePrefix.substring(resourceType.length());
     }
 
-    private Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> createNodeTypeResourceFromYaml(
+    private ImmutablePair<Resource, ActionStatus> createNodeTypeResourceFromYaml(
             String yamlName, Entry<String, Object> nodeNameValue, User user, Map<String, Object> mapToConvert,
             Resource resourceVf, boolean needLock,
             Map<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle,
             List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, boolean forceCertificationAllowed, CsarInfo csarInfo,
             boolean isNested) {
 
-        Either<UploadResourceInfo, ResponseFormat> resourceMetaData = fillResourceMetadata(yamlName, resourceVf,
-                nodeNameValue.getKey(), user);
-        if (resourceMetaData.isRight()) {
-            return Either.right(resourceMetaData.right().value());
-        }
-        String singleVfcYaml = buildNodeTypeYaml(nodeNameValue, mapToConvert,
-                resourceMetaData.left().value().getResourceType(), csarInfo);
-
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "CheckIn Resource", resourceVf,
-                AuditingActionEnum.CHECKIN_RESOURCE, true);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
+        UploadResourceInfo resourceMetaData = fillResourceMetadata(yamlName, resourceVf, nodeNameValue.getKey(), user);
 
-        return this.createResourceFromNodeType(singleVfcYaml, resourceMetaData.left().value(), user, true, needLock,
+        String singleVfcYaml = buildNodeTypeYaml(nodeNameValue, mapToConvert,
+                resourceMetaData.getResourceType(), csarInfo);
+        user = validateUser(user, "CheckIn Resource", resourceVf, AuditingActionEnum.CHECKIN_RESOURCE, true);
+        return createResourceFromNodeType(singleVfcYaml, resourceMetaData, user, true, needLock,
                 nodeTypeArtifactsToHandle, nodeTypesNewCreatedArtifacts, forceCertificationAllowed, csarInfo,
                 nodeNameValue.getKey(), isNested);
     }
@@ -1597,47 +1114,44 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         Map<String, Object> node = new HashMap<>();
         node.put(buildNestedToscaResourceName(nodeResourceType, csarInfo.getVfResourceName(), nodeNameValue.getKey())
                 .getLeft(), nodeNameValue.getValue());
-        mapToConvert.put(ToscaTagNamesEnum.NODE_TYPES.getElementName(), node);
+        mapToConvert.put(TypeUtils.ToscaTagNamesEnum.NODE_TYPES.getElementName(), node);
 
         return yaml.dumpAsMap(mapToConvert);
     }
 
     public Either<Boolean, ResponseFormat> validateResourceCreationFromNodeType(Resource resource, User creator) {
-
-        Either<Boolean, ResponseFormat> validateDerivedFromNotEmpty = this.validateDerivedFromNotEmpty(creator,
-                resource, AuditingActionEnum.CREATE_RESOURCE);
-        if (validateDerivedFromNotEmpty.isRight()) {
-            return Either.right(validateDerivedFromNotEmpty.right().value());
-        }
+        validateDerivedFromNotEmpty(creator, resource, AuditingActionEnum.CREATE_RESOURCE);
         return Either.left(true);
     }
 
-    public Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> createResourceFromNodeType(String nodeTypeYaml,
-                                                                                                    UploadResourceInfo resourceMetaData, User creator, boolean isInTransaction, boolean needLock,
-                                                                                                    Map<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle,
-                                                                                                    List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, boolean forceCertificationAllowed, CsarInfo csarInfo,
-                                                                                                    String nodeName, boolean isNested) {
+    public ImmutablePair<Resource, ActionStatus> createResourceFromNodeType(String nodeTypeYaml, UploadResourceInfo resourceMetaData, User creator, boolean isInTransaction, boolean needLock,
+                                                                            Map<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle,
+                                                                            List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, boolean forceCertificationAllowed, CsarInfo csarInfo,
+                                                                            String nodeName, boolean isNested) {
 
-        LifecycleChangeInfoWithAction lifecycleChangeInfo = new LifecycleChangeInfoWithAction("certification on import",
+        LifecycleChangeInfoWithAction lifecycleChangeInfo = new LifecycleChangeInfoWithAction(CERTIFICATION_ON_IMPORT,
                 LifecycleChanceActionEnum.CREATE_FROM_CSAR);
-        Function<Resource, Either<Boolean, ResponseFormat>> validator = (resource) -> this
-                .validateResourceCreationFromNodeType(resource, creator);
-        return this.resourceImportManager.importCertifiedResource(nodeTypeYaml, resourceMetaData, creator, validator,
+        Function<Resource, Either<Boolean, ResponseFormat>> validator = resource -> validateResourceCreationFromNodeType(resource, creator);
+        return resourceImportManager.importCertifiedResource(nodeTypeYaml, resourceMetaData, creator, validator,
                 lifecycleChangeInfo, isInTransaction, true, needLock, nodeTypeArtifactsToHandle,
-                nodeTypesNewCreatedArtifacts, forceCertificationAllowed, csarInfo, nodeName, isNested);
+                nodeTypesNewCreatedArtifacts, forceCertificationAllowed, csarInfo, nodeName, isNested)
+                .left().on(this::failOnCertification);
+    }
+
+    private ImmutablePair<Resource,ActionStatus> failOnCertification(ResponseFormat error) {
+        throw new ComponentException(error);
     }
 
-    private Either<UploadResourceInfo, ResponseFormat> fillResourceMetadata(String yamlName, Resource resourceVf,
-                                                                            String nodeName, User user) {
+    private UploadResourceInfo fillResourceMetadata(String yamlName, Resource resourceVf,
+                                                    String nodeName, User user) {
         UploadResourceInfo resourceMetaData = new UploadResourceInfo();
 
         // validate nodetype name prefix
         if (!nodeName.startsWith(Constants.USER_DEFINED_RESOURCE_NAMESPACE_PREFIX)) {
             log.debug("invalid nodeName:{} does not start with {}.", nodeName,
                     Constants.USER_DEFINED_RESOURCE_NAMESPACE_PREFIX);
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_NODE_TEMPLATE,
+            throw new ComponentException(ActionStatus.INVALID_NODE_TEMPLATE,
                     yamlName, resourceMetaData.getName(), nodeName);
-            return Either.right(responseFormat);
         }
 
         String actualName = this.getNodeTypeActualName(nodeName);
@@ -1654,9 +1168,8 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         if (!ResourceTypeEnum.containsName(resourceType.toUpperCase())) {
             log.debug("invalid resourceType:{} the type is not one of the valide types:{}.", resourceType.toUpperCase(),
                     ResourceTypeEnum.values());
-            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_NODE_TEMPLATE,
+            throw new ComponentException(ActionStatus.INVALID_NODE_TEMPLATE,
                     yamlName, resourceMetaData.getName(), nodeName);
-            return Either.right(responseFormat);
         }
 
         // Setting name
@@ -1687,7 +1200,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         categories.add(category);
         resourceMetaData.setCategories(categories);
 
-        return Either.left(resourceMetaData);
+        return resourceMetaData;
     }
 
     private Resource buildComplexVfcMetadata(Resource resourceVf, CsarInfo csarInfo, String nodeName,
@@ -1741,75 +1254,52 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return addCvfcSuffixToResourceName(resourceName);
     }
 
-    private Either<Resource, ResponseFormat> createResourceAndRIsFromYaml(String yamlName, Resource resource,
-                                                                          ParsedToscaYamlInfo parsedToscaYamlInfo, AuditingActionEnum actionEnum, boolean isNormative,
-                                                                          List<ArtifactDefinition> createdArtifacts, String topologyTemplateYaml,
-                                                                          Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo,
-                                                                          Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToCreate,
-                                                                          boolean shouldLock, boolean inTransaction, String nodeName) {
+    private Resource createResourceAndRIsFromYaml(String yamlName, Resource resource,
+                                                  ParsedToscaYamlInfo parsedToscaYamlInfo, AuditingActionEnum actionEnum, boolean isNormative,
+                                                  List<ArtifactDefinition> createdArtifacts, String topologyTemplateYaml,
+                                                  Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo,
+                                                  Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToCreate,
+                                                  boolean shouldLock, boolean inTransaction, String nodeName) {
 
-        boolean result = true;
         List<ArtifactDefinition> nodeTypesNewCreatedArtifacts = new ArrayList<>();
 
         if (shouldLock) {
             Either<Boolean, ResponseFormat> lockResult = lockComponentByName(resource.getSystemName(), resource,
-                    "Create Resource");
+                    CREATE_RESOURCE);
             if (lockResult.isRight()) {
-                ResponseFormat responseFormat = lockResult.right().value();
-                return Either.right(responseFormat);
+                rollback(inTransaction, resource, createdArtifacts, nodeTypesNewCreatedArtifacts);
+                throw new ComponentException(lockResult.right().value());
             }
             log.debug("name is locked {} status = {}", resource.getSystemName(), lockResult);
         }
         try {
             log.trace("************* createResourceFromYaml before full create resource {}", yamlName);
-            Either<Resource, ResponseFormat> genericResourceEither = fetchAndSetDerivedFromGenericType(resource);
-            if (genericResourceEither.isRight()) {
-                result = false;
-                return genericResourceEither;
-            }
-            Either<Resource, ResponseFormat> createResourcesEither = createResourceTransaction(resource,
-                    csarInfo.getModifier(), isNormative, inTransaction);
+            Resource genericResource = fetchAndSetDerivedFromGenericType(resource);
+            resource = createResourceTransaction(resource,
+                    csarInfo.getModifier(), isNormative);
             log.trace("************* createResourceFromYaml after full create resource {}", yamlName);
-            if (createResourcesEither.isRight()) {
-                result = false;
-                return createResourcesEither;
-            }
-            resource = createResourcesEither.left().value();
-            // add groups to resource
             log.trace("************* Going to add inputs from yaml {}", yamlName);
             if (resource.shouldGenerateInputs())
-                generateAndAddInputsFromGenericTypeProperties(resource, genericResourceEither.left().value());
+                generateAndAddInputsFromGenericTypeProperties(resource, genericResource);
 
             Map<String, InputDefinition> inputs = parsedToscaYamlInfo.getInputs();
-            Either<Resource, ResponseFormat> createInputsOnResource = createInputsOnResource(resource,
-                    csarInfo.getModifier(), inputs, inTransaction);
-            if (createInputsOnResource.isRight()) {
-                result = false;
-                return createInputsOnResource;
-            }
-            resource = createInputsOnResource.left().value();
+            resource = createInputsOnResource(resource, inputs);
             log.trace("************* Finish to add inputs from yaml {}", yamlName);
 
             Map<String, UploadComponentInstanceInfo> uploadComponentInstanceInfoMap = parsedToscaYamlInfo
                     .getInstances();
             log.trace("************* Going to create nodes, RI's and Relations  from yaml {}", yamlName);
 
-            createResourcesEither = createRIAndRelationsFromYaml(yamlName, resource, uploadComponentInstanceInfoMap,
-                    actionEnum, topologyTemplateYaml, nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo,
+            resource = createRIAndRelationsFromYaml(yamlName, resource, uploadComponentInstanceInfoMap,
+                    topologyTemplateYaml, nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo,
                     nodeTypesArtifactsToCreate, nodeName);
             log.trace("************* Finished to create nodes, RI and Relation  from yaml {}", yamlName);
-            if (createResourcesEither.isRight()) {
-                result = false;
-                return createResourcesEither;
-            }
-
-            resource = createResourcesEither.left().value();
             // validate update vf module group names
             Either<Map<String, GroupDefinition>, ResponseFormat> validateUpdateVfGroupNamesRes = groupBusinessLogic
                     .validateUpdateVfGroupNames(parsedToscaYamlInfo.getGroups(), resource.getSystemName());
             if (validateUpdateVfGroupNamesRes.isRight()) {
-                result = false;
-                return Either.right(validateUpdateVfGroupNamesRes.right().value());
+                rollback(inTransaction, resource, createdArtifacts, nodeTypesNewCreatedArtifacts);
+                throw new ComponentException(validateUpdateVfGroupNamesRes.right().value());
             }
             // add groups to resource
             Map<String, GroupDefinition> groups;
@@ -1820,11 +1310,12 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             } else {
                 groups = parsedToscaYamlInfo.getGroups();
             }
+
             Either<Resource, ResponseFormat> createGroupsOnResource = createGroupsOnResource(resource,
-                    csarInfo.getModifier(), groups);
+                    groups);
             if (createGroupsOnResource.isRight()) {
-                result = false;
-                return createGroupsOnResource;
+                rollback(inTransaction, resource, createdArtifacts, nodeTypesNewCreatedArtifacts);
+                throw new ComponentException(createGroupsOnResource.right().value());
             }
             resource = createGroupsOnResource.left().value();
             log.trace("************* Finished to add groups from yaml {}", yamlName);
@@ -1837,31 +1328,23 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             Either<Resource, ResponseFormat> createArtifactsEither = createOrUpdateArtifacts(ArtifactOperationEnum.CREATE, createdArtifacts, yamlName,
                     csarInfo, resource, nodeTypeInfoToUpdateArtifacts, inTransaction, shouldLock);
             if (createArtifactsEither.isRight()) {
-                log.debug("failed to update artifacts {}", createArtifactsEither.right().value());
-                return createArtifactsEither;
-
+                rollback(inTransaction, resource, createdArtifacts, nodeTypesNewCreatedArtifacts);
+                throw new ComponentException(createArtifactsEither.right().value());
             }
-            resource = createArtifactsEither.left().value();
+
+            resource = getResourceWithGroups(createArtifactsEither.left().value().getUniqueId());
 
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.CREATED);
             componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, actionEnum);
             ASDCKpiApi.countCreatedResourcesKPI();
-            return Either.left(resource);
+            return resource;
 
+        } catch(ComponentException|StorageException e) {
+            rollback(inTransaction, resource, createdArtifacts, nodeTypesNewCreatedArtifacts);
+            throw e;
         } finally {
             if (!inTransaction) {
-                if (!result) {
-                    log.warn("operation failed. do rollback");
-                    titanDao.rollback();
-                    if (!createdArtifacts.isEmpty() || !nodeTypesNewCreatedArtifacts.isEmpty()) {
-                        createdArtifacts.addAll(nodeTypesNewCreatedArtifacts);
-                        log.debug("component and all its artifacts were deleted, id = {}", resource.getName());
-                    }
-
-                } else {
-                    log.debug("operation success. do commit");
-                    titanDao.commit();
-                }
+                titanDao.commit();
             }
             if (shouldLock) {
                 graphLockOperation.unlockComponentByName(resource.getSystemName(), resource.getUniqueId(),
@@ -1870,19 +1353,36 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
     }
 
-    private Either<Resource, ResponseFormat> createGroupsOnResource(Resource resource, User user,
+    private void rollback(boolean inTransaction, Resource resource, List<ArtifactDefinition> createdArtifacts, List<ArtifactDefinition> nodeTypesNewCreatedArtifacts) {
+        if(!inTransaction) {
+            titanDao.rollback();
+        }
+        if (isNotEmpty(createdArtifacts) && isNotEmpty(nodeTypesNewCreatedArtifacts)) {
+            createdArtifacts.addAll(nodeTypesNewCreatedArtifacts);
+            log.debug("Found {} newly created artifacts to deleted, the component name: {}",createdArtifacts.size(), resource.getName());
+        }
+    }
+
+    private Resource getResourceWithGroups(String resourceId) {
+
+        ComponentParametersView filter = new ComponentParametersView();
+        filter.setIgnoreGroups(false);
+        Either<Resource, StorageOperationStatus> updatedResource = toscaOperationFacade.getToscaElement(resourceId, filter);
+        if (updatedResource.isRight()) {
+            rollbackWithException(componentsUtils.convertFromStorageResponse(updatedResource.right().value()), resourceId);
+        }
+        return updatedResource.left().value();
+    }
+
+    private Either<Resource, ResponseFormat> createGroupsOnResource(Resource resource,
                                                                     Map<String, GroupDefinition> groups) {
         if (groups != null && !groups.isEmpty()) {
-            Either<List<GroupDefinition>, ResponseFormat> mergeGroupsUsingResource = updateGroupMembersUsingResource(
+            List<GroupDefinition> groupsAsList = updateGroupsMembersUsingResource(
                     groups, resource);
-
-            if (mergeGroupsUsingResource.isRight()) {
-                log.debug("Failed to prepare groups for creation");
-                return Either.right(mergeGroupsUsingResource.right().value());
-            }
-            List<GroupDefinition> groupsAsList = mergeGroupsUsingResource.left().value();
+            handleGroupsProperties(resource, groups);
+            fillGroupsFinalFields(groupsAsList);
             Either<List<GroupDefinition>, ResponseFormat> createGroups = groupBusinessLogic.createGroups(resource,
-                    groupsAsList);
+                    groupsAsList, true);
             if (createGroups.isRight()) {
                 return Either.right(createGroups.right().value());
             }
@@ -1899,178 +1399,218 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(updatedResource.left().value());
     }
 
-    private Either<Resource, ResponseFormat> updateGroupsOnResource(Resource resource, User user,
-                                                                    Map<String, GroupDefinition> groups) {
-        if (groups != null && false == groups.isEmpty()) {
-            List<GroupDefinition> groupsFromResource = resource.getGroups();
-            Either<List<GroupDefinition>, ResponseFormat> mergeGroupsUsingResource = updateGroupMembersUsingResource(
-                    groups, resource);
-
-            if (mergeGroupsUsingResource.isRight()) {
-                log.debug("Failed to prepare groups for creation");
-                return Either.right(mergeGroupsUsingResource.right().value());
-            }
-            List<GroupDefinition> groupsAsList = mergeGroupsUsingResource.left().value();
-            List<GroupDefinition> groupsToUpdate = new ArrayList<GroupDefinition>();
-            List<GroupDefinition> groupsToDelete = new ArrayList<GroupDefinition>();
-            List<GroupDefinition> groupsToCreate = new ArrayList<GroupDefinition>();
-            if (groupsFromResource != null && !groupsFromResource.isEmpty()) {
-                for (GroupDefinition group : groupsAsList) {
-                    Optional<GroupDefinition> op = groupsFromResource.stream()
-                            .filter(p -> p.getName().equalsIgnoreCase(group.getName())).findAny();
-                    if (op.isPresent()) {
-                        GroupDefinition groupToUpdate = op.get();
-                        groupToUpdate.setMembers(group.getMembers());
-                        groupsToUpdate.add(groupToUpdate);
-                    } else {
-                        groupsToCreate.add(group);
-                    }
-                }
-                for (GroupDefinition group : groupsFromResource) {
-                    Optional<GroupDefinition> op = groupsAsList.stream()
-                            .filter(p -> p.getName().equalsIgnoreCase(group.getName())).findAny();
-                    if (!op.isPresent() && (group.getArtifacts() == null || group.getArtifacts().isEmpty())) {
-
-                        groupsToDelete.add(group);
-                    }
-
-                }
-            } else
-                groupsToCreate.addAll(groupsAsList);
-            Either<List<GroupDefinition>, ResponseFormat> prepareGroups = null;
-            if (!groupsToCreate.isEmpty()) {
-
-                if (groupsFromResource != null && !groupsFromResource.isEmpty()) {
-                    prepareGroups = groupBusinessLogic.addGroups(resource,
-                            groupsToCreate);
-                } else {
-                    prepareGroups = groupBusinessLogic.createGroups(resource,
-                            groupsToCreate);
-                }
+    private void handleGroupsProperties(Resource resource, Map<String, GroupDefinition> groups) {
+        List<InputDefinition> inputs = resource.getInputs();
+        if (MapUtils.isNotEmpty(groups)) {
+            groups.values()
+                    .stream()
+                    .filter(g -> isNotEmpty(g.getProperties()))
+                    .flatMap(g -> g.getProperties().stream())
+                    .forEach(p -> handleGetInputs(p, inputs));
+        }
+    }
 
-                if (prepareGroups.isRight()) {
-                    return Either.right(prepareGroups.right().value());
-                }
+    private void handleGetInputs(PropertyDataDefinition property, List<InputDefinition> inputs) {
+        if (isNotEmpty(property.getGetInputValues())) {
+            if (inputs == null || inputs.isEmpty()) {
+                log.debug("Failed to add property {} to group. Inputs list is empty ", property);
+                rollbackWithException(ActionStatus.INPUTS_NOT_FOUND, property.getGetInputValues()
+                        .stream()
+                        .map(GetInputValueDataDefinition::getInputName)
+                        .collect(toList()).toString());
             }
-
-            if (!groupsToDelete.isEmpty()) {
-                prepareGroups = groupBusinessLogic.deleteGroups(resource,
-                        groupsToDelete);
-                if (prepareGroups.isRight()) {
-                    return Either.right(prepareGroups.right().value());
+            ListIterator<GetInputValueDataDefinition> getInputValuesIter = property.getGetInputValues().listIterator();
+            while (getInputValuesIter.hasNext()) {
+                GetInputValueDataDefinition getInput = getInputValuesIter.next();
+                InputDefinition input = findInputByName(inputs, getInput);
+                getInput.setInputId(input.getUniqueId());
+                if (getInput.getGetInputIndex() != null) {
+                    GetInputValueDataDefinition getInputIndex = getInput.getGetInputIndex();
+                    input = findInputByName(inputs, getInputIndex);
+                    getInputIndex.setInputId(input.getUniqueId());
+                    getInputValuesIter.add(getInputIndex);
                 }
             }
+        }
+    }
 
-            if (groupsToUpdate != null && !groupsToUpdate.isEmpty()) {
-                prepareGroups = groupBusinessLogic.updateGroups(resource, groupsToUpdate);
-                if (prepareGroups.isRight()) {
-                    return Either.right(prepareGroups.right().value());
-                }
-            }
+    private InputDefinition findInputByName(List<InputDefinition> inputs, GetInputValueDataDefinition getInput) {
+        Optional<InputDefinition> inputOpt = inputs.stream()
+                .filter(p -> p.getName().equals(getInput.getInputName()))
+                .findFirst();
+        if (!inputOpt.isPresent()) {
+            log.debug("#findInputByName - Failed to find the input {} ", getInput.getInputName());
+            rollbackWithException(ActionStatus.INPUTS_NOT_FOUND, getInput.getInputName());
+        }
+        return inputOpt.get();
+    }
+
+    private void fillGroupsFinalFields(List<GroupDefinition> groupsAsList) {
+        groupsAsList.forEach(groupDefinition -> {
+            groupDefinition.setInvariantName(groupDefinition.getName());
+            groupDefinition.setCreatedFrom(CreatedFrom.CSAR);
+        });
+    }
 
+    private Resource updateGroupsOnResource(Resource resource, Map<String, GroupDefinition> groups) {
+        if (isEmpty(groups)) {
+            return resource;
         } else {
-            return Either.left(resource);
+            updateOrCreateGroups(resource, groups);
         }
-
         Either<Resource, StorageOperationStatus> updatedResource = toscaOperationFacade
                 .getToscaElement(resource.getUniqueId());
         if (updatedResource.isRight()) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                    componentsUtils.convertFromStorageResponse(updatedResource.right().value()), resource);
-            return Either.right(responseFormat);
+            throw new ComponentException(componentsUtils.getResponseFormatByResource(
+                    componentsUtils.convertFromStorageResponse(updatedResource.right().value()), resource));
+        }
+        return updatedResource.left().value();
+    }
+
+    private void updateOrCreateGroups(Resource resource, Map<String, GroupDefinition> groups) {
+        List<GroupDefinition> groupsFromResource = resource.getGroups();
+        List<GroupDefinition> groupsAsList = updateGroupsMembersUsingResource(groups, resource);
+        List<GroupDefinition> groupsToUpdate = new ArrayList<>();
+        List<GroupDefinition> groupsToDelete = new ArrayList<>();
+        List<GroupDefinition> groupsToCreate = new ArrayList<>();
+        if (isNotEmpty(groupsFromResource)) {
+            addGroupsToCreateOrUpdate(groupsFromResource, groupsAsList, groupsToUpdate, groupsToCreate);
+            addGroupsToDelete(groupsFromResource, groupsAsList, groupsToDelete);
+        } else {
+            groupsToCreate.addAll(groupsAsList);
+        }
+        if (isNotEmpty(groupsToCreate)) {
+            fillGroupsFinalFields(groupsToCreate);
+            if (isNotEmpty(groupsFromResource)) {
+                groupBusinessLogic.addGroups(resource,
+                        groupsToCreate, true)
+                        .left()
+                        .on(this::throwComponentException);
+            } else {
+                groupBusinessLogic.createGroups(resource,
+                        groupsToCreate, true)
+                        .left()
+                        .on(this::throwComponentException);
+            }
+        }
+        if (isNotEmpty(groupsToDelete)) {
+            groupBusinessLogic.deleteGroups(resource, groupsToDelete)
+                    .left()
+                    .on(this::throwComponentException);
+        }
+        if (isNotEmpty(groupsToUpdate)) {
+            groupBusinessLogic.updateGroups(resource, groupsToUpdate, true)
+                    .left()
+                    .on(this::throwComponentException);
         }
-        return Either.left(updatedResource.left().value());
     }
 
-    private Either<Resource, ResponseFormat> createInputsOnResource(Resource resource, User user,
-                                                                    Map<String, InputDefinition> inputs, boolean inTransaction) {
+    private void addGroupsToDelete(List<GroupDefinition> groupsFromResource, List<GroupDefinition> groupsAsList, List<GroupDefinition> groupsToDelete) {
+        for (GroupDefinition group : groupsFromResource) {
+            Optional<GroupDefinition> op = groupsAsList.stream()
+                    .filter(p -> p.getName().equalsIgnoreCase(group.getName())).findAny();
+            if (!op.isPresent() && (group.getArtifacts() == null || group.getArtifacts().isEmpty())) {
+                groupsToDelete.add(group);
+            }
+        }
+    }
+
+    private void addGroupsToCreateOrUpdate(List<GroupDefinition> groupsFromResource, List<GroupDefinition> groupsAsList, List<GroupDefinition> groupsToUpdate, List<GroupDefinition> groupsToCreate) {
+        for (GroupDefinition group : groupsAsList) {
+            Optional<GroupDefinition> op = groupsFromResource.stream()
+                    .filter(p -> p.getInvariantName().equalsIgnoreCase(group.getInvariantName())).findAny();
+            if (op.isPresent()) {
+                GroupDefinition groupToUpdate = op.get();
+                groupToUpdate.setMembers(group.getMembers());
+                groupToUpdate.setCapabilities(group.getCapabilities());
+                groupToUpdate.setProperties(group.getProperties());
+                groupsToUpdate.add(groupToUpdate);
+            } else {
+                groupsToCreate.add(group);
+            }
+        }
+    }
+
+    private Resource createInputsOnResource(Resource resource, Map<String, InputDefinition> inputs) {
         List<InputDefinition> resourceProperties = resource.getInputs();
-        if ((inputs != null && false == inputs.isEmpty())
-                || (resourceProperties != null && false == resourceProperties.isEmpty())) {
+        if (MapUtils.isNotEmpty(inputs)|| isNotEmpty(resourceProperties)) {
 
             Either<List<InputDefinition>, ResponseFormat> createInputs = inputsBusinessLogic.createInputsInGraph(inputs,
                     resource);
             if (createInputs.isRight()) {
-                return Either.right(createInputs.right().value());
+                throw new ComponentException(createInputs.right().value());
             }
         } else {
-            return Either.left(resource);
+            return resource;
         }
-
         Either<Resource, StorageOperationStatus> updatedResource = toscaOperationFacade
                 .getToscaElement(resource.getUniqueId());
         if (updatedResource.isRight()) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                    componentsUtils.convertFromStorageResponse(updatedResource.right().value()), resource);
-            return Either.right(responseFormat);
+            throw new ComponentException(componentsUtils.getResponseFormatByResource(
+                    componentsUtils.convertFromStorageResponse(updatedResource.right().value()), resource));
         }
-        return Either.left(updatedResource.left().value());
+        return updatedResource.left().value();
     }
 
-    private Either<List<GroupDefinition>, ResponseFormat> updateGroupMembersUsingResource(
-            Map<String, GroupDefinition> groups, Resource component) {
+    private List<GroupDefinition> updateGroupsMembersUsingResource(Map<String, GroupDefinition> groups, Resource component) {
 
         List<GroupDefinition> result = new ArrayList<>();
-
         List<ComponentInstance> componentInstances = component.getComponentInstances();
 
         if (groups != null) {
             Either<Boolean, ResponseFormat> validateCyclicGroupsDependencies = validateCyclicGroupsDependencies(groups);
             if (validateCyclicGroupsDependencies.isRight()) {
-                return FunctionalInterfaces.convertEitherRight(validateCyclicGroupsDependencies);
+                throw new ComponentException(validateCyclicGroupsDependencies.right().value());
             }
             for (Entry<String, GroupDefinition> entry : groups.entrySet()) {
                 String groupName = entry.getKey();
-
                 GroupDefinition groupDefinition = entry.getValue();
-
                 GroupDefinition updatedGroupDefinition = new GroupDefinition(groupDefinition);
                 updatedGroupDefinition.setMembers(null);
-
-                // get the members of the group
                 Map<String, String> members = groupDefinition.getMembers();
                 if (members != null) {
-                    Set<String> compInstancesNames = members.keySet();
-
-                    if (componentInstances == null || true == componentInstances.isEmpty()) {
-                        String membersAstString = compInstancesNames.stream().collect(Collectors.joining(","));
-                        log.debug(
-                                "The members: {}, in group: {}, cannot be found in component {}. There are no component instances.",
-                                membersAstString, groupName, component.getNormalizedName());
-                        return Either.right(componentsUtils.getResponseFormat(
-                                ActionStatus.GROUP_INVALID_COMPONENT_INSTANCE, membersAstString, groupName,
-                                component.getNormalizedName(), getComponentTypeForResponse(component)));
-                    }
-                    // Find all component instances with the member names
-                    Map<String, String> memberNames = componentInstances.stream()
-                            .collect(Collectors.toMap(ComponentInstance::getName, ComponentInstance::getUniqueId));
-                    memberNames.putAll(groups.keySet().stream().collect(Collectors.toMap(g -> g, g -> "")));
-                    Map<String, String> relevantInstances = memberNames.entrySet().stream()
-                            .filter(n -> compInstancesNames.contains(n.getKey()))
-                            .collect(Collectors.toMap(n -> n.getKey(), n -> n.getValue()));
-
-                    if (relevantInstances == null || relevantInstances.size() != compInstancesNames.size()) {
-
-                        List<String> foundMembers = new ArrayList<>();
-                        if (relevantInstances != null) {
-                            foundMembers = relevantInstances.keySet().stream().collect(Collectors.toList());
-                        }
-                        compInstancesNames.removeAll(foundMembers);
-                        String membersAstString = compInstancesNames.stream().collect(Collectors.joining(","));
-                        log.debug("The members: {}, in group: {}, cannot be found in component: {}", membersAstString,
-                                groupName, component.getNormalizedName());
-                        return Either.right(componentsUtils.getResponseFormat(
-                                ActionStatus.GROUP_INVALID_COMPONENT_INSTANCE, membersAstString, groupName,
-                                component.getNormalizedName(), getComponentTypeForResponse(component)));
-                    }
-
-                    updatedGroupDefinition.setMembers(relevantInstances);
+                    updateGroupMembers(groups, updatedGroupDefinition, component, componentInstances, groupName, members);
                 }
-
                 result.add(updatedGroupDefinition);
             }
         }
-        return Either.left(result);
+        return result;
+    }
+
+    private void updateGroupMembers(Map<String, GroupDefinition> groups, GroupDefinition updatedGroupDefinition, Resource component, List<ComponentInstance> componentInstances, String groupName, Map<String, String> members) {
+        Set<String> compInstancesNames = members.keySet();
+
+        if (CollectionUtils.isEmpty(componentInstances)) {
+            String membersAstString = compInstancesNames.stream().collect(joining(","));
+            log.debug("The members: {}, in group: {}, cannot be found in component {}. There are no component instances.",
+                    membersAstString, groupName, component.getNormalizedName());
+            throw new ComponentException(componentsUtils.getResponseFormat(
+                    ActionStatus.GROUP_INVALID_COMPONENT_INSTANCE, membersAstString, groupName,
+                    component.getNormalizedName(), getComponentTypeForResponse(component)));
+        }
+        // Find all component instances with the member names
+        Map<String, String> memberNames = componentInstances.stream()
+                .collect(toMap(ComponentInstance::getName, ComponentInstance::getUniqueId));
+        memberNames.putAll(groups.keySet().stream().collect(toMap(g -> g, g -> "")));
+        Map<String, String> relevantInstances = memberNames.entrySet().stream()
+                .filter(n -> compInstancesNames.contains(n.getKey()))
+                .collect(toMap(Entry::getKey, Entry::getValue));
+
+        if (relevantInstances == null || relevantInstances.size() != compInstancesNames.size()) {
+
+            List<String> foundMembers = new ArrayList<>();
+            if (relevantInstances != null) {
+                foundMembers = relevantInstances.keySet().stream().collect(toList());
+            }
+            compInstancesNames.removeAll(foundMembers);
+            String membersAstString = compInstancesNames.stream().collect(joining(","));
+            log.debug("The members: {}, in group: {}, cannot be found in component: {}", membersAstString,
+                    groupName, component.getNormalizedName());
+            throw new ComponentException(componentsUtils.getResponseFormat(
+                    ActionStatus.GROUP_INVALID_COMPONENT_INSTANCE, membersAstString, groupName,
+                    component.getNormalizedName(), getComponentTypeForResponse(component)));
+        }
+        updatedGroupDefinition.setMembers(relevantInstances);
     }
 
     /**
@@ -2130,11 +1670,11 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         // are groups
         List<String> currGroupFilteredMembers = currGroupMembers.stream().
                 // Keep Only Elements of type group and not Resource Instances
-                        filter(innerGroupName -> allGroups.containsKey(innerGroupName)).
+                        filter(allGroups::containsKey).
                 // Add Filtered Elements to main Set
-                        peek(innerGroupName -> allGroupMembers.add(innerGroupName)).
+                        peek(allGroupMembers::add).
                 // Collect results
-                        collect(Collectors.toList());
+                        collect(toList());
 
         // Recursively call the method for all the filtered group members
         for (String innerGroupName : currGroupFilteredMembers) {
@@ -2154,7 +1694,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         // In Case Group Has no members stop
         if (!stop) {
             GroupDefinition groupDefinition = allGroups.get(groupName);
-            stop = MapUtils.isEmpty(groupDefinition.getMembers());
+            stop = isEmpty(groupDefinition.getMembers());
 
         }
         // In Case all group members already contained stop
@@ -2162,130 +1702,91 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             final Set<String> allMembers = allGroups.get(groupName).getMembers().keySet();
             Set<String> membersOfTypeGroup = allMembers.stream().
                     // Filter In Only Group members
-                            filter(innerGroupName -> allGroups.containsKey(innerGroupName)).
+                            filter(allGroups::containsKey).
                     // Collect
-                            collect(Collectors.toSet());
+                            collect(toSet());
             stop = allGroupMembers.containsAll(membersOfTypeGroup);
         }
         return stop;
     }
 
-    private Either<Resource, ResponseFormat> createRIAndRelationsFromYaml(String yamlName, Resource resource,
-                                                                          Map<String, UploadComponentInstanceInfo> uploadComponentInstanceInfoMap, AuditingActionEnum actionEnum,
-                                                                          String topologyTemplateYaml, List<ArtifactDefinition> nodeTypesNewCreatedArtifacts,
-                                                                          Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo,
-                                                                          Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToCreate,
-                                                                          String nodeName) {
-
-        Either<Resource, ResponseFormat> result;
-        Either<Resource, ResponseFormat> createResourcesInstancesEither;
+    private Resource createRIAndRelationsFromYaml(String yamlName, Resource resource,
+                                                  Map<String, UploadComponentInstanceInfo> uploadComponentInstanceInfoMap,
+                                                  String topologyTemplateYaml, List<ArtifactDefinition> nodeTypesNewCreatedArtifacts,
+                                                  Map<String, NodeTypeInfo> nodeTypesInfo, CsarInfo csarInfo,
+                                                  Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToCreate,
+                                                  String nodeName) {
 
         log.debug("************* Going to create all nodes {}", yamlName);
-        Either<Map<String, Resource>, ResponseFormat> createdResourcesFromdNodeTypeMap = this.handleNodeTypes(yamlName,
-                resource, topologyTemplateYaml, false, nodeTypesArtifactsToCreate, nodeTypesNewCreatedArtifacts,
+        handleNodeTypes(yamlName, resource, topologyTemplateYaml, false, nodeTypesArtifactsToCreate, nodeTypesNewCreatedArtifacts,
                 nodeTypesInfo, csarInfo, nodeName);
         log.debug("************* Finished to create all nodes {}", yamlName);
-        if (createdResourcesFromdNodeTypeMap.isRight()) {
-            log.debug("failed to resources from node types status is {}",
-                    createdResourcesFromdNodeTypeMap.right().value());
-            return Either.right(createdResourcesFromdNodeTypeMap.right().value());
-        }
-
         log.debug("************* Going to create all resource instances {}", yamlName);
-        createResourcesInstancesEither = createResourceInstances(csarInfo.getModifier(), yamlName, resource,
-                uploadComponentInstanceInfoMap, true, false, csarInfo.getCreatedNodes());
-
+        resource = createResourceInstances(yamlName, resource,
+                uploadComponentInstanceInfoMap, csarInfo.getCreatedNodes());
         log.debug("************* Finished to create all resource instances {}", yamlName);
-        if (createResourcesInstancesEither.isRight()) {
-            log.debug("failed to create resource instances status is {}",
-                    createResourcesInstancesEither.right().value());
-            result = createResourcesInstancesEither;
-            return createResourcesInstancesEither;
-        }
-        resource = createResourcesInstancesEither.left().value();
         log.debug("************* Going to create all relations {}", yamlName);
-        createResourcesInstancesEither = createResourceInstancesRelations(csarInfo.getModifier(), yamlName, resource,
-                uploadComponentInstanceInfoMap);
-
+        resource = createResourceInstancesRelations(csarInfo.getModifier(), yamlName, resource, uploadComponentInstanceInfoMap);
         log.debug("************* Finished to create all relations {}", yamlName);
-
-        if (createResourcesInstancesEither.isRight()) {
-            log.debug("failed to create relation between resource instances status is {}",
-                    createResourcesInstancesEither.right().value());
-            result = createResourcesInstancesEither;
-            return result;
-        } else {
-            resource = createResourcesInstancesEither.left().value();
-        }
-
         log.debug("************* Going to create positions {}", yamlName);
-        Either<List<ComponentInstance>, ResponseFormat> eitherSetPosition = compositionBusinessLogic
-                .setPositionsForComponentInstances(resource, csarInfo.getModifier().getUserId());
+        compositionBusinessLogic.setPositionsForComponentInstances(resource, csarInfo.getModifier().getUserId());
         log.debug("************* Finished to set positions {}", yamlName);
-        result = eitherSetPosition.isRight() ? Either.right(eitherSetPosition.right().value()) : Either.left(resource);
-
-        return result;
+        return resource;
     }
 
     private void handleAndAddExtractedVfcsArtifacts(List<ArtifactDefinition> vfcArtifacts,
                                                     List<ArtifactDefinition> artifactsToAdd) {
-        List<String> vfcArtifactNames = vfcArtifacts.stream().map(a -> a.getArtifactName())
-                .collect(Collectors.toList());
+        List<String> vfcArtifactNames = vfcArtifacts.stream().map(ArtifactDataDefinition::getArtifactName)
+                .collect(toList());
         artifactsToAdd.stream().forEach(a -> {
             if (!vfcArtifactNames.contains(a.getArtifactName())) {
                 vfcArtifacts.add(a);
             } else {
-                log.error("Can't upload two artifact with the same name {}. ", a.getArtifactName());
+                log.debug("Can't upload two artifact with the same name {}. ", a.getArtifactName());
             }
         });
 
     }
 
     @SuppressWarnings("unchecked")
-    private Either<Map<String, Resource>, ResponseFormat> handleNodeTypes(String yamlName, Resource resource,
-                                                                          String topologyTemplateYaml, boolean needLock,
-                                                                          Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle,
-                                                                          List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, Map<String, NodeTypeInfo> nodeTypesInfo,
-                                                                          CsarInfo csarInfo, String nodeName) {
-
-        Either<Map<String, Resource>, ResponseFormat> result = Either.left(csarInfo.getCreatedNodes());
-        for (Entry<String, NodeTypeInfo> nodeTypeEntry : nodeTypesInfo.entrySet()) {
-            if (nodeTypeEntry.getValue().isNested()) {
-
-                Either<Resource, ResponseFormat> createResourceFromYaml = handleNestedVfc(resource,
-                        nodeTypesArtifactsToHandle, nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo,
-                        nodeTypeEntry.getKey());
-                log.trace("************* finished to create node {}", nodeTypeEntry.getKey());
-                if (createResourceFromYaml.isRight()) {
-                    return Either.right(createResourceFromYaml.right().value());
-                }
-            }
-        }
-
-        Map<String, Object> mappedToscaTemplate = null;
-        if (StringUtils.isNotEmpty(nodeName) && MapUtils.isNotEmpty(nodeTypesInfo)
-                && nodeTypesInfo.containsKey(nodeName)) {
-            mappedToscaTemplate = nodeTypesInfo.get(nodeName).getMappedToscaTemplate();
-        }
-        if (MapUtils.isEmpty(mappedToscaTemplate)) {
-            mappedToscaTemplate = (Map<String, Object>) new Yaml().load(topologyTemplateYaml);
-        }
-
-        Either<Map<String, Resource>, ResponseFormat> createdNodeTypeFromMainTemplateEither = createResourcesFromYamlNodeTypesList(
-                yamlName, resource, mappedToscaTemplate, needLock, nodeTypesArtifactsToHandle,
-                nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo);
-        if (createdNodeTypeFromMainTemplateEither.isRight()) {
-            ResponseFormat responseFormat = createdNodeTypeFromMainTemplateEither.right().value();
+    private void handleNodeTypes(String yamlName, Resource resource,
+                                 String topologyTemplateYaml, boolean needLock,
+                                 Map<String, EnumMap<ArtifactOperationEnum, List<ArtifactDefinition>>> nodeTypesArtifactsToHandle,
+                                 List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, Map<String, NodeTypeInfo> nodeTypesInfo,
+                                 CsarInfo csarInfo, String nodeName) {
+        try{
+            for (Entry<String, NodeTypeInfo> nodeTypeEntry : nodeTypesInfo.entrySet()) {
+                if (nodeTypeEntry.getValue().isNested()) {
+
+                    handleNestedVfc(resource, nodeTypesArtifactsToHandle, nodeTypesNewCreatedArtifacts,
+                            nodeTypesInfo, csarInfo, nodeTypeEntry.getKey());
+                    log.trace("************* finished to create node {}", nodeTypeEntry.getKey());
+                }
+            }
+            Map<String, Object> mappedToscaTemplate = null;
+            if (StringUtils.isNotEmpty(nodeName) && isNotEmpty(nodeTypesInfo)
+                    && nodeTypesInfo.containsKey(nodeName)) {
+                mappedToscaTemplate = nodeTypesInfo.get(nodeName).getMappedToscaTemplate();
+            }
+            if (isEmpty(mappedToscaTemplate)) {
+                mappedToscaTemplate = (Map<String, Object>) new Yaml().load(topologyTemplateYaml);
+            }
+            createResourcesFromYamlNodeTypesList(yamlName, resource, mappedToscaTemplate, needLock, nodeTypesArtifactsToHandle,
+                    nodeTypesNewCreatedArtifacts, nodeTypesInfo, csarInfo);
+        } catch(ComponentException e){
+            ResponseFormat responseFormat = e.getResponseFormat() != null ? e.getResponseFormat()
+                    : componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams());
             componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, AuditingActionEnum.IMPORT_RESOURCE);
-            return Either.right(responseFormat);
+            throw e;
+        } catch (StorageException e){
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(e.getStorageOperationStatus()));
+            componentsUtils.auditResource(responseFormat, csarInfo.getModifier(), resource, AuditingActionEnum.IMPORT_RESOURCE);
+            throw e;
         }
-
         // add the created node types to the cache although they are not in the
         // graph.
         csarInfo.getCreatedNodes().values().stream()
                 .forEach(p -> cacheManagerOperation.storeComponentInCache(p, NodeTypeEnum.Resource));
-
-        return result;
     }
 
     private Either<Resource, ResponseFormat> handleVfCsarArtifacts(Resource resource, CsarInfo csarInfo,
@@ -2300,10 +1801,12 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 Map<String, ArtifactDefinition> deploymentArtifactsMap = resource.getDeploymentArtifacts();
                 if (deploymentArtifactsMap != null && !deploymentArtifactsMap.isEmpty()) {
                     for (Entry<String, ArtifactDefinition> artifactEntry : deploymentArtifactsMap.entrySet()) {
-                        if (artifactEntry.getValue().getArtifactName().equalsIgnoreCase(Constants.VENDOR_LICENSE_MODEL))
+                        if (artifactEntry.getValue().getArtifactName().equalsIgnoreCase(Constants.VENDOR_LICENSE_MODEL)) {
                             vendorLicenseModelId = artifactEntry.getValue().getUniqueId();
-                        if (artifactEntry.getValue().getArtifactName().equalsIgnoreCase(Constants.VF_LICENSE_MODEL))
+                        }
+                        if (artifactEntry.getValue().getArtifactName().equalsIgnoreCase(Constants.VF_LICENSE_MODEL)) {
                             vfLicenseModelId = artifactEntry.getValue().getUniqueId();
+                        }
                     }
                 }
 
@@ -2313,13 +1816,13 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     CsarUtils.ARTIFACTS_PATH + Constants.VENDOR_LICENSE_MODEL, Constants.VENDOR_LICENSE_MODEL,
                     ArtifactTypeEnum.VENDOR_LICENSE.getType(), ArtifactGroupTypeEnum.DEPLOYMENT,
                     Constants.VENDOR_LICENSE_LABEL, Constants.VENDOR_LICENSE_DISPLAY_NAME,
-                    Constants.VENDOR_LICENSE_DESCRIPTION, vendorLicenseModelId, artifactOperation, null, false, shouldLock,
+                    Constants.VENDOR_LICENSE_DESCRIPTION, vendorLicenseModelId, artifactOperation, null, true, shouldLock,
                     inTransaction);
             createOrUpdateSingleNonMetaArtifact(resource, csarInfo,
                     CsarUtils.ARTIFACTS_PATH + Constants.VF_LICENSE_MODEL, Constants.VF_LICENSE_MODEL,
                     ArtifactTypeEnum.VF_LICENSE.getType(), ArtifactGroupTypeEnum.DEPLOYMENT, Constants.VF_LICENSE_LABEL,
                     Constants.VF_LICENSE_DISPLAY_NAME, Constants.VF_LICENSE_DESCRIPTION, vfLicenseModelId,
-                    artifactOperation, null, false, shouldLock, inTransaction);
+                    artifactOperation, null, true, shouldLock, inTransaction);
 
             Either<Resource, ResponseFormat> eitherCreateResult = createOrUpdateNonMetaArtifacts(csarInfo, resource,
                     createdArtifacts, shouldLock, inTransaction, artifactOperation);
@@ -2343,10 +1846,11 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 String artifactsFileName = artifacsMetaCsarStatus.left().value().getKey();
                 String artifactsContents = artifacsMetaCsarStatus.left().value().getValue();
                 Either<Resource, ResponseFormat> createArtifactsFromCsar;
-                if (ArtifactOperationEnum.isCreateOrLink(artifactOperation.getArtifactOperationEnum()))
+                if (ArtifactOperationEnum.isCreateOrLink(artifactOperation.getArtifactOperationEnum())) {
                     createArtifactsFromCsar = csarArtifactsAndGroupsBusinessLogic.createResourceArtifactsFromCsar(csarInfo, resource, artifactsContents, artifactsFileName, createdArtifacts, shouldLock, inTransaction);
-                else
+                } else {
                     createArtifactsFromCsar = csarArtifactsAndGroupsBusinessLogic.updateResourceArtifactsFromCsar(csarInfo, resource, artifactsContents, artifactsFileName, createdArtifacts, shouldLock, inTransaction);
+                }
 
                 if (createArtifactsFromCsar.isRight()) {
                     log.debug("Couldn't create artifacts from artifacts.meta");
@@ -2436,36 +1940,19 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         Map<String, Set<List<String>>> collectedWarningMessages = new HashMap<>();
 
         try {
-            List<NonMetaArtifactInfo> artifactPathAndNameList =
-                    // Stream of file paths contained in csar
-                    csarInfo.getCsar().entrySet().stream()
-                            // Filter in only VF artifact path location
-                            .filter(e -> Pattern.compile(VF_NODE_TYPE_ARTIFACTS_PATH_PATTERN).matcher(e.getKey())
-                                    .matches())
-                            // Validate and add warnings
-                            .map(e -> CsarUtils.validateNonMetaArtifact(e.getKey(), e.getValue(),
-                                    collectedWarningMessages))
-                            // Filter in Non Warnings
-                            .filter(e -> e.isLeft())
-                            // Convert from Either to NonMetaArtifactInfo
-                            .map(e -> e.left().value())
-                            // collect to List
-                            .collect(Collectors.toList());
-
-            Either<Boolean, String> responseFormatEither = validateArtifactNames(artifactPathAndNameList);
-            if (responseFormatEither.isRight()) {
+            Either<List<NonMetaArtifactInfo>, String> artifactPathAndNameList = getValidArtifactNames(csarInfo, collectedWarningMessages);
+            if (artifactPathAndNameList.isRight()) {
                 return Either.right(getComponentsUtils().getResponseFormatByArtifactId(
-                        ActionStatus.ARTIFACT_NAME_INVALID, responseFormatEither.right().value()));
+                        ActionStatus.ARTIFACT_NAME_INVALID, artifactPathAndNameList.right().value()));
             }
-
             EnumMap<ArtifactOperationEnum, List<NonMetaArtifactInfo>> vfCsarArtifactsToHandle = null;
 
             if (ArtifactOperationEnum.isCreateOrLink(artifactOperation.getArtifactOperationEnum())) {
                 vfCsarArtifactsToHandle = new EnumMap<>(ArtifactOperationEnum.class);
-                vfCsarArtifactsToHandle.put(artifactOperation.getArtifactOperationEnum(), artifactPathAndNameList);
+                vfCsarArtifactsToHandle.put(artifactOperation.getArtifactOperationEnum(), artifactPathAndNameList.left().value());
             } else {
                 Either<EnumMap<ArtifactOperationEnum, List<NonMetaArtifactInfo>>, ResponseFormat> findVfCsarArtifactsToHandleRes = findVfCsarArtifactsToHandle(
-                        resource, artifactPathAndNameList, csarInfo.getModifier());
+                        resource, artifactPathAndNameList.left().value(), csarInfo.getModifier());
 
                 if (findVfCsarArtifactsToHandleRes.isRight()) {
                     resStatus = Either.right(findVfCsarArtifactsToHandleRes.right().value());
@@ -2474,37 +1961,8 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     vfCsarArtifactsToHandle = findVfCsarArtifactsToHandleRes.left().value();
                 }
             }
-
-
             if (resStatus == null && vfCsarArtifactsToHandle != null) {
-
-                for (Entry<ArtifactOperationEnum, List<NonMetaArtifactInfo>> currArtifactOperationPair : vfCsarArtifactsToHandle
-                        .entrySet()) {
-
-                    Optional<ResponseFormat> optionalCreateInDBError =
-                            // Stream of artifacts to be created
-                            currArtifactOperationPair.getValue().stream()
-                                    // create each artifact
-                                    .map(e -> createOrUpdateSingleNonMetaArtifact(resource, csarInfo, e.getPath(),
-                                            e.getArtifactName(), e.getArtifactType().getType(),
-                                            e.getArtifactGroupType(), e.getArtifactLabel(), e.getDisplayName(),
-                                            CsarUtils.ARTIFACT_CREATED_FROM_CSAR, e.getArtifactUniqueId(),
-                                            artifactsBusinessLogic.new ArtifactOperationInfo(false, false,
-                                                    currArtifactOperationPair.getKey()),
-                                            createdArtifacts, e.isFromCsar(), shouldLock, inTransaction))
-                                    // filter in only error
-                                    .filter(e -> e.isRight()).
-                                    // Convert the error from either to
-                                    // ResponseFormat
-                                            map(e -> e.right().value()).
-                                    // Check if an error occurred
-                                            findAny();
-                    // Error found on artifact Creation
-                    if (optionalCreateInDBError.isPresent()) {
-                        resStatus = Either.right(optionalCreateInDBError.get());
-                        break;
-                    }
-                }
+                resStatus = processCsarArtifacts(csarInfo, resource, createdArtifacts, shouldLock, inTransaction, resStatus, vfCsarArtifactsToHandle);
             }
             if (resStatus == null) {
                 resStatus = Either.left(resource);
@@ -2518,14 +1976,60 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return resStatus;
     }
 
-    private Either<Boolean, String> validateArtifactNames(List<NonMetaArtifactInfo> artifactPathAndNameList) {
+    private Either<Resource, ResponseFormat> processCsarArtifacts(CsarInfo csarInfo, Resource resource, List<ArtifactDefinition> createdArtifacts, boolean shouldLock, boolean inTransaction, Either<Resource, ResponseFormat> resStatus, EnumMap<ArtifactOperationEnum, List<NonMetaArtifactInfo>> vfCsarArtifactsToHandle) {
+        for (Entry<ArtifactOperationEnum, List<NonMetaArtifactInfo>> currArtifactOperationPair : vfCsarArtifactsToHandle
+                .entrySet()) {
+
+            Optional<ResponseFormat> optionalCreateInDBError =
+                    // Stream of artifacts to be created
+                    currArtifactOperationPair.getValue().stream()
+                            // create each artifact
+                            .map(e -> createOrUpdateSingleNonMetaArtifact(resource, csarInfo, e.getPath(),
+                                    e.getArtifactName(), e.getArtifactType().getType(),
+                                    e.getArtifactGroupType(), e.getArtifactLabel(), e.getDisplayName(),
+                                    CsarUtils.ARTIFACT_CREATED_FROM_CSAR, e.getArtifactUniqueId(),
+                                    artifactsBusinessLogic.new ArtifactOperationInfo(false, false,
+                                            currArtifactOperationPair.getKey()),
+                                    createdArtifacts, e.isFromCsar(), shouldLock, inTransaction))
+                            // filter in only error
+                            .filter(Either::isRight).
+                            // Convert the error from either to
+                            // ResponseFormat
+                                    map(e -> e.right().value()).
+                            // Check if an error occurred
+                                    findAny();
+            // Error found on artifact Creation
+            if (optionalCreateInDBError.isPresent()) {
+                resStatus = Either.right(optionalCreateInDBError.get());
+                break;
+            }
+        }
+        return resStatus;
+    }
+
+    private Either<List<NonMetaArtifactInfo>, String> getValidArtifactNames(CsarInfo csarInfo, Map<String, Set<List<String>>> collectedWarningMessages) {
+        List<NonMetaArtifactInfo> artifactPathAndNameList =
+                // Stream of file paths contained in csar
+                csarInfo.getCsar().entrySet().stream()
+                        // Filter in only VF artifact path location
+                        .filter(e -> Pattern.compile(VF_NODE_TYPE_ARTIFACTS_PATH_PATTERN).matcher(e.getKey())
+                                .matches())
+                        // Validate and add warnings
+                        .map(e -> CsarUtils.validateNonMetaArtifact(e.getKey(), e.getValue(),
+                                collectedWarningMessages))
+                        // Filter in Non Warnings
+                        .filter(Either::isLeft)
+                        // Convert from Either to NonMetaArtifactInfo
+                        .map(e -> e.left().value())
+                        // collect to List
+                        .collect(toList());
         Pattern englishNumbersAndUnderScoresOnly = Pattern.compile(CsarUtils.VALID_ENGLISH_ARTIFACT_NAME);
         for (NonMetaArtifactInfo nonMetaArtifactInfo : artifactPathAndNameList) {
             if (!englishNumbersAndUnderScoresOnly.matcher(nonMetaArtifactInfo.getDisplayName()).matches()) {
                 return Either.right(nonMetaArtifactInfo.getArtifactName());
             }
         }
-        return Either.left(true);
+        return Either.left(artifactPathAndNameList);
     }
 
     private Either<EnumMap<ArtifactOperationEnum, List<NonMetaArtifactInfo>>, ResponseFormat> findVfCsarArtifactsToHandle(
@@ -2542,19 +2046,20 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         existingArtifacts = existingArtifacts.stream()
                 // filter MANDATORY artifacts, LICENSE artifacts and artifacts
                 // was created from HEAT.meta
-                .filter(this::isNonMetaArtifact).collect(Collectors.toList());
+                .filter(this::isNonMetaArtifact).collect(toList());
 
         List<String> artifactsToIgnore = new ArrayList<>();
         // collect IDs of Artifacts of VF which belongs to any group
         if (resource.getGroups() != null) {
             resource.getGroups().stream().forEach(g -> {
-                if (g.getArtifacts() != null && !g.getArtifacts().isEmpty())
+                if (g.getArtifacts() != null && !g.getArtifacts().isEmpty()) {
                     artifactsToIgnore.addAll(g.getArtifacts());
+                }
             });
         }
         existingArtifacts = existingArtifacts.stream()
                 // filter artifacts which belongs to any group
-                .filter(a -> !artifactsToIgnore.contains(a.getUniqueId())).collect(Collectors.toList());
+                .filter(a -> !artifactsToIgnore.contains(a.getUniqueId())).collect(toList());
         return organizeVfCsarArtifactsByArtifactOperation(artifactPathAndNameList, existingArtifacts, resource, user);
     }
 
@@ -2576,228 +2081,185 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return result;
     }
 
-    private Either<Resource, ResponseFormat> createResourceInstancesRelations(User user, String yamlName,
-                                                                              Resource resource, Map<String, UploadComponentInstanceInfo> uploadResInstancesMap) {
-        log.debug("createResourceInstancesRelations try to create relations ");
+    private Resource createResourceInstancesRelations(User user, String yamlName, Resource resource,
+                                                      Map<String, UploadComponentInstanceInfo> uploadResInstancesMap) {
+        log.debug("#createResourceInstancesRelations - Going to create relations ");
         List<ComponentInstance> componentInstancesList = resource.getComponentInstances();
-        if (uploadResInstancesMap == null) {
-            log.debug("UploadComponentInstanceInfo is empty, fileName  {}", yamlName);
-            BeEcompErrorManager.getInstance().logInternalDataError("UploadComponentInstanceInfo is emty, fileName  {}",
-                    yamlName, ErrorSeverity.ERROR);
-
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE,
-                    yamlName);
-            return Either.right(responseFormat);
-        }
-
-        if (componentInstancesList == null || componentInstancesList.isEmpty()) {
-            log.debug("componentInstancesList is empty in resource {} ", resource.getUniqueId());
-            BeEcompErrorManager.getInstance().logInternalDataError("componentInstancesList is empty in resource {} ",
-                    resource.getUniqueId(), ErrorSeverity.ERROR);
-
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE,
-                    yamlName);
-            return Either.right(responseFormat);
+        if (isEmpty(uploadResInstancesMap) || CollectionUtils.isEmpty(componentInstancesList)) {
+            log.debug("#createResourceInstancesRelations - No instances found in the resource {} is empty, yaml template file name {}, ", resource.getUniqueId(), yamlName);
+            BeEcompErrorManager.getInstance().logInternalDataError("createResourceInstancesRelations","No instances found in a resource or nn yaml template. ", ErrorSeverity.ERROR);
+            throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlName));
         }
+        Map<String, List<ComponentInstanceProperty>> instProperties = new HashMap<>();
+        Map<ComponentInstance, Map<String, List<CapabilityDefinition>>> instCapabilities = new HashMap<>();
+        Map<ComponentInstance, Map<String, List<RequirementDefinition>>> instRequirements = new HashMap<>();
+        Map<String, Map<String, ArtifactDefinition>> instDeploymentArtifacts = new HashMap<>();
+        Map<String, Map<String, ArtifactDefinition>> instArtifacts = new HashMap<>();
+        Map<String, List<PropertyDefinition>> instAttributes = new HashMap<>();
+        Map<String, Resource> originCompMap = new HashMap<>();
+        List<RequirementCapabilityRelDef> relations = new ArrayList<>();
+        Map<String, List<ComponentInstanceInput>> instInputs = new HashMap<>();
 
-        log.debug("Before validateAndUpdatePropertyValue");
+        log.debug("#createResourceInstancesRelations - Before get all datatypes. ");
         Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = dataTypeCache.getAll();
         if (allDataTypes.isRight()) {
             TitanOperationStatus status = allDataTypes.right().value();
             BeEcompErrorManager.getInstance().logInternalFlowError("UpdatePropertyValueOnComponentInstance",
                     "Failed to update property value on instance. Status is " + status, ErrorSeverity.ERROR);
-            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(
+            throw new ComponentException(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(
                     DaoStatusConverter.convertTitanStatusToStorageStatus(status)), yamlName));
 
         }
+        Resource finalResource = resource;
+        uploadResInstancesMap
+                .values()
+                .forEach(i ->processComponentInstance(yamlName, finalResource, componentInstancesList, allDataTypes,
+                        instProperties, instCapabilities, instRequirements, instDeploymentArtifacts,
+                        instArtifacts, instAttributes, originCompMap, instInputs, i));
 
-        Map<String, List<ComponentInstanceProperty>> instProperties = new HashMap<>();
-        Map<ComponentInstance, Map<String, List<CapabilityDefinition>>> instCapabilties = new HashMap<>();
-        Map<ComponentInstance, Map<String, List<RequirementDefinition>>> instRequirements = new HashMap<>();
-        Map<String, Map<String, ArtifactDefinition>> instDeploymentArtifacts = new HashMap<>();
-        Map<String, Map<String, ArtifactDefinition>> instArtifacts = new HashMap<>();
-        Map<String, List<PropertyDefinition>> instAttributes = new HashMap<>();
-        Map<String, Resource> originCompMap = new HashMap<>();
-        List<RequirementCapabilityRelDef> relations = new ArrayList<>();
+        associateComponentInstancePropertiesToComponent(yamlName, resource, instProperties);
+        associateComponentInstanceInputsToComponent(yamlName, resource, instInputs);
+        associateDeploymentArtifactsToInstances(user, yamlName, resource, instDeploymentArtifacts);
+        associateArtifactsToInstances(yamlName, resource, instArtifacts);
+        associateOrAddCalculatedCapReq(yamlName, resource, instCapabilities, instRequirements);
+        associateInstAttributeToComponentToInstances(yamlName, resource, instAttributes);
 
-        Map<String, List<ComponentInstanceInput>> instInputs = new HashMap<>();
+        resource = getResourceAfterCreateRelations(resource);
 
-        for (Entry<String, UploadComponentInstanceInfo> entry : uploadResInstancesMap.entrySet()) {
-            log.trace("Processing entry: {}", entry);
-            UploadComponentInstanceInfo uploadComponentInstanceInfo = entry.getValue();
-            ComponentInstance currentCompInstance = null;
-            for (ComponentInstance compInstance : componentInstancesList) {
-                log.trace("Processing component instance: {}", compInstance);
-                if (compInstance.getName().equals(uploadComponentInstanceInfo.getName())) {
-                    currentCompInstance = compInstance;
-                    break;
-                }
-
-            }
-            if (currentCompInstance == null) {
-                log.debug("component instance with name {}  in resource {} ", uploadComponentInstanceInfo.getName(),
-                        resource.getUniqueId());
-                BeEcompErrorManager.getInstance().logInternalDataError(
-                        "component instance with name " + uploadComponentInstanceInfo.getName() + "  in resource {} ",
-                        resource.getUniqueId(), ErrorSeverity.ERROR);
-                ResponseFormat responseFormat = componentsUtils
-                        .getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlName);
-                return Either.right(responseFormat);
-            }
-            String resourceInstanceId = currentCompInstance.getUniqueId();
-            Resource originResource;
-            if (!originCompMap.containsKey(currentCompInstance.getComponentUid())) {
-                Either<Resource, StorageOperationStatus> getOriginResourceRes = toscaOperationFacade
-                        .getToscaFullElement(currentCompInstance.getComponentUid());
-                if (getOriginResourceRes.isRight()) {
-                    log.debug("failed to fetch resource with uniqueId {} and tosca component name {} status is {}",
-                            currentCompInstance.getComponentUid(), currentCompInstance.getToscaComponentName(),
-                            getOriginResourceRes);
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-                            componentsUtils.convertFromStorageResponse(getOriginResourceRes.right().value()), yamlName);
-                    return Either.right(responseFormat);
-                }
-                originResource = getOriginResourceRes.left().value();
-                originCompMap.put(originResource.getUniqueId(), originResource);
-            } else {
-                originResource = originCompMap.get(currentCompInstance.getComponentUid());
-            }
-            if (originResource.getRequirements() != null && !originResource.getRequirements().isEmpty())
-                instRequirements.put(currentCompInstance, originResource.getRequirements());
-            if (MapUtils.isNotEmpty(originResource.getCapabilities())) {
-                Map<String, List<CapabilityDefinition>> originCapabilities;
-                if (MapUtils.isNotEmpty(uploadComponentInstanceInfo.getCapabilities())) {
-                    originCapabilities = new HashMap<>();
-                    originResource.getCapabilities().entrySet().stream().forEach(e -> {
-                        List<CapabilityDefinition> list = e.getValue().stream().map(l -> new CapabilityDefinition(l))
-                                .collect(Collectors.toList());
-                        originCapabilities.put(e.getKey(), list);
-                    });
-                    Map<String, Map<String, UploadPropInfo>> newPropertiesMap = new HashMap<>();
-                    for (List<UploadCapInfo> capabilities : uploadComponentInstanceInfo.getCapabilities().values()) {
-                        for (UploadCapInfo capability : capabilities) {
-                            if (CollectionUtils.isNotEmpty(capability.getProperties())) {
-                                newPropertiesMap.put(capability.getName(), capability.getProperties().stream()
-                                        .collect(Collectors.toMap(p -> p.getName(), p -> p)));
-                            }
-                        }
-                    }
-                    for (List<CapabilityDefinition> capabilities : originCapabilities.values()) {
-                        List<CapabilityDefinition> filteredCapabilities = capabilities.stream()
-                                .filter(c -> newPropertiesMap.containsKey(c.getName())).collect(Collectors.toList());
-                        for (CapabilityDefinition cap : filteredCapabilities) {
-                            Either<Boolean, ResponseFormat> updateRes = updatePropertyValues(cap.getProperties(),
-                                    newPropertiesMap.get(cap.getName()), allDataTypes.left().value());
-                            if (updateRes.isRight()) {
-                                log.debug("Failed to update capability properties of capability {} . Status is {}. ",
-                                        cap.getName(), updateRes.right().value());
-                                return Either.right(updateRes.right().value());
-                            }
-                        }
-                    }
-                } else {
-                    originCapabilities = originResource.getCapabilities();
-                }
-                instCapabilties.put(currentCompInstance, originCapabilities);
-            }
-            if (originResource.getDeploymentArtifacts() != null && !originResource.getDeploymentArtifacts().isEmpty())
-                instDeploymentArtifacts.put(resourceInstanceId, originResource.getDeploymentArtifacts());
-            if (originResource.getArtifacts() != null && !originResource.getArtifacts().isEmpty())
-                instArtifacts.put(resourceInstanceId, originResource.getArtifacts());
-            if (originResource.getAttributes() != null && !originResource.getAttributes().isEmpty())
-                instAttributes.put(resourceInstanceId, originResource.getAttributes());
-            if (originResource.getResourceType() != ResourceTypeEnum.CVFC) {
-                ResponseFormat addPropertiesValueToRiRes = addPropertyValuesToRi(uploadComponentInstanceInfo, resource,
-                        originResource, currentCompInstance, yamlName, instProperties, allDataTypes.left().value());
-                if (addPropertiesValueToRiRes.getStatus() != 200) {
-                    return Either.right(addPropertiesValueToRiRes);
-                }
-            } else {
-                ResponseFormat addInputValueToRiRes = addInputsValuesToRi(uploadComponentInstanceInfo, resource,
-                        originResource, currentCompInstance, yamlName, instInputs, allDataTypes.left().value());
-                if (addInputValueToRiRes.getStatus() != 200) {
-                    return Either.right(addInputValueToRiRes);
-                }
-            }
+        addRelationsToRI(yamlName, resource, uploadResInstancesMap, componentInstancesList, relations);
+        associateResourceInstances(yamlName, resource, relations);
+        handleSubstitutionMappings(resource, uploadResInstancesMap);
+        log.debug("************* in create relations, getResource start");
+        Either<Resource, StorageOperationStatus> eitherGetResource = toscaOperationFacade.getToscaElement(resource.getUniqueId());
+        log.debug("************* in create relations, getResource end");
+        if (eitherGetResource.isRight()) {
+            throw new ComponentException(componentsUtils.getResponseFormatByResource(
+                    componentsUtils.convertFromStorageResponse(eitherGetResource.right().value()), resource));
         }
+        return eitherGetResource.left().value();
+    }
 
-        Either<Map<String, List<ComponentInstanceProperty>>, StorageOperationStatus> addPropToInst = toscaOperationFacade
-                .associateComponentInstancePropertiesToComponent(instProperties, resource.getUniqueId());
-        if (addPropToInst.isRight()) {
-            log.debug("failed to associate properties of resource {} status is {}", resource.getUniqueId(),
-                    addPropToInst.right().value());
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-                    componentsUtils.convertFromStorageResponse(addPropToInst.right().value()), yamlName);
-            return Either.right(responseFormat);
-        }
-        if (instInputs != null && !instInputs.isEmpty()) {
-            Either<Map<String, List<ComponentInstanceInput>>, StorageOperationStatus> addInputToInst = toscaOperationFacade
-                    .associateComponentInstanceInputsToComponent(instInputs, resource.getUniqueId());
-            if (addInputToInst.isRight()) {
-                log.debug("failed to associate inputs value of resource {} status is {}", resource.getUniqueId(),
-                        addInputToInst.right().value());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-                        componentsUtils.convertFromStorageResponse(addInputToInst.right().value()), yamlName);
-                return Either.right(responseFormat);
-            }
-        }
-        StorageOperationStatus addArtToInst = toscaOperationFacade
-                .associateDeploymentArtifactsToInstances(instDeploymentArtifacts, resource.getUniqueId(), user);
-        if (addArtToInst != StorageOperationStatus.OK && addArtToInst != StorageOperationStatus.NOT_FOUND) {
-            log.debug("failed to associate artifact of resource {} status is {}", resource.getUniqueId(), addArtToInst);
-            ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName);
-            return Either.right(responseFormat);
+    private Resource getResourceAfterCreateRelations(Resource resource) {
+        ComponentParametersView parametersView = getComponentFilterAfterCreateRelations();
+        Either<Resource, StorageOperationStatus> eitherGetResource = toscaOperationFacade
+                .getToscaElement(resource.getUniqueId(), parametersView);
+
+        if (eitherGetResource.isRight()) {
+            throwComponentExceptionByResource(eitherGetResource.right().value(),resource);
         }
+        return eitherGetResource.left().value();
+    }
 
-        addArtToInst = toscaOperationFacade.associateArtifactsToInstances(instArtifacts, resource.getUniqueId(), user);
+    private void associateResourceInstances(String yamlName, Resource resource, List<RequirementCapabilityRelDef> relations) {
+        StorageOperationStatus addArtToInst;
+        addArtToInst = toscaOperationFacade.associateResourceInstances(resource.getUniqueId(), relations);
         if (addArtToInst != StorageOperationStatus.OK && addArtToInst != StorageOperationStatus.NOT_FOUND) {
-            log.debug("failed to associate artifact of resource {} status is {}", resource.getUniqueId(), addArtToInst);
-            ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName);
-            return Either.right(responseFormat);
+            log.debug("failed to associate instances of resource {} status is {}", resource.getUniqueId(),
+                    addArtToInst);
+            throw new ComponentException(componentsUtils
+                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName));
         }
+    }
+
+    private ComponentParametersView getComponentFilterAfterCreateRelations() {
+        ComponentParametersView parametersView = new ComponentParametersView();
+        parametersView.disableAll();
+        parametersView.setIgnoreComponentInstances(false);
+        parametersView.setIgnoreComponentInstancesProperties(false);
+        parametersView.setIgnoreCapabilities(false);
+        parametersView.setIgnoreRequirements(false);
+        parametersView.setIgnoreGroups(false);
+        return parametersView;
+    }
 
-        addArtToInst = toscaOperationFacade.associateCalculatedCapReq(instCapabilties, instRequirements,
+    private void associateInstAttributeToComponentToInstances(String yamlName, Resource resource, Map<String, List<PropertyDefinition>> instAttributes) {
+        StorageOperationStatus addArtToInst;
+        addArtToInst = toscaOperationFacade.associateInstAttributeToComponentToInstances(instAttributes,
                 resource.getUniqueId());
         if (addArtToInst != StorageOperationStatus.OK && addArtToInst != StorageOperationStatus.NOT_FOUND) {
-            log.debug("failed to associate cap and req of resource {} status is {}", resource.getUniqueId(),
+            log.debug("failed to associate attributes of resource {} status is {}", resource.getUniqueId(),
                     addArtToInst);
-            ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName);
-            return Either.right(responseFormat);
+            throw new ComponentException(componentsUtils
+                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName));
         }
+    }
 
-        addArtToInst = toscaOperationFacade.associateInstAttributeToComponentToInstances(instAttributes,
+    private void associateOrAddCalculatedCapReq(String yamlName, Resource resource, Map<ComponentInstance, Map<String, List<CapabilityDefinition>>> instCapabilities, Map<ComponentInstance, Map<String, List<RequirementDefinition>>> instRequirements) {
+        StorageOperationStatus addArtToInst;
+        addArtToInst = toscaOperationFacade.associateOrAddCalculatedCapReq(instCapabilities, instRequirements,
                 resource.getUniqueId());
         if (addArtToInst != StorageOperationStatus.OK && addArtToInst != StorageOperationStatus.NOT_FOUND) {
-            log.debug("failed to associate attributes of resource {} status is {}", resource.getUniqueId(),
+            log.debug("failed to associate cap and req of resource {} status is {}", resource.getUniqueId(),
                     addArtToInst);
-            ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName);
-            return Either.right(responseFormat);
+            throw new ComponentException(componentsUtils
+                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName));
         }
+    }
 
-        ComponentParametersView parametersView = new ComponentParametersView();
-        parametersView.disableAll();
-        parametersView.setIgnoreComponentInstances(false);
-        parametersView.setIgnoreComponentInstancesProperties(false);
-        parametersView.setIgnoreCapabilities(false);
-        parametersView.setIgnoreRequirements(false);
+    private void associateArtifactsToInstances(String yamlName, Resource resource, Map<String, Map<String, ArtifactDefinition>> instArtifacts) {
+        StorageOperationStatus addArtToInst;
 
-        Either<Resource, StorageOperationStatus> eitherGetResource = toscaOperationFacade
-                .getToscaElement(resource.getUniqueId(), parametersView);
+        addArtToInst = toscaOperationFacade.associateArtifactsToInstances(instArtifacts, resource.getUniqueId());
+        if (addArtToInst != StorageOperationStatus.OK && addArtToInst != StorageOperationStatus.NOT_FOUND) {
+            log.debug("failed to associate artifact of resource {} status is {}", resource.getUniqueId(), addArtToInst);
+            throw new ComponentException(componentsUtils
+                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName));
+        }
+    }
 
-        if (eitherGetResource.isRight()) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                    componentsUtils.convertFromStorageResponse(eitherGetResource.right().value()), resource);
+    private void associateDeploymentArtifactsToInstances(User user, String yamlName, Resource resource, Map<String, Map<String, ArtifactDefinition>> instDeploymentArtifacts) {
+        StorageOperationStatus addArtToInst = toscaOperationFacade
+                .associateDeploymentArtifactsToInstances(instDeploymentArtifacts, resource.getUniqueId(), user);
+        if (addArtToInst != StorageOperationStatus.OK && addArtToInst != StorageOperationStatus.NOT_FOUND) {
+            log.debug("failed to associate artifact of resource {} status is {}", resource.getUniqueId(), addArtToInst);
+            throw new ComponentException(componentsUtils
+                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName));
+        }
+    }
 
-            return Either.right(responseFormat);
+    private void associateComponentInstanceInputsToComponent(String yamlName, Resource resource, Map<String, List<ComponentInstanceInput>> instInputs) {
+        if (MapUtils.isNotEmpty(instInputs)) {
+            Either<Map<String, List<ComponentInstanceInput>>, StorageOperationStatus> addInputToInst = toscaOperationFacade
+                    .associateComponentInstanceInputsToComponent(instInputs, resource.getUniqueId());
+            if (addInputToInst.isRight()) {
+                log.debug("failed to associate inputs value of resource {} status is {}", resource.getUniqueId(),
+                        addInputToInst.right().value());
+                throw new ComponentException(componentsUtils.getResponseFormat(
+                        componentsUtils.convertFromStorageResponse(addInputToInst.right().value()), yamlName));
+            }
+        }
+    }
 
+    private void associateComponentInstancePropertiesToComponent(String yamlName, Resource resource, Map<String, List<ComponentInstanceProperty>> instProperties) {
+        Either<Map<String, List<ComponentInstanceProperty>>, StorageOperationStatus> addPropToInst = toscaOperationFacade
+                .associateComponentInstancePropertiesToComponent(instProperties, resource.getUniqueId());
+        if (addPropToInst.isRight()) {
+            log.debug("failed to associate properties of resource {} status is {}", resource.getUniqueId(),
+                    addPropToInst.right().value());
+            throw new ComponentException(componentsUtils.getResponseFormat(
+                    componentsUtils.convertFromStorageResponse(addPropToInst.right().value()), yamlName));
         }
+    }
 
-        resource = eitherGetResource.left().value();
+    private void handleSubstitutionMappings(Resource resource, Map<String, UploadComponentInstanceInfo> uploadResInstancesMap) {
+        if (resource.getResourceType() == ResourceTypeEnum.CVFC) {
+            Either<Resource, StorageOperationStatus> getResourceRes = toscaOperationFacade.getToscaFullElement(resource.getUniqueId());
+            if (getResourceRes.isRight()) {
+                ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
+                        componentsUtils.convertFromStorageResponse(getResourceRes.right().value()), resource);
+                throw new ComponentException(responseFormat);
+            }
+            getResourceRes = updateCalculatedCapReqWithSubstitutionMappings(getResourceRes.left().value(),
+                    uploadResInstancesMap);
+            if (getResourceRes.isRight()) {
+                ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
+                        componentsUtils.convertFromStorageResponse(getResourceRes.right().value()), resource);
+                throw new ComponentException(responseFormat);
+            }
+        }
+    }
 
+    private void addRelationsToRI(String yamlName, Resource resource, Map<String, UploadComponentInstanceInfo> uploadResInstancesMap, List<ComponentInstance> componentInstancesList, List<RequirementCapabilityRelDef> relations) {
         for (Entry<String, UploadComponentInstanceInfo> entry : uploadResInstancesMap.entrySet()) {
             UploadComponentInstanceInfo uploadComponentInstanceInfo = entry.getValue();
             ComponentInstance currentCompInstance = null;
@@ -2810,75 +2272,132 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
             }
             if (currentCompInstance == null) {
-                log.debug("component instance with name {}  in resource {} ", uploadComponentInstanceInfo.getName(),
+                log.debug(COMPONENT_INSTANCE_WITH_NAME_IN_RESOURCE, uploadComponentInstanceInfo.getName(),
                         resource.getUniqueId());
                 BeEcompErrorManager.getInstance().logInternalDataError(
-                        "component instance with name " + uploadComponentInstanceInfo.getName() + "  in resource {} ",
+                        COMPONENT_INSTANCE_WITH_NAME + uploadComponentInstanceInfo.getName() + IN_RESOURCE,
                         resource.getUniqueId(), ErrorSeverity.ERROR);
                 ResponseFormat responseFormat = componentsUtils
                         .getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlName);
-                return Either.right(responseFormat);
+                throw new ComponentException(responseFormat);
             }
 
             ResponseFormat addRelationToRiRes = addRelationToRI(yamlName, resource, entry.getValue(), relations);
             if (addRelationToRiRes.getStatus() != 200) {
-                return Either.right(addRelationToRiRes);
+                throw new ComponentException(addRelationToRiRes);
             }
         }
+    }
 
-        addArtToInst = toscaOperationFacade.associateResourceInstances(resource.getUniqueId(), relations);
-        if (addArtToInst != StorageOperationStatus.OK && addArtToInst != StorageOperationStatus.NOT_FOUND) {
-            log.debug("failed to associate instances of resource {} status is {}", resource.getUniqueId(),
-                    addArtToInst);
+    private void processComponentInstance(String yamlName, Resource resource, List<ComponentInstance> componentInstancesList, Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes, Map<String, List<ComponentInstanceProperty>> instProperties, Map<ComponentInstance, Map<String, List<CapabilityDefinition>>> instCapabilties, Map<ComponentInstance, Map<String, List<RequirementDefinition>>> instRequirements, Map<String, Map<String, ArtifactDefinition>> instDeploymentArtifacts, Map<String, Map<String, ArtifactDefinition>> instArtifacts, Map<String, List<PropertyDefinition>> instAttributes, Map<String, Resource> originCompMap, Map<String, List<ComponentInstanceInput>> instInputs, UploadComponentInstanceInfo uploadComponentInstanceInfo) {
+        Optional<ComponentInstance> currentCompInstanceOpt = componentInstancesList.stream()
+                .filter(i->i.getName().equals(uploadComponentInstanceInfo.getName()))
+                .findFirst();
+        if (!currentCompInstanceOpt.isPresent()) {
+            log.debug(COMPONENT_INSTANCE_WITH_NAME_IN_RESOURCE, uploadComponentInstanceInfo.getName(),
+                    resource.getUniqueId());
+            BeEcompErrorManager.getInstance().logInternalDataError(
+                    COMPONENT_INSTANCE_WITH_NAME + uploadComponentInstanceInfo.getName() + IN_RESOURCE,
+                    resource.getUniqueId(), ErrorSeverity.ERROR);
             ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(addArtToInst), yamlName);
-            return Either.right(responseFormat);
+                    .getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlName);
+            throw new ComponentException(responseFormat);
         }
-
-        if (resource.getResourceType() == ResourceTypeEnum.CVFC) {
-            eitherGetResource = toscaOperationFacade.getToscaFullElement(resource.getUniqueId());
-            if (eitherGetResource.isRight()) {
-                ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                        componentsUtils.convertFromStorageResponse(eitherGetResource.right().value()), resource);
-                return Either.right(responseFormat);
+        ComponentInstance currentCompInstance = currentCompInstanceOpt.get();
+        String resourceInstanceId = currentCompInstance.getUniqueId();
+        Resource originResource = getOriginResource(yamlName, originCompMap, currentCompInstance);
+        if (isNotEmpty(originResource.getRequirements())) {
+            instRequirements.put(currentCompInstance, originResource.getRequirements());
+        }
+        if (isNotEmpty(originResource.getCapabilities())) {
+            processComponentInstanceCapabilities(allDataTypes, instCapabilties, uploadComponentInstanceInfo,
+                    currentCompInstance, originResource);
+        }
+        if (originResource.getDeploymentArtifacts() != null && !originResource.getDeploymentArtifacts().isEmpty()) {
+            instDeploymentArtifacts.put(resourceInstanceId, originResource.getDeploymentArtifacts());
+        }
+        if (originResource.getArtifacts() != null && !originResource.getArtifacts().isEmpty()) {
+            instArtifacts.put(resourceInstanceId, originResource.getArtifacts());
+        }
+        if (originResource.getAttributes() != null && !originResource.getAttributes().isEmpty()) {
+            instAttributes.put(resourceInstanceId, originResource.getAttributes());
+        }
+        if (originResource.getResourceType() != ResourceTypeEnum.CVFC) {
+            ResponseFormat addPropertiesValueToRiRes = addPropertyValuesToRi(uploadComponentInstanceInfo, resource,
+                    originResource, currentCompInstance, instProperties, allDataTypes.left().value());
+            if (addPropertiesValueToRiRes.getStatus() != 200) {
+                throw new ComponentException(addPropertiesValueToRiRes);
             }
-            eitherGetResource = updateCalculatedCapReqWithSubstitutionMappings(eitherGetResource.left().value(),
-                    uploadResInstancesMap);
-            if (eitherGetResource.isRight()) {
-                ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                        componentsUtils.convertFromStorageResponse(eitherGetResource.right().value()), resource);
-                return Either.right(responseFormat);
+        } else {
+            addInputsValuesToRi(uploadComponentInstanceInfo, resource,
+                    originResource, currentCompInstance, instInputs, allDataTypes.left().value());
+        }
+    }
+
+    private Resource getOriginResource(String yamlName, Map<String, Resource> originCompMap, ComponentInstance currentCompInstance) {
+        Resource originResource;
+        if (!originCompMap.containsKey(currentCompInstance.getComponentUid())) {
+            Either<Resource, StorageOperationStatus> getOriginResourceRes = toscaOperationFacade
+                    .getToscaFullElement(currentCompInstance.getComponentUid());
+            if (getOriginResourceRes.isRight()) {
+                log.debug("failed to fetch resource with uniqueId {} and tosca component name {} status is {}",
+                        currentCompInstance.getComponentUid(), currentCompInstance.getToscaComponentName(),
+                        getOriginResourceRes);
+                ResponseFormat responseFormat = componentsUtils.getResponseFormat(
+                        componentsUtils.convertFromStorageResponse(getOriginResourceRes.right().value()), yamlName);
+                throw new ComponentException(responseFormat);
             }
+            originResource = getOriginResourceRes.left().value();
+            originCompMap.put(originResource.getUniqueId(), originResource);
+        } else {
+            originResource = originCompMap.get(currentCompInstance.getComponentUid());
         }
+        return originResource;
+    }
 
-        log.debug("************* in create relations, getResource start");
-        eitherGetResource = toscaOperationFacade.getToscaElement(resource.getUniqueId());
-        log.debug("************* in create relations, getResource end");
-        if (eitherGetResource.isRight()) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                    componentsUtils.convertFromStorageResponse(eitherGetResource.right().value()), resource);
-            return Either.right(responseFormat);
+    private void processComponentInstanceCapabilities(Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes, Map<ComponentInstance, Map<String, List<CapabilityDefinition>>> instCapabilties, UploadComponentInstanceInfo uploadComponentInstanceInfo, ComponentInstance currentCompInstance, Resource originResource) {
+        Map<String, List<CapabilityDefinition>> originCapabilities;
+        if (isNotEmpty(uploadComponentInstanceInfo.getCapabilities())) {
+            originCapabilities = new HashMap<>();
+            Map<String, Map<String, UploadPropInfo>> newPropertiesMap = new HashMap<>();
+            originResource.getCapabilities().forEach((k,v) ->  addCapabilities(originCapabilities, k, v));
+            uploadComponentInstanceInfo.getCapabilities().values().forEach(l-> addCapabilitiesProperties(newPropertiesMap, l));
+            updateCapabilityPropertiesValues(allDataTypes, originCapabilities, newPropertiesMap);
+        } else {
+            originCapabilities = originResource.getCapabilities();
         }
-        return Either.left(eitherGetResource.left().value());
+        instCapabilties.put(currentCompInstance, originCapabilities);
+    }
+
+    private void updateCapabilityPropertiesValues(Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes, Map<String, List<CapabilityDefinition>> originCapabilities, Map<String, Map<String, UploadPropInfo>> newPropertiesMap) {
+        originCapabilities.values().stream()
+                .flatMap(Collection::stream)
+                .filter(c -> newPropertiesMap.containsKey(c.getName()))
+                .forEach(c -> updatePropertyValues(c.getProperties(), newPropertiesMap.get(c.getName()), allDataTypes.left().value()));
     }
 
-    private Either<Boolean, ResponseFormat> updatePropertyValues(List<ComponentInstanceProperty> properties,
-                                                                 Map<String, UploadPropInfo> newProperties, Map<String, DataTypeDefinition> allDataTypes) {
-        for (ComponentInstanceProperty property : properties) {
-            Either<String, StorageOperationStatus> updateRes = updatePropertyValue(property,
-                    newProperties.get(property.getName()), allDataTypes);
-            if (updateRes.isRight()) {
-                log.debug("Failed to update capability property {} . Status is {}. ", property.getName(),
-                        updateRes.right().value());
-                return Either.right(componentsUtils
-                        .getResponseFormat(componentsUtils.convertFromStorageResponse(updateRes.right().value())));
+    private void addCapabilitiesProperties(Map<String, Map<String, UploadPropInfo>> newPropertiesMap, List<UploadCapInfo> capabilities) {
+        for (UploadCapInfo capability : capabilities) {
+            if (isNotEmpty(capability.getProperties())) {
+                newPropertiesMap.put(capability.getName(), capability.getProperties().stream()
+                        .collect(toMap(UploadInfo::getName, p -> p)));
             }
         }
-        return Either.left(true);
     }
 
-    private Either<String, StorageOperationStatus> updatePropertyValue(ComponentInstanceProperty property,
-                                                                       UploadPropInfo propertyInfo, Map<String, DataTypeDefinition> allDataTypes) {
+    private void addCapabilities(Map<String, List<CapabilityDefinition>> originCapabilities, String type, List<CapabilityDefinition> capabilities) {
+        List<CapabilityDefinition> list = capabilities.stream().map(CapabilityDefinition::new)
+                .collect(toList());
+        originCapabilities.put(type, list);
+    }
+
+    private void updatePropertyValues(List<ComponentInstanceProperty> properties, Map<String, UploadPropInfo> newProperties,
+                                      Map<String, DataTypeDefinition> allDataTypes) {
+        properties.forEach(p->updatePropertyValue(p, newProperties.get(p.getName()), allDataTypes));
+    }
+
+    private String updatePropertyValue(ComponentInstanceProperty property, UploadPropInfo propertyInfo,
+                                       Map<String, DataTypeDefinition> allDataTypes) {
         String value = null;
         List<GetInputValueDataDefinition> getInputs = null;
         boolean isValidate = true;
@@ -2886,10 +2405,11 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             getInputs = propertyInfo.getGet_input();
             isValidate = getInputs == null || getInputs.isEmpty();
             if (isValidate) {
-                value = ImportUtils.getPropertyJsonStringValue(propertyInfo.getValue(), property.getType());
-            } else
-                value = ImportUtils.getPropertyJsonStringValue(propertyInfo.getValue(),
-                        ToscaTagNamesEnum.GET_INPUT.getElementName());
+                value = getPropertyJsonStringValue(propertyInfo.getValue(), property.getType());
+            } else {
+                value = getPropertyJsonStringValue(propertyInfo.getValue(),
+                        TypeUtils.ToscaTagNamesEnum.GET_INPUT.getElementName());
+            }
         }
         property.setValue(value);
         return validatePropValueBeforeCreate(property, value, isValidate, null, allDataTypes);
@@ -2911,7 +2431,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         if (updateRes == null) {
             fillUpdatedInstCapabilitiesRequirements(resource.getComponentInstances(), uploadResInstancesMap,
                     updatedInstCapabilities, updatedInstRequirements);
-            status = toscaOperationFacade.associateCalculatedCapReq(updatedInstCapabilities, updatedInstRequirements,
+            status = toscaOperationFacade.associateOrAddCalculatedCapReq(updatedInstCapabilities, updatedInstRequirements,
                     resource.getUniqueId());
             if (status != StorageOperationStatus.OK && status != StorageOperationStatus.NOT_FOUND) {
                 log.debug(
@@ -2944,7 +2464,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             ComponentInstance instance, Map<String, String> requirementsNamesToUpdate) {
         Map<String, List<RequirementDefinition>> updatedRequirements = new HashMap<>();
         Set<String> updatedReqNames = new HashSet<>();
-        if (MapUtils.isNotEmpty(requirementsNamesToUpdate)) {
+        if (isNotEmpty(requirementsNamesToUpdate)) {
             for (Map.Entry<String, List<RequirementDefinition>> requirements : instance.getRequirements().entrySet()) {
                 updatedRequirements.put(requirements.getKey(),
                         requirements.getValue().stream()
@@ -2955,10 +2475,10 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                                     r.setName(requirementsNamesToUpdate.get(r.getName()));
                                     updatedReqNames.add(r.getName());
                                     return r;
-                                }).collect(Collectors.toList()));
+                                }).collect(toList()));
             }
         }
-        if (MapUtils.isNotEmpty(updatedRequirements)) {
+        if (isNotEmpty(updatedRequirements)) {
             updatedInstRequirements.put(instance, updatedRequirements);
         }
     }
@@ -2968,7 +2488,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             ComponentInstance instance, Map<String, String> capabilitiesNamesToUpdate) {
         Map<String, List<CapabilityDefinition>> updatedCapabilities = new HashMap<>();
         Set<String> updatedCapNames = new HashSet<>();
-        if (MapUtils.isNotEmpty(capabilitiesNamesToUpdate)) {
+        if (isNotEmpty(capabilitiesNamesToUpdate)) {
             for (Map.Entry<String, List<CapabilityDefinition>> requirements : instance.getCapabilities().entrySet()) {
                 updatedCapabilities.put(requirements.getKey(),
                         requirements.getValue().stream()
@@ -2979,10 +2499,10 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                                     c.setName(capabilitiesNamesToUpdate.get(c.getName()));
                                     updatedCapNames.add(c.getName());
                                     return c;
-                                }).collect(Collectors.toList()));
+                                }).collect(toList()));
             }
         }
-        if (MapUtils.isNotEmpty(updatedCapabilities)) {
+        if (isNotEmpty(updatedCapabilities)) {
             updatedInstCapabilties.put(instance, updatedCapabilities);
         }
     }
@@ -2991,13 +2511,11 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                                            UploadComponentInstanceInfo nodesInfoValue, List<RequirementCapabilityRelDef> relations) {
         List<ComponentInstance> componentInstancesList = resource.getComponentInstances();
 
-        UploadComponentInstanceInfo uploadComponentInstanceInfo = nodesInfoValue;
-
         ComponentInstance currentCompInstance = null;
 
         for (ComponentInstance compInstance : componentInstancesList) {
 
-            if (compInstance.getName().equals(uploadComponentInstanceInfo.getName())) {
+            if (compInstance.getName().equals(nodesInfoValue.getName())) {
                 currentCompInstance = compInstance;
                 break;
             }
@@ -3005,18 +2523,17 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
 
         if (currentCompInstance == null) {
-            log.debug("component instance with name {}  in resource {} ", uploadComponentInstanceInfo.getName(),
+            log.debug(COMPONENT_INSTANCE_WITH_NAME_IN_RESOURCE, nodesInfoValue.getName(),
                     resource.getUniqueId());
             BeEcompErrorManager.getInstance().logInternalDataError(
-                    "component instance with name " + uploadComponentInstanceInfo.getName() + "  in resource {} ",
+                    COMPONENT_INSTANCE_WITH_NAME + nodesInfoValue.getName() + IN_RESOURCE,
                     resource.getUniqueId(), ErrorSeverity.ERROR);
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE,
+            return componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE,
                     yamlName);
-            return responseFormat;
         }
         String resourceInstanceId = currentCompInstance.getUniqueId();
 
-        Map<String, List<UploadReqInfo>> regMap = uploadComponentInstanceInfo.getRequirements();
+        Map<String, List<UploadReqInfo>> regMap = nodesInfoValue.getRequirements();
 
         if (regMap != null) {
             Iterator<Entry<String, List<UploadReqInfo>>> nodesRegValue = regMap.entrySet().iterator();
@@ -3032,7 +2549,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     regCapRelDef.setFromNode(resourceInstanceId);
                     log.debug("try to find available requirement {} ", regName);
                     Either<RequirementDefinition, ResponseFormat> eitherReqStatus = findAviableRequiremen(regName,
-                            yamlName, uploadComponentInstanceInfo, currentCompInstance,
+                            yamlName, nodesInfoValue, currentCompInstance,
                             uploadRegInfo.getCapabilityName());
                     if (eitherReqStatus.isRight()) {
                         log.debug("failed to find available requirement {} status is {}", regName,
@@ -3043,8 +2560,9 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     RequirementDefinition validReq = eitherReqStatus.left().value();
                     List<CapabilityRequirementRelationship> reqAndRelationshipPairList = regCapRelDef
                             .getRelationships();
-                    if (reqAndRelationshipPairList == null)
+                    if (reqAndRelationshipPairList == null) {
                         reqAndRelationshipPairList = new ArrayList<>();
+                    }
                     RelationshipInfo reqAndRelationshipPair = new RelationshipInfo();
                     reqAndRelationshipPair.setRequirement(regName);
                     reqAndRelationshipPair.setRequirementOwnerId(validReq.getOwnerId());
@@ -3065,16 +2583,18 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                         log.debug("The component instance  with name {} not found on resource {} ",
                                 uploadRegInfo.getNode(), resource.getUniqueId());
                         BeEcompErrorManager.getInstance().logInternalDataError(
-                                "component instance with name " + uploadRegInfo.getNode() + "  in resource {} ",
+                                COMPONENT_INSTANCE_WITH_NAME + uploadRegInfo.getNode() + IN_RESOURCE,
                                 resource.getUniqueId(), ErrorSeverity.ERROR);
-                        ResponseFormat responseFormat = componentsUtils
+                        return componentsUtils
                                 .getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlName);
-                        return responseFormat;
                     }
                     regCapRelDef.setToNode(currentCapCompInstance.getUniqueId());
                     log.debug("try to find aviable Capability  req name is {} ", validReq.getName());
                     CapabilityDefinition aviableCapForRel = findAvailableCapabilityByTypeOrName(validReq,
                             currentCapCompInstance, uploadRegInfo);
+                    reqAndRelationshipPair.setCapability(aviableCapForRel.getName());
+                    reqAndRelationshipPair.setCapabilityUid(aviableCapForRel.getUniqueId());
+                    reqAndRelationshipPair.setCapabilityOwnerId(aviableCapForRel.getOwnerId());
                     if (aviableCapForRel == null) {
                         log.debug("aviable capability was not found. req name is {} component instance is {}",
                                 validReq.getName(), currentCapCompInstance.getUniqueId());
@@ -3082,13 +2602,9 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                                 "aviable capability was not found. req name is " + validReq.getName()
                                         + " component instance is " + currentCapCompInstance.getUniqueId(),
                                 resource.getUniqueId(), ErrorSeverity.ERROR);
-                        ResponseFormat responseFormat = componentsUtils
+                        return componentsUtils
                                 .getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlName);
-                        return responseFormat;
                     }
-                    reqAndRelationshipPair.setCapability(aviableCapForRel.getName());
-                    reqAndRelationshipPair.setCapabilityUid(aviableCapForRel.getUniqueId());
-                    reqAndRelationshipPair.setCapabilityOwnerId(aviableCapForRel.getOwnerId());
                     CapabilityRequirementRelationship capReqRel = new CapabilityRequirementRelationship();
                     capReqRel.setRelation(reqAndRelationshipPair);
                     reqAndRelationshipPairList.add(capReqRel);
@@ -3097,134 +2613,129 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 }
             }
         } else if (resource.getResourceType() != ResourceTypeEnum.CVFC) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.OK, yamlName);
-            return responseFormat;
+            return componentsUtils.getResponseFormat(ActionStatus.OK, yamlName);
         }
         return componentsUtils.getResponseFormat(ActionStatus.OK);
     }
 
-    private ResponseFormat addInputsValuesToRi(UploadComponentInstanceInfo uploadComponentInstanceInfo,
-                                               Resource resource, Resource originResource, ComponentInstance currentCompInstance, String yamlName,
-                                               Map<String, List<ComponentInstanceInput>> instInputs, Map<String, DataTypeDefinition> allDataTypes) {
+    private void addInputsValuesToRi(UploadComponentInstanceInfo uploadComponentInstanceInfo,
+                                     Resource resource, Resource originResource, ComponentInstance currentCompInstance,
+                                     Map<String, List<ComponentInstanceInput>> instInputs, Map<String, DataTypeDefinition> allDataTypes) {
         Map<String, List<UploadPropInfo>> propMap = uploadComponentInstanceInfo.getProperties();
-        if (propMap != null && propMap.size() > 0) {
-            Map<String, InputDefinition> currPropertiesMap = new HashMap<String, InputDefinition>();
+        if (MapUtils.isNotEmpty(propMap)) {
+            Map<String, InputDefinition> currPropertiesMap = new HashMap<>();
+            List<ComponentInstanceInput> instPropList = new ArrayList<>();
 
-            List<InputDefinition> listFromMap = originResource.getInputs();
-            if (listFromMap == null || listFromMap.isEmpty()) {
+            if (CollectionUtils.isEmpty( originResource.getInputs())) {
                 log.debug("failed to find properties ");
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND);
-                return responseFormat;
+                throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND));
             }
-            for (InputDefinition prop : listFromMap) {
-                String propName = prop.getName();
-                if (!currPropertiesMap.containsKey(propName)) {
-                    currPropertiesMap.put(propName, prop);
-                }
-            }
-            List<ComponentInstanceInput> instPropList = new ArrayList<>();
+            originResource.getInputs().forEach(p->addInput(currPropertiesMap, p));
             for (List<UploadPropInfo> propertyList : propMap.values()) {
+                processProperty(resource, currentCompInstance, allDataTypes, currPropertiesMap, instPropList, propertyList);
+            }
+            currPropertiesMap.values().forEach(p->instPropList.add(new ComponentInstanceInput(p)));
+            instInputs.put(currentCompInstance.getUniqueId(), instPropList);
+        }
+    }
 
-                UploadPropInfo propertyInfo = propertyList.get(0);
-                String propName = propertyInfo.getName();
-                if (!currPropertiesMap.containsKey(propName)) {
-                    log.debug("failed to find property {} ", propName);
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND,
-                            propName);
-                    return responseFormat;
-                }
-                InputDefinition curPropertyDef = currPropertiesMap.get(propName);
-                ComponentInstanceInput property = null;
-
-                String value = null;
-                List<GetInputValueDataDefinition> getInputs = null;
-                boolean isValidate = true;
-                if (propertyInfo.getValue() != null) {
-                    getInputs = propertyInfo.getGet_input();
-                    isValidate = getInputs == null || getInputs.isEmpty();
-                    if (isValidate) {
-                        value = ImportUtils.getPropertyJsonStringValue(propertyInfo.getValue(),
-                                curPropertyDef.getType());
-                    } else
-                        value = ImportUtils.getPropertyJsonStringValue(propertyInfo.getValue(),
-                                ToscaTagNamesEnum.GET_INPUT.getElementName());
-                }
-                String innerType = null;
-                property = new ComponentInstanceInput(curPropertyDef, value, null);
+    private void processProperty(Resource resource, ComponentInstance currentCompInstance, Map<String, DataTypeDefinition> allDataTypes, Map<String, InputDefinition> currPropertiesMap, List<ComponentInstanceInput> instPropList, List<UploadPropInfo> propertyList) {
+        UploadPropInfo propertyInfo = propertyList.get(0);
+        String propName = propertyInfo.getName();
+        if (!currPropertiesMap.containsKey(propName)) {
+            log.debug("failed to find property {} ", propName);
+            throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND,
+                    propName));
+        }
+        InputDefinition curPropertyDef = currPropertiesMap.get(propName);
+        ComponentInstanceInput property = null;
 
-                Either<String, StorageOperationStatus> validatevalueEiter = validatePropValueBeforeCreate(property,
-                        value, isValidate, innerType, allDataTypes);
-                if (validatevalueEiter.isRight()) {
-                    return componentsUtils.getResponseFormat(
-                            componentsUtils.convertFromStorageResponse(validatevalueEiter.right().value()));
-                }
+        String value = null;
+        List<GetInputValueDataDefinition> getInputs = null;
+        boolean isValidate = true;
+        if (propertyInfo.getValue() != null) {
+            getInputs = propertyInfo.getGet_input();
+            isValidate = getInputs == null || getInputs.isEmpty();
+            if (isValidate) {
+                value = getPropertyJsonStringValue(propertyInfo.getValue(),
+                        curPropertyDef.getType());
+            } else {
+                value = getPropertyJsonStringValue(propertyInfo.getValue(),
+                        TypeUtils.ToscaTagNamesEnum.GET_INPUT.getElementName());
+            }
+        }
+        String innerType = null;
+        property = new ComponentInstanceInput(curPropertyDef, value, null);
 
-                property.setValue(validatevalueEiter.left().value());
+        String validPropertyVAlue = validatePropValueBeforeCreate(property, value, isValidate, innerType, allDataTypes);
 
-                if (getInputs != null && !getInputs.isEmpty()) {
-                    List<GetInputValueDataDefinition> getInputValues = new ArrayList<>();
-                    for (GetInputValueDataDefinition getInput : getInputs) {
-                        List<InputDefinition> inputs = resource.getInputs();
-                        if (inputs == null || inputs.isEmpty()) {
-                            log.debug("Failed to add property {} to resource instance {}. Inputs list is empty ",
-                                    property, currentCompInstance.getUniqueId());
-                            return componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
-                        }
+        property.setValue(validPropertyVAlue);
 
-                        Optional<InputDefinition> optional = inputs.stream()
-                                .filter(p -> p.getName().equals(getInput.getInputName())).findAny();
-                        if (!optional.isPresent()) {
-                            log.debug("Failed to find input {} ", getInput.getInputName());
-                            // @@TODO error message
-                            return componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
-                        }
-                        InputDefinition input = optional.get();
-                        getInput.setInputId(input.getUniqueId());
-                        getInputValues.add(getInput);
+        if (isNotEmpty(getInputs)) {
+            List<GetInputValueDataDefinition> getInputValues = new ArrayList<>();
+            for (GetInputValueDataDefinition getInput : getInputs) {
+                List<InputDefinition> inputs = resource.getInputs();
+                if (CollectionUtils.isEmpty(inputs)) {
+                    log.debug("Failed to add property {} to resource instance {}. Inputs list is empty ",
+                            property, currentCompInstance.getUniqueId());
+                    throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
+                }
 
-                        GetInputValueDataDefinition getInputIndex = getInput.getGetInputIndex();
-                        if (getInputIndex != null) {
-                            optional = inputs.stream().filter(p -> p.getName().equals(getInputIndex.getInputName()))
-                                    .findAny();
-                            if (!optional.isPresent()) {
-                                log.debug("Failed to find input {} ", getInputIndex.getInputName());
-                                // @@TODO error message
-                                return componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
-                            }
-                            InputDefinition inputIndex = optional.get();
-                            getInputIndex.setInputId(inputIndex.getUniqueId());
-                            getInputValues.add(getInputIndex);
-                        }
-                    }
-                    property.setGetInputValues(getInputValues);
+                Optional<InputDefinition> optional = inputs.stream()
+                        .filter(p -> p.getName().equals(getInput.getInputName())).findAny();
+                if (!optional.isPresent()) {
+                    log.debug("Failed to find input {} ", getInput.getInputName());
+                    // @@TODO error message
+                    throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
                 }
-                instPropList.add(property);
-                // delete overriden property
-                currPropertiesMap.remove(property.getName());
+                InputDefinition input = optional.get();
+                getInput.setInputId(input.getUniqueId());
+                getInputValues.add(getInput);
+
+                GetInputValueDataDefinition getInputIndex = getInput.getGetInputIndex();
+                processGetInput(getInputValues, inputs, getInputIndex);
             }
-            // add rest of properties
-            if (!currPropertiesMap.isEmpty()) {
-                for (InputDefinition value : currPropertiesMap.values()) {
-                    instPropList.add(new ComponentInstanceInput(value));
-                }
+            property.setGetInputValues(getInputValues);
+        }
+        instPropList.add(property);
+        // delete overriden property
+        currPropertiesMap.remove(property.getName());
+    }
+
+    private void processGetInput(List<GetInputValueDataDefinition> getInputValues, List<InputDefinition> inputs, GetInputValueDataDefinition getInputIndex) {
+        Optional<InputDefinition> optional;
+        if (getInputIndex != null) {
+            optional = inputs.stream().filter(p -> p.getName().equals(getInputIndex.getInputName()))
+                    .findAny();
+            if (!optional.isPresent()) {
+                log.debug("Failed to find input {} ", getInputIndex.getInputName());
+                // @@TODO error message
+                throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
             }
-            instInputs.put(currentCompInstance.getUniqueId(), instPropList);
+            InputDefinition inputIndex = optional.get();
+            getInputIndex.setInputId(inputIndex.getUniqueId());
+            getInputValues.add(getInputIndex);
+        }
+    }
+
+    private void addInput(Map<String, InputDefinition> currPropertiesMap, InputDefinition prop) {
+        String propName = prop.getName();
+        if (!currPropertiesMap.containsKey(propName)) {
+            currPropertiesMap.put(propName, prop);
         }
-        return componentsUtils.getResponseFormat(ActionStatus.OK);
     }
 
     private ResponseFormat addPropertyValuesToRi(UploadComponentInstanceInfo uploadComponentInstanceInfo,
-                                                 Resource resource, Resource originResource, ComponentInstance currentCompInstance, String yamlName,
+                                                 Resource resource, Resource originResource, ComponentInstance currentCompInstance,
                                                  Map<String, List<ComponentInstanceProperty>> instProperties, Map<String, DataTypeDefinition> allDataTypes) {
 
         Map<String, List<UploadPropInfo>> propMap = uploadComponentInstanceInfo.getProperties();
-        Map<String, PropertyDefinition> currPropertiesMap = new HashMap<String, PropertyDefinition>();
+        Map<String, PropertyDefinition> currPropertiesMap = new HashMap<>();
 
         List<PropertyDefinition> listFromMap = originResource.getProperties();
         if ((propMap != null && !propMap.isEmpty()) && (listFromMap == null || listFromMap.isEmpty())) {
             log.debug("failed to find properties ");
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND);
-            return responseFormat;
+            return componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND);
         }
         if (listFromMap == null || listFromMap.isEmpty()) {
             return componentsUtils.getResponseFormat(ActionStatus.OK);
@@ -3243,9 +2754,8 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 String propName = propertyInfo.getName();
                 if (!currPropertiesMap.containsKey(propName)) {
                     log.debug("failed to find property {} ", propName);
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND,
+                    return componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND,
                             propName);
-                    return responseFormat;
                 }
                 PropertyDefinition curPropertyDef = currPropertiesMap.get(propName);
                 ComponentInstanceProperty property = null;
@@ -3257,56 +2767,38 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     getInputs = propertyInfo.getGet_input();
                     isValidate = getInputs == null || getInputs.isEmpty();
                     if (isValidate) {
-                        value = ImportUtils.getPropertyJsonStringValue(propertyInfo.getValue(),
+                        value = getPropertyJsonStringValue(propertyInfo.getValue(),
                                 curPropertyDef.getType());
-                    } else
-                        value = ImportUtils.getPropertyJsonStringValue(propertyInfo.getValue(),
-                                ToscaTagNamesEnum.GET_INPUT.getElementName());
+                    } else {
+                        value = getPropertyJsonStringValue(propertyInfo.getValue(),
+                                TypeUtils.ToscaTagNamesEnum.GET_INPUT.getElementName());
+                    }
                 }
                 String innerType = null;
                 property = new ComponentInstanceProperty(curPropertyDef, value, null);
 
-                Either<String, StorageOperationStatus> validatevalueEiter = validatePropValueBeforeCreate(property,
-                        value, isValidate, innerType, allDataTypes);
-                if (validatevalueEiter.isRight()) {
-                    return componentsUtils.getResponseFormat(
-                            componentsUtils.convertFromStorageResponse(validatevalueEiter.right().value()));
-                }
-
-                property.setValue(validatevalueEiter.left().value());
+                String validatePropValue = validatePropValueBeforeCreate(property, value, isValidate, innerType, allDataTypes);
+                property.setValue(validatePropValue);
 
                 if (getInputs != null && !getInputs.isEmpty()) {
                     List<GetInputValueDataDefinition> getInputValues = new ArrayList<>();
                     for (GetInputValueDataDefinition getInput : getInputs) {
                         List<InputDefinition> inputs = resource.getInputs();
                         if (inputs == null || inputs.isEmpty()) {
-                            log.debug("Failed to add property {} to resource instance {}. Inputs list is empty ",
-                                    property, currentCompInstance.getUniqueId());
-                            return componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
-                        }
-
-                        Optional<InputDefinition> optional = inputs.stream()
-                                .filter(p -> p.getName().equals(getInput.getInputName())).findAny();
-                        if (!optional.isPresent()) {
-                            log.debug("Failed to find input {} ", getInput.getInputName());
-                            // @@TODO error message
-                            return componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
+                            log.debug("Failed to add property {} to instance. Inputs list is empty ", property);
+                            rollbackWithException(ActionStatus.INPUTS_NOT_FOUND, property.getGetInputValues()
+                                    .stream()
+                                    .map(GetInputValueDataDefinition::getInputName)
+                                    .collect(toList()).toString());
                         }
-                        InputDefinition input = optional.get();
+                        InputDefinition input = findInputByName(inputs, getInput);
                         getInput.setInputId(input.getUniqueId());
                         getInputValues.add(getInput);
 
                         GetInputValueDataDefinition getInputIndex = getInput.getGetInputIndex();
                         if (getInputIndex != null) {
-                            optional = inputs.stream().filter(p -> p.getName().equals(getInputIndex.getInputName()))
-                                    .findAny();
-                            if (!optional.isPresent()) {
-                                log.debug("Failed to find input {} ", getInputIndex.getInputName());
-                                // @@TODO error message
-                                return componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
-                            }
-                            InputDefinition inputIndex = optional.get();
-                            getInputIndex.setInputId(inputIndex.getUniqueId());
+                            input = findInputByName(inputs, getInputIndex);
+                            getInputIndex.setInputId(input.getUniqueId());
                             getInputValues.add(getInputIndex);
 
                         }
@@ -3337,7 +2829,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             // by
             // capability
             // type
-            return findAviableCapability(validReq, currentCapCompInstance);
+            return findAvailableCapability(validReq, currentCapCompInstance);
         }
         return findAvailableCapability(validReq, currentCapCompInstance, uploadReqInfo);
     }
@@ -3356,8 +2848,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
         cap = capByName.get();
 
-        if (cap.getMaxOccurrences() != null
-                && !cap.getMaxOccurrences().equals(CapabilityDataDefinition.MAX_OCCURRENCES)) {
+        if (isBoundedByOccurrences(cap)) {
             String leftOccurrences = cap.getLeftOccurrences();
             int left = Integer.parseInt(leftOccurrences);
             if (left > 0) {
@@ -3370,36 +2861,31 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return cap;
     }
 
-    private CapabilityDefinition findAviableCapability(RequirementDefinition validReq,
-                                                       ComponentInstance currentCapCompInstance) {
-        CapabilityDefinition aviableCapForRel = null;
-        Map<String, List<CapabilityDefinition>> capMap = currentCapCompInstance.getCapabilities();
+    private CapabilityDefinition findAvailableCapability(RequirementDefinition validReq, ComponentInstance instance) {
+        Map<String, List<CapabilityDefinition>> capMap = instance.getCapabilities();
         if (capMap.containsKey(validReq.getCapability())) {
             List<CapabilityDefinition> capList = capMap.get(validReq.getCapability());
 
             for (CapabilityDefinition cap : capList) {
-                if (cap.getMaxOccurrences() != null
-                        && !cap.getMaxOccurrences().equals(CapabilityDataDefinition.MAX_OCCURRENCES)) {
-                    String leftOccurrences = cap.getLeftOccurrences();
-                    if (leftOccurrences == null) {
-                        leftOccurrences = cap.getMaxOccurrences();
-                    }
+                if (isBoundedByOccurrences(cap)) {
+                    String leftOccurrences = cap.getLeftOccurrences() != null ?
+                            cap.getLeftOccurrences() : cap.getMaxOccurrences();
                     int left = Integer.parseInt(leftOccurrences);
                     if (left > 0) {
                         --left;
                         cap.setLeftOccurrences(String.valueOf(left));
-                        aviableCapForRel = cap;
-                        break;
-                    } else {
-                        continue;
+                        return cap;
                     }
                 } else {
-                    aviableCapForRel = cap;
-                    break;
+                    return cap;
                 }
             }
         }
-        return aviableCapForRel;
+        return null;
+    }
+
+    private boolean isBoundedByOccurrences(CapabilityDefinition cap) {
+        return cap.getMaxOccurrences() != null && !cap.getMaxOccurrences().equals(CapabilityDataDefinition.MAX_OCCURRENCES);
     }
 
     private Either<RequirementDefinition, ResponseFormat> findAviableRequiremen(String regName, String yamlName,
@@ -3471,140 +2957,26 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(validRegDef);
     }
 
-    @SuppressWarnings("unchecked")
-    public Either<ParsedToscaYamlInfo, ResponseFormat> parseResourceInfoFromYaml(String yamlFileName, Resource resource,
-                                                                                 String resourceYml, Map<String, String> createdNodesToscaResourceNames,
-                                                                                 Map<String, NodeTypeInfo> nodeTypesInfo, String nodeName) {
-
-        Map<String, Object> mappedToscaTemplate;
-        if (nodeTypesInfo != null && nodeName != null && nodeTypesInfo.containsKey(nodeName)) {
-            mappedToscaTemplate = nodeTypesInfo.get(nodeName).getMappedToscaTemplate();
-        } else {
-            try {
-                // DE154502 Fail if duplicate key found in file
-                mappedToscaTemplate = ImportUtils.loadYamlAsStrictMap(resourceYml);
-
-            } catch (ParserException e) {
-                log.error("Failed to load yaml file {}", yamlFileName, e);
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.TOSCA_PARSE_ERROR,
-                        yamlFileName, e.getMessage());
-                return Either.right(responseFormat);
-            }
-        }
-        Either<Object, ResultStatusEnum> toscaElementEither = ImportUtils.findToscaElement(mappedToscaTemplate,
-                ToscaTagNamesEnum.TOPOLOGY_TEMPLATE, ToscaElementTypeEnum.ALL);
-        if (toscaElementEither.isRight()) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE);
-            return Either.right(responseFormat);
-        }
-
-        Either<Map<String, InputDefinition>, ResponseFormat> createInputsEither = createInputsFromYaml(yamlFileName,
-                mappedToscaTemplate, resource);
-        if (createInputsEither.isRight()) {
-            ResponseFormat responseFormat = createInputsEither.right().value();
-            return Either.right(responseFormat);
-        }
-
-        Either<Map<String, UploadComponentInstanceInfo>, ResponseFormat> uploadResInstancesEither = createResourcesInstanceInfoFromYaml(
-                yamlFileName, mappedToscaTemplate, resource, createdNodesToscaResourceNames);
-        if (uploadResInstancesEither.isRight()) {
-            ResponseFormat responseFormat = uploadResInstancesEither.right().value();
-            return Either.right(responseFormat);
-        }
-
-        Either<Map<String, GroupDefinition>, ResponseFormat> createGroupsFromYaml = createGroupsFromYaml(yamlFileName,
-                mappedToscaTemplate, resource);
-        if (createGroupsFromYaml.isRight()) {
-            ResponseFormat responseFormat = createGroupsFromYaml.right().value();
-            return Either.right(responseFormat);
-        }
-
-        ParsedToscaYamlInfo parsedToscaYamlInfo = new ParsedToscaYamlInfo();
-        parsedToscaYamlInfo.setInputs(createInputsEither.left().value());
-        parsedToscaYamlInfo.setInstances(uploadResInstancesEither.left().value());
-        parsedToscaYamlInfo.setGroups(createGroupsFromYaml.left().value());
-
-        return Either.left(parsedToscaYamlInfo);
-    }
-
-    private Either<Resource, ResponseFormat> createResourceInstances(User user, String yamlName, Resource resource,
-                                                                     Map<String, UploadComponentInstanceInfo> uploadResInstancesMap, boolean inTransaction, boolean needLock,
-                                                                     Map<String, Resource> nodeNamespaceMap) {
+    private Resource createResourceInstances(String yamlName, Resource resource,
+                                             Map<String, UploadComponentInstanceInfo> uploadResInstancesMap,
+                                             Map<String, Resource> nodeNamespaceMap) {
 
         Either<Resource, ResponseFormat> eitherResource = null;
         log.debug("createResourceInstances is {} - going to create resource instanse from CSAR", yamlName);
-        if (uploadResInstancesMap == null || uploadResInstancesMap.isEmpty()) {
+        if (isEmpty(uploadResInstancesMap)) {
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE);
-
-            return Either.right(responseFormat);
-
+            throw new ComponentException(responseFormat);
         }
-        Map<String, Resource> existingnodeTypeMap = new HashMap<>();
-        if (nodeNamespaceMap != null && !nodeNamespaceMap.isEmpty()) {
-            nodeNamespaceMap.entrySet().stream()
-                    .forEach(x -> existingnodeTypeMap.put(x.getValue().getToscaResourceName(), x.getValue()));
+        Map<String, Resource> existingNodeTypeMap = new HashMap<>();
+        if (MapUtils.isNotEmpty(nodeNamespaceMap)) {
+            nodeNamespaceMap.forEach((k, v) -> existingNodeTypeMap.put(v.getToscaResourceName(), v));
         }
-
-        Iterator<Entry<String, UploadComponentInstanceInfo>> nodesInfoValue = uploadResInstancesMap.entrySet()
-                .iterator();
         Map<ComponentInstance, Resource> resourcesInstancesMap = new HashMap<>();
-        while (nodesInfoValue.hasNext()) {
-            log.debug("*************Going to create  resource instances {}", yamlName);
-            Entry<String, UploadComponentInstanceInfo> uploadComponentInstanceInfoEntry = nodesInfoValue.next();
-            UploadComponentInstanceInfo uploadComponentInstanceInfo = uploadComponentInstanceInfoEntry.getValue();
-
-            // updating type if the type is node type name - we need to take the
-            // updated name
-            log.debug("*************Going to create  resource instances {}", uploadComponentInstanceInfo.getName());
-            if (nodeNamespaceMap.containsKey(uploadComponentInstanceInfo.getType())) {
-                uploadComponentInstanceInfo
-                        .setType(nodeNamespaceMap.get(uploadComponentInstanceInfo.getType()).getToscaResourceName());
-            }
-
-            eitherResource = validateResourceInstanceBeforeCreate(yamlName, uploadComponentInstanceInfo,
-                    existingnodeTypeMap);
-            if (eitherResource.isRight()) {
-                return eitherResource;
-            }
-            Resource refResource = eitherResource.left().value();
-
-            ComponentInstance componentInstance = new ComponentInstance();
-
-            componentInstance.setComponentUid(refResource.getUniqueId());
-
-            ComponentTypeEnum containerComponentType = resource.getComponentType();
-            NodeTypeEnum containerNodeType = containerComponentType.getNodeType();
-
-            if (containerNodeType.equals(NodeTypeEnum.Resource)
-                    && MapUtils.isNotEmpty(uploadComponentInstanceInfo.getCapabilities())
-                    && MapUtils.isNotEmpty(refResource.getCapabilities())) {
-                setCapabilityNamesTypes(refResource.getCapabilities(), uploadComponentInstanceInfo.getCapabilities());
-                Either<Map<String, List<CapabilityDefinition>>, ResponseFormat> getValidComponentInstanceCapabilitiesRes = getValidComponentInstanceCapabilities(
-                        refResource.getUniqueId(), refResource.getCapabilities(),
-                        uploadComponentInstanceInfo.getCapabilities());
-                if (getValidComponentInstanceCapabilitiesRes.isRight()) {
-                    return Either.right(getValidComponentInstanceCapabilitiesRes.right().value());
-                } else {
-                    componentInstance.setCapabilities(getValidComponentInstanceCapabilitiesRes.left().value());
-                }
-            }
-            if (!existingnodeTypeMap.containsKey(uploadComponentInstanceInfo.getType())) {
-                log.debug(
-                        "createResourceInstances - not found lates version for resource instance with name {} and type ",
-                        uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_NODE_TEMPLATE,
-                        yamlName, uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType());
-                return Either.right(responseFormat);
-            }
-            Resource origResource = existingnodeTypeMap.get(uploadComponentInstanceInfo.getType());
-            componentInstance.setName(uploadComponentInstanceInfo.getName());
-            componentInstance.setIcon(origResource.getIcon());
-
-            resourcesInstancesMap.put(componentInstance, origResource);
-
-        }
-        if (MapUtils.isNotEmpty(resourcesInstancesMap)) {
+        uploadResInstancesMap
+                .values()
+                .forEach(i->createAndAddResourceInstance(i, yamlName, resource, nodeNamespaceMap, existingNodeTypeMap, resourcesInstancesMap));
 
+        if (isNotEmpty(resourcesInstancesMap)) {
             StorageOperationStatus status = toscaOperationFacade.associateComponentInstancesToComponent(resource,
                     resourcesInstancesMap, false);
             if (status != null && status != StorageOperationStatus.OK) {
@@ -3612,41 +2984,77 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 ResponseFormat responseFormat = componentsUtils
                         .getResponseFormat(componentsUtils.convertFromStorageResponse(status));
                 eitherResource = Either.right(responseFormat);
-                return eitherResource;
+                throw new ComponentException(eitherResource.right().value());
             }
-
         }
-
         log.debug("*************Going to get resource {}", resource.getUniqueId());
-        ComponentParametersView parametersView = new ComponentParametersView();
-        parametersView.disableAll();
-        parametersView.setIgnoreComponentInstances(false);
-        parametersView.setIgnoreUsers(false);
-        parametersView.setIgnoreInputs(false); // inputs are read when creating
-        // property values on instances
-        Either<Resource, StorageOperationStatus> eitherGerResource = toscaOperationFacade
-                .getToscaElement(resource.getUniqueId(), parametersView);
+        Either<Resource, StorageOperationStatus> eitherGetResource = toscaOperationFacade
+                .getToscaElement(resource.getUniqueId(), getComponentWithInstancesFilter());
         log.debug("*************finished to get resource {}", resource.getUniqueId());
-        if (eitherGerResource.isRight()) {
+        if (eitherGetResource.isRight()) {
             ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                    componentsUtils.convertFromStorageResponse(eitherGerResource.right().value()), resource);
-
-            return Either.right(responseFormat);
-
+                    componentsUtils.convertFromStorageResponse(eitherGetResource.right().value()), resource);
+            throw new ComponentException(responseFormat);
         }
-
-        if (eitherGerResource.left().value().getComponentInstances() == null
-                || eitherGerResource.left().value().getComponentInstances().isEmpty()) {
-
-            log.debug("Error when create resource inctanse from csar. ComponentInstances list empty");
+        if (CollectionUtils.isEmpty(eitherGetResource.left().value().getComponentInstances())) {
+            log.debug("Error when create resource instance from csar. ComponentInstances list empty");
             BeEcompErrorManager.getInstance().logBeDaoSystemError(
-                    "Error when create resource inctanse from csar. ComponentInstances list empty");
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE);
-            return Either.right(responseFormat);
+                    "Error when create resource instance from csar. ComponentInstances list empty");
+            throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE));
+        }
+        return eitherGetResource.left().value();
+    }
 
+    private void createAndAddResourceInstance(UploadComponentInstanceInfo uploadComponentInstanceInfo, String yamlName,
+                                              Resource resource, Map<String, Resource> nodeNamespaceMap, Map<String, Resource> existingnodeTypeMap, Map<ComponentInstance, Resource> resourcesInstancesMap) {
+        Either<Resource, ResponseFormat> eitherResource;
+        log.debug("*************Going to create  resource instances {}", yamlName);
+        // updating type if the type is node type name - we need to take the
+        // updated name
+        log.debug("*************Going to create  resource instances {}", uploadComponentInstanceInfo.getName());
+        if (nodeNamespaceMap.containsKey(uploadComponentInstanceInfo.getType())) {
+            uploadComponentInstanceInfo
+                    .setType(nodeNamespaceMap.get(uploadComponentInstanceInfo.getType()).getToscaResourceName());
+        }
+        Resource refResource = validateResourceInstanceBeforeCreate(yamlName, uploadComponentInstanceInfo,
+                existingnodeTypeMap);
+
+        ComponentInstance componentInstance = new ComponentInstance();
+        componentInstance.setComponentUid(refResource.getUniqueId());
+        ComponentTypeEnum containerComponentType = resource.getComponentType();
+        NodeTypeEnum containerNodeType = containerComponentType.getNodeType();
+        if (containerNodeType.equals(NodeTypeEnum.Resource)
+                && isNotEmpty(uploadComponentInstanceInfo.getCapabilities())
+                && isNotEmpty(refResource.getCapabilities())) {
+            setCapabilityNamesTypes(refResource.getCapabilities(), uploadComponentInstanceInfo.getCapabilities());
+            Map<String, List<CapabilityDefinition>> validComponentInstanceCapabilities = getValidComponentInstanceCapabilities(
+                    refResource.getUniqueId(), refResource.getCapabilities(),
+                    uploadComponentInstanceInfo.getCapabilities());
+            componentInstance.setCapabilities(validComponentInstanceCapabilities);
+        }
+        if (!existingnodeTypeMap.containsKey(uploadComponentInstanceInfo.getType())) {
+            log.debug(
+                    "createResourceInstances - not found lates version for resource instance with name {} and type ",
+                    uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType());
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_NODE_TEMPLATE,
+                    yamlName, uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType());
+            throw new ComponentException(responseFormat);
         }
+        Resource origResource = existingnodeTypeMap.get(uploadComponentInstanceInfo.getType());
+        componentInstance.setName(uploadComponentInstanceInfo.getName());
+        componentInstance.setIcon(origResource.getIcon());
+        resourcesInstancesMap.put(componentInstance, origResource);
+    }
 
-        return Either.left(eitherGerResource.left().value());
+    private ComponentParametersView getComponentWithInstancesFilter() {
+        ComponentParametersView parametersView = new ComponentParametersView();
+        parametersView.disableAll();
+        parametersView.setIgnoreComponentInstances(false);
+        parametersView.setIgnoreInputs(false);
+        // inputs are read when creating
+        // property values on instances
+        parametersView.setIgnoreUsers(false);
+        return parametersView;
     }
 
     private void setCapabilityNamesTypes(Map<String, List<CapabilityDefinition>> originCapabilities,
@@ -3664,18 +3072,17 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                         c.setType(cap.getType());
                     });
                 }
-                ;
             });
         }
 
     }
 
-    private Either<Resource, ResponseFormat> validateResourceInstanceBeforeCreate(String yamlName,
-                                                                                  UploadComponentInstanceInfo uploadComponentInstanceInfo, Map<String, Resource> nodeNamespaceMap) {
-        log.debug(
-                "validateResourceInstanceBeforeCreate - going to validate resource instance with name {} and type before create",
+    private Resource validateResourceInstanceBeforeCreate(String yamlName, UploadComponentInstanceInfo uploadComponentInstanceInfo,
+                                                          Map<String, Resource> nodeNamespaceMap) {
+
+        log.debug("validateResourceInstanceBeforeCreate - going to validate resource instance with name {} and type before create",
                 uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType());
-        Resource refResource = null;
+        Resource refResource;
         if (nodeNamespaceMap.containsKey(uploadComponentInstanceInfo.getType())) {
             refResource = nodeNamespaceMap.get(uploadComponentInstanceInfo.getType());
         } else {
@@ -3687,7 +3094,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                         uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType());
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(
                         componentsUtils.convertFromStorageResponse(findResourceEither.right().value()));
-                return Either.right(responseFormat);
+                throw new ComponentException(responseFormat);
             }
             refResource = findResourceEither.left().value();
             nodeNamespaceMap.put(refResource.getToscaResourceName(), refResource);
@@ -3699,542 +3106,18 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     refResource.getName(), componentState);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.ILLEGAL_COMPONENT_STATE,
                     refResource.getComponentType().getValue(), refResource.getName(), componentState);
-            return Either.right(responseFormat);
+            throw new ComponentException(responseFormat);
         }
 
         if (!ModelConverter.isAtomicComponent(refResource) && refResource.getResourceType() != ResourceTypeEnum.CVFC) {
             log.debug("validateResourceInstanceBeforeCreate -  ref resource type is  ", refResource.getResourceType());
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_NODE_TEMPLATE,
                     yamlName, uploadComponentInstanceInfo.getName(), uploadComponentInstanceInfo.getType());
-            return Either.right(responseFormat);
-        }
-        return Either.left(refResource);
-    }
-
-    private Either<Map<String, UploadComponentInstanceInfo>, ResponseFormat> createResourcesInstanceInfoFromYaml(
-            String yamlFileName, Map<String, Object> toscaJson, Resource resource,
-            Map<String, String> createdNodesToscaResourceNames) {
-        Map<String, UploadComponentInstanceInfo> moduleComponentInstances = new HashMap<String, UploadComponentInstanceInfo>();
-        Map<String, Object> substitutionMappings = null;
-        Either<Map<String, UploadComponentInstanceInfo>, ResponseFormat> result = Either.left(moduleComponentInstances);
-        Either<Map<String, Object>, ResultStatusEnum> eitherNodesTemlates = ImportUtils
-                .findFirstToscaMapElement(toscaJson, ToscaTagNamesEnum.NODE_TEMPLATES);
-        Either<Map<String, Object>, ResultStatusEnum> eitherSubstitutionMappings = ImportUtils
-                .findFirstToscaMapElement(toscaJson, ToscaTagNamesEnum.SUBSTITUTION_MAPPINGS);
-        if (eitherSubstitutionMappings.isLeft()) {
-            substitutionMappings = eitherSubstitutionMappings.left().value();
-        }
-        if (eitherNodesTemlates.isLeft()) {
-            Map<String, Object> jsonNodeTemplates = eitherNodesTemlates.left().value();
-
-            Iterator<Entry<String, Object>> nodesNameValue = jsonNodeTemplates.entrySet().iterator();
-            while (nodesNameValue.hasNext()) {
-                Entry<String, Object> nodeNameValue = nodesNameValue.next();
-                Either<UploadComponentInstanceInfo, ResponseFormat> eitherNode = createModuleComponentInstanceInfo(
-                        nodeNameValue, substitutionMappings, createdNodesToscaResourceNames);
-                if (eitherNode.isRight()) {
-                    log.info("error when creating node template:{}, for resource:{}", nodeNameValue.getKey(),
-                            resource.getName());
-                    return Either.right(eitherNode.right().value());
-                } else {
-                    UploadComponentInstanceInfo uploadComponentInstanceInfo = eitherNode.left().value();
-                    moduleComponentInstances.put(nodeNameValue.getKey(), uploadComponentInstanceInfo);
-                }
-
-            }
-
-        }
-        if (moduleComponentInstances.isEmpty()) {
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE,
-                    yamlFileName);
-            return Either.right(responseFormat);
-        }
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Either<UploadComponentInstanceInfo, ResponseFormat> createModuleComponentInstanceInfo(
-            Entry<String, Object> nodeTemplateJsonEntry, Map<String, Object> substitutionMappings,
-            Map<String, String> createdNodesToscaResourceNames) {
-
-        UploadComponentInstanceInfo nodeTemplateInfo = new UploadComponentInstanceInfo();
-        Either<UploadComponentInstanceInfo, ResponseFormat> result = Either.left(nodeTemplateInfo);
-        nodeTemplateInfo.setName(nodeTemplateJsonEntry.getKey());
-        try {
-            if (nodeTemplateJsonEntry.getValue() instanceof String) {
-                String nodeTemplateJsonString = (String) nodeTemplateJsonEntry.getValue();
-                nodeTemplateInfo.setType(nodeTemplateJsonString);
-            } else if (nodeTemplateJsonEntry.getValue() instanceof Map) {
-                Map<String, Object> nodeTemplateJsonMap = (Map<String, Object>) nodeTemplateJsonEntry.getValue();
-                // Type
-                if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.TYPE.getElementName())) {
-                    String toscaResourceType = (String) nodeTemplateJsonMap
-                            .get(ToscaTagNamesEnum.TYPE.getElementName());
-                    if (createdNodesToscaResourceNames.containsKey(toscaResourceType)) {
-                        toscaResourceType = createdNodesToscaResourceNames.get(toscaResourceType);
-                    }
-                    nodeTemplateInfo.setType(toscaResourceType);
-                }
-
-                if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.REQUIREMENTS.getElementName())) {
-                    Either<Map<String, List<UploadReqInfo>>, ResponseFormat> regResponse = createReqModuleFromYaml(
-                            nodeTemplateInfo, nodeTemplateJsonMap);
-                    if (regResponse.isRight())
-                        return Either.right(regResponse.right().value());
-                    if (regResponse.left().value().size() > 0) {
-                        nodeTemplateInfo.setRequirements(regResponse.left().value());
-                    }
-                }
-
-                if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.CAPABILITIES.getElementName())) {
-                    Either<Map<String, List<UploadCapInfo>>, ResponseFormat> eitherCapRes = createCapModuleFromYaml(
-                            nodeTemplateInfo, nodeTemplateJsonMap);
-                    if (eitherCapRes.isRight())
-                        return Either.right(eitherCapRes.right().value());
-                    if (eitherCapRes.left().value().size() > 0) {
-                        nodeTemplateInfo.setCapabilities(eitherCapRes.left().value());
-                    }
-                }
-                if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.PROPERTIES.getElementName())) {
-                    Either<Map<String, List<UploadPropInfo>>, ResponseFormat> regResponse = createPropModuleFromYaml(
-                            nodeTemplateJsonMap);
-                    if (regResponse.isRight())
-                        return Either.right(regResponse.right().value());
-                    if (regResponse.left().value().size() > 0) {
-                        nodeTemplateInfo.setProperties(regResponse.left().value());
-                    }
-                }
-                if (substitutionMappings != null) {
-                    if (substitutionMappings.containsKey(ToscaTagNamesEnum.CAPABILITIES.getElementName())) {
-                        Either<Map<String, String>, ResponseFormat> getCapNamesToUpdateRes = getNamesToUpdate(
-                                nodeTemplateInfo, (Map<String, List<String>>) substitutionMappings
-                                        .get(ToscaTagNamesEnum.CAPABILITIES.getElementName()));
-                        if (getCapNamesToUpdateRes.isRight())
-                            return Either.right(getCapNamesToUpdateRes.right().value());
-                        if (getCapNamesToUpdateRes.left().value().size() > 0) {
-                            nodeTemplateInfo.setCapabilitiesNamesToUpdate(getCapNamesToUpdateRes.left().value());
-                        }
-                    }
-                    if (substitutionMappings.containsKey(ToscaTagNamesEnum.REQUIREMENTS.getElementName())) {
-                        Either<Map<String, String>, ResponseFormat> getReqNamesToUpdateRes = getNamesToUpdate(
-                                nodeTemplateInfo, (Map<String, List<String>>) substitutionMappings
-                                        .get(ToscaTagNamesEnum.REQUIREMENTS.getElementName()));
-                        if (getReqNamesToUpdateRes.isRight())
-                            return Either.right(getReqNamesToUpdateRes.right().value());
-                        if (getReqNamesToUpdateRes.left().value().size() > 0) {
-                            nodeTemplateInfo.setRequirementsNamesToUpdate(getReqNamesToUpdateRes.left().value());
-                        }
-                    }
-                }
-            } else {
-
-                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE));
-
-            }
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeSystemError("Import Resource - create capability");
-            log.debug("error when creating capability, message:{}", e.getMessage(), e);
-            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML));
-        }
-
-        return result;
-    }
-
-    private Either<Map<String, String>, ResponseFormat> getNamesToUpdate(UploadComponentInstanceInfo nodeTemplateInfo,
-                                                                         Map<String, List<String>> elements) {
-        Either<Map<String, String>, ResponseFormat> response;
-        try {
-            Map<String, String> namesToUpdate = elements.entrySet().stream()
-                    .filter(e -> e.getValue().get(0).equalsIgnoreCase(nodeTemplateInfo.getName()))
-                    .collect(Collectors.toMap(e -> e.getValue().get(1), e -> e.getKey()));
-            response = Either.left(namesToUpdate);
-        } catch (Exception e) {
-            log.debug("The exception occurred upon adding names to update for instance {}: ", nodeTemplateInfo.getName(), e);
-            response = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+            throw new ComponentException(responseFormat);
         }
-        return response;
+        return refResource;
     }
 
-    @SuppressWarnings("unchecked")
-    private Either<Map<String, List<UploadPropInfo>>, ResponseFormat> createPropModuleFromYaml(
-            Map<String, Object> nodeTemplateJsonMap) {
-        Map<String, List<UploadPropInfo>> moduleProp = new HashMap<String, List<UploadPropInfo>>();
-        Either<Map<String, List<UploadPropInfo>>, ResponseFormat> response = Either.left(moduleProp);
-        Either<Map<String, Object>, ResultStatusEnum> toscaProperties = ImportUtils
-                .findFirstToscaMapElement(nodeTemplateJsonMap, ToscaTagNamesEnum.PROPERTIES);
-        if (toscaProperties.isLeft()) {
-            Map<String, Object> jsonProperties = toscaProperties.left().value();
-            for (Entry<String, Object> jsonPropObj : jsonProperties.entrySet()) {
-                // Property
-                String propName = jsonPropObj.getKey();
-                Object propValue = jsonPropObj.getValue();
-
-                if (valueContainsPattern(STR_REPLACE_PATTERN, propValue)) {
-                    log.trace("Ignore property value {}.", propName);
-                    continue;
-                }
-
-                if (valueContainsPattern(TOKEN_PATTERN, propValue)) {
-                    log.trace("Ignore property value {}.", propName);
-                    continue;
-                }
-                if (valueContainsPattern(GET_PROPERTY_PATTERN, propValue)) {
-                    log.trace("Ignore property value {}.", propName);
-                    continue;
-                }
-
-                if (valueContainsPattern(CONCAT_PATTERN, propValue)) {
-                    log.trace("Ignore property value {}.", propName);
-                    continue;
-                }
-
-                if (valueContainsPattern(GET_ATTRIBUTE_PATTERN, propValue)) {
-                    log.trace("Ignore property value {}.", propName);
-                    continue;
-                }
-
-                UploadPropInfo propertyDef = new UploadPropInfo();
-                propertyDef.setValue(propValue);
-                propertyDef.setName(propName);
-                if (propValue instanceof Map) {
-                    if (((Map<String, Object>) propValue).containsKey(ToscaTagNamesEnum.TYPE.getElementName())) {
-                        propertyDef.setType(((Map<String, Object>) propValue)
-                                .get(ToscaTagNamesEnum.TYPE.getElementName()).toString());
-                    }
-
-                    if (((Map<String, Object>) propValue).containsKey(ToscaTagNamesEnum.GET_INPUT.getElementName())
-                            || ImportUtils.getPropertyJsonStringValue(propValue, ToscaPropertyType.MAP.getType())
-                            .contains(ToscaTagNamesEnum.GET_INPUT.getElementName())) {
-                        createGetInputModuleFromMap(propName, (Map<String, Object>) propValue, propertyDef);
-                    }
-
-                    if (((Map<String, Object>) propValue).containsKey(ToscaTagNamesEnum.DESCRIPTION.getElementName())) {
-                        propertyDef.setDescription(((Map<String, Object>) propValue)
-                                .get(ToscaTagNamesEnum.DESCRIPTION.getElementName()).toString());
-                    }
-                    if (((Map<String, Object>) propValue)
-                            .containsKey(ToscaTagNamesEnum.DEFAULT_VALUE.getElementName())) {
-                        propertyDef.setValue(((Map<String, Object>) propValue)
-                                .get(ToscaTagNamesEnum.DEFAULT_VALUE.getElementName()));
-                    }
-                    if (((Map<String, Object>) propValue).containsKey(ToscaTagNamesEnum.IS_PASSWORD.getElementName())) {
-                        propertyDef.setPassword(Boolean.getBoolean(((Map<String, Object>) propValue)
-                                .get(ToscaTagNamesEnum.IS_PASSWORD.getElementName()).toString()));
-                    } else {
-                        propertyDef.setValue(propValue);
-                    }
-                } else if (propValue instanceof List) {
-                    List<Object> propValueList = (List<Object>) propValue;
-
-                    createInputPropList(propertyDef, propValueList);
-                    propertyDef.setValue(propValue);
-                }
-
-                if (moduleProp.containsKey(propName)) {
-                    moduleProp.get(propName).add(propertyDef);
-                } else {
-                    List<UploadPropInfo> list = new ArrayList<UploadPropInfo>();
-                    list.add(propertyDef);
-                    moduleProp.put(propName, list);
-                }
-            }
-        }
-        return response;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void createInputPropList(UploadPropInfo propertyDef, List<Object> propValueList) {
-        for (Object objValue : propValueList) {
-
-            if (objValue instanceof Map) {
-                Map<String, Object> objMap = (Map<String, Object>) objValue;
-                if (objMap.containsKey(ToscaTagNamesEnum.GET_INPUT.getElementName()))
-                    createGetInputModuleFromMap(propertyDef.getName(), objMap, propertyDef);
-                else {
-                    Set<String> keys = objMap.keySet();
-                    for (String key : keys) {
-                        Object value = objMap.get(key);
-                        if (value instanceof Map) {
-                            createGetInputModuleFromMap(key, (Map<String, Object>) value, propertyDef);
-
-                        } else if (value instanceof List) {
-                            List<Object> propSubValueList = (List<Object>) value;
-
-                            createInputPropList(propertyDef, propSubValueList);
-                        }
-
-                    }
-                }
-
-            } else if (objValue instanceof List) {
-                List<Object> propSubValueList = (List<Object>) objValue;
-
-                createInputPropList(propertyDef, propSubValueList);
-
-            }
-
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void createGetInputModuleFromMap(String propName, Map<String, Object> propValue,
-                                             UploadPropInfo propertyDef) {
-
-        if (propValue.containsKey(ToscaTagNamesEnum.GET_INPUT.getElementName())) {
-            Object getInput = propValue.get(ToscaTagNamesEnum.GET_INPUT.getElementName());
-            GetInputValueDataDefinition getInputInfo = new GetInputValueDataDefinition();
-            List<GetInputValueDataDefinition> getInputs = propertyDef.getGet_input();
-            if (getInputs == null) {
-                getInputs = new ArrayList<GetInputValueDataDefinition>();
-            }
-            if (getInput instanceof String) {
-
-                getInputInfo.setInputName((String) getInput);
-                getInputInfo.setPropName(propName);
-
-            } else if (getInput instanceof List) {
-                List<Object> getInputList = (List<Object>) getInput;
-                getInputInfo.setPropName(propName);
-                getInputInfo.setInputName((String) getInputList.get(0));
-                if (getInputList.size() > 1) {
-                    Object indexObj = getInputList.get(1);
-                    if (indexObj instanceof Integer) {
-                        getInputInfo.setIndexValue((Integer) indexObj);
-                    } else if (indexObj instanceof Float) {
-                        int index = ((Float) indexObj).intValue();
-                        getInputInfo.setIndexValue(index);
-                    } else if (indexObj instanceof Map && ((Map<String, Object>) indexObj)
-                            .containsKey(ToscaTagNamesEnum.GET_INPUT.getElementName())) {
-                        Object index = ((Map<String, Object>) indexObj)
-                                .get(ToscaTagNamesEnum.GET_INPUT.getElementName());
-                        GetInputValueDataDefinition getInputInfoIndex = new GetInputValueDataDefinition();
-                        getInputInfoIndex.setInputName((String) index);
-                        getInputInfoIndex.setPropName(propName);
-                        getInputInfo.setGetInputIndex(getInputInfoIndex);
-                    }
-                    getInputInfo.setList(true);
-                }
-
-            }
-            getInputs.add(getInputInfo);
-            propertyDef.setGet_input(getInputs);
-            propertyDef.setValue(propValue);
-        } else {
-            Set<String> keys = propValue.keySet();
-            for (String key : keys) {
-                Object value = propValue.get(key);
-                if (value instanceof Map) {
-                    createGetInputModuleFromMap(key, (Map<String, Object>) value, propertyDef);
-
-                } else if (value instanceof List) {
-                    List<Object> valueList = (List<Object>) value;
-                    for (Object o : valueList) {
-                        if (o instanceof Map) {
-                            createGetInputModuleFromMap(key, (Map<String, Object>) o, propertyDef);
-
-                        }
-                    }
-
-                }
-
-            }
-
-        }
-    }
-
-
-    private boolean valueContainsPattern(Pattern pattern, Object propValue) {
-
-        log.debug("valueContainsToken value is {}", propValue);
-        boolean result = false;
-        if (propValue != null) {
-            log.trace("valueContainspattern value is {}", propValue.getClass());
-            Matcher matcher = pattern.matcher(propValue.toString());
-            result = matcher.find();
-        }
-
-        return result;
-
-    }
-
-    @SuppressWarnings("unchecked")
-    private Either<Map<String, List<UploadReqInfo>>, ResponseFormat> createReqModuleFromYaml(
-            UploadComponentInstanceInfo nodeTemplateInfo, Map<String, Object> nodeTemplateJsonMap) {
-        Map<String, List<UploadReqInfo>> moduleRequirements = new HashMap<String, List<UploadReqInfo>>();
-        Either<Map<String, List<UploadReqInfo>>, ResponseFormat> response = Either.left(moduleRequirements);
-        Either<List<Object>, ResultStatusEnum> requirementsListRes = ImportUtils
-                .findFirstToscaListElement(nodeTemplateJsonMap, ToscaTagNamesEnum.REQUIREMENTS);
-
-        if (requirementsListRes.isLeft()) {
-            for (Object jsonReqObj : requirementsListRes.left().value()) {
-                String reqName = ((Map<String, Object>) jsonReqObj).keySet().iterator().next();
-                Object reqJson = ((Map<String, Object>) jsonReqObj).get(reqName);
-                Either<UploadReqInfo, ResponseFormat> eitherCap = addModuleNodeTemplateReq(nodeTemplateInfo,
-                        moduleRequirements, reqJson, reqName);
-                if (eitherCap.isRight()) {
-                    return Either.right(eitherCap.right().value());
-                }
-            }
-        } else {
-            Either<Map<String, Object>, ResultStatusEnum> requirementsMapRes = ImportUtils
-                    .findFirstToscaMapElement(nodeTemplateJsonMap, ToscaTagNamesEnum.REQUIREMENTS);
-            if (requirementsMapRes.isLeft()) {
-                for (Map.Entry<String, Object> entry : requirementsMapRes.left().value().entrySet()) {
-                    String reqName = entry.getKey();
-                    Object reqJson = entry.getValue();
-                    Either<UploadReqInfo, ResponseFormat> eitherCap = addModuleNodeTemplateReq(nodeTemplateInfo,
-                            moduleRequirements, reqJson, reqName);
-                    if (eitherCap.isRight()) {
-                        return Either.right(eitherCap.right().value());
-                    }
-                }
-            }
-        }
-        return response;
-    }
-
-    private Either<UploadReqInfo, ResponseFormat> addModuleNodeTemplateReq(UploadComponentInstanceInfo nodeTemplateInfo,
-                                                                           Map<String, List<UploadReqInfo>> moduleRequirements, Object requirementJson, String requirementName) {
-
-        Either<UploadReqInfo, ResponseFormat> eitherRequirement = createModuleNodeTemplateReg(requirementJson);
-        if (eitherRequirement.isRight()) {
-            log.info("error when creating Requirement:{}, for node:{}", requirementName, nodeTemplateInfo);
-            return Either.right(eitherRequirement.right().value());
-        } else {
-            UploadReqInfo requirementDef = eitherRequirement.left().value();
-            requirementDef.setName(requirementName);
-            if (moduleRequirements.containsKey(requirementName)) {
-                moduleRequirements.get(requirementName).add(requirementDef);
-            } else {
-                List<UploadReqInfo> list = new ArrayList<UploadReqInfo>();
-                list.add(requirementDef);
-                moduleRequirements.put(requirementName, list);
-            }
-        }
-        return Either.left(eitherRequirement.left().value());
-    }
-
-    @SuppressWarnings("unchecked")
-    private Either<Map<String, List<UploadCapInfo>>, ResponseFormat> createCapModuleFromYaml(
-            UploadComponentInstanceInfo nodeTemplateInfo, Map<String, Object> nodeTemplateJsonMap) {
-        Map<String, List<UploadCapInfo>> moduleCap = new HashMap<>();
-        Either<Map<String, List<UploadCapInfo>>, ResponseFormat> response = Either.left(moduleCap);
-        Either<List<Object>, ResultStatusEnum> capabilitiesListRes = ImportUtils
-                .findFirstToscaListElement(nodeTemplateJsonMap, ToscaTagNamesEnum.CAPABILITIES);
-        if (capabilitiesListRes.isLeft()) {
-            for (Object jsonCapObj : capabilitiesListRes.left().value()) {
-                String key = ((Map<String, Object>) jsonCapObj).keySet().iterator().next();
-                Object capJson = ((Map<String, Object>) jsonCapObj).get(key);
-                Either<UploadCapInfo, ResponseFormat> eitherCap = addModuleNodeTemplateCap(nodeTemplateInfo, moduleCap,
-                        capJson, key);
-                if (eitherCap.isRight()) {
-                    return Either.right(eitherCap.right().value());
-                }
-            }
-        } else {
-            Either<Map<String, Object>, ResultStatusEnum> capabilitiesMapRes = ImportUtils
-                    .findFirstToscaMapElement(nodeTemplateJsonMap, ToscaTagNamesEnum.CAPABILITIES);
-            if (capabilitiesMapRes.isLeft()) {
-                for (Map.Entry<String, Object> entry : capabilitiesMapRes.left().value().entrySet()) {
-                    String capName = entry.getKey();
-                    Object capJson = entry.getValue();
-                    Either<UploadCapInfo, ResponseFormat> eitherCap = addModuleNodeTemplateCap(nodeTemplateInfo,
-                            moduleCap, capJson, capName);
-                    if (eitherCap.isRight()) {
-                        return Either.right(eitherCap.right().value());
-                    }
-                }
-            }
-        }
-        return response;
-    }
-
-    private Either<UploadCapInfo, ResponseFormat> addModuleNodeTemplateCap(UploadComponentInstanceInfo nodeTemplateInfo,
-                                                                           Map<String, List<UploadCapInfo>> moduleCap, Object capJson, String key) {
-
-        Either<UploadCapInfo, ResponseFormat> eitherCap = createModuleNodeTemplateCap(capJson);
-        if (eitherCap.isRight()) {
-            log.info("error when creating Capability:{}, for node:{}", key, nodeTemplateInfo);
-            return Either.right(eitherCap.right().value());
-        } else {
-            UploadCapInfo capabilityDef = eitherCap.left().value();
-            capabilityDef.setKey(key);
-            if (moduleCap.containsKey(key)) {
-                moduleCap.get(key).add(capabilityDef);
-            } else {
-                List<UploadCapInfo> list = new ArrayList<UploadCapInfo>();
-                list.add(capabilityDef);
-                moduleCap.put(key, list);
-            }
-        }
-        return Either.left(eitherCap.left().value());
-    }
-
-    @SuppressWarnings("unchecked")
-    private Either<UploadCapInfo, ResponseFormat> createModuleNodeTemplateCap(Object capObject) {
-        UploadCapInfo capTemplateInfo = new UploadCapInfo();
-        Either<UploadCapInfo, ResponseFormat> result = Either.left(capTemplateInfo);
-
-        if (capObject instanceof String) {
-            String nodeTemplateJsonString = (String) capObject;
-            capTemplateInfo.setNode(nodeTemplateJsonString);
-        } else if (capObject instanceof Map) {
-            Map<String, Object> nodeTemplateJsonMap = (Map<String, Object>) capObject;
-            // Type
-            if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.NODE.getElementName())) {
-                capTemplateInfo.setNode((String) nodeTemplateJsonMap.get(ToscaTagNamesEnum.NODE.getElementName()));
-            }
-            if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.TYPE.getElementName())) {
-                capTemplateInfo.setType((String) nodeTemplateJsonMap.get(ToscaTagNamesEnum.TYPE.getElementName()));
-            }
-            if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.VALID_SOURCE_TYPES.getElementName())) {
-                Either<List<Object>, ResultStatusEnum> validSourceTypesRes = ImportUtils
-                        .findFirstToscaListElement(nodeTemplateJsonMap, ToscaTagNamesEnum.VALID_SOURCE_TYPES);
-                if (validSourceTypesRes.isLeft()) {
-                    capTemplateInfo.setValidSourceTypes(validSourceTypesRes.left().value().stream()
-                            .map(o -> o.toString()).collect(Collectors.toList()));
-                }
-            }
-            if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.PROPERTIES.getElementName())) {
-                Either<Map<String, List<UploadPropInfo>>, ResponseFormat> regResponse = createPropModuleFromYaml(
-                        nodeTemplateJsonMap);
-                if (regResponse.isRight())
-                    return Either.right(regResponse.right().value());
-                if (!regResponse.left().value().isEmpty()) {
-                    List<UploadPropInfo> properties = new ArrayList<UploadPropInfo>();
-                    regResponse.left().value().values().forEach(list -> properties.addAll(list));
-                    if (!properties.isEmpty())
-                        capTemplateInfo.setProperties(properties);
-                }
-            }
-        }
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Either<UploadReqInfo, ResponseFormat> createModuleNodeTemplateReg(Object regObject) {
-
-        UploadReqInfo regTemplateInfo = new UploadReqInfo();
-        Either<UploadReqInfo, ResponseFormat> result = Either.left(regTemplateInfo);
-
-        if (regObject instanceof String) {
-            String nodeTemplateJsonString = (String) regObject;
-            regTemplateInfo.setNode(nodeTemplateJsonString);
-        } else if (regObject instanceof Map) {
-            Map<String, Object> nodeTemplateJsonMap = (Map<String, Object>) regObject;
-            // Type
-            if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.NODE.getElementName())) {
-                regTemplateInfo.setNode((String) nodeTemplateJsonMap.get(ToscaTagNamesEnum.NODE.getElementName()));
-            }
-            // US740820 Relate RIs according to capability name
-            if (nodeTemplateJsonMap.containsKey(ToscaTagNamesEnum.CAPABILITY.getElementName())) {
-                regTemplateInfo.setCapabilityName(
-                        (String) nodeTemplateJsonMap.get(ToscaTagNamesEnum.CAPABILITY.getElementName()));
-            }
-        }
-        return result;
-    }
 
     public Either<Resource, ResponseFormat> propagateStateToCertified(User user, Resource resource,
                                                                       LifecycleChangeInfoWithAction lifecycleChangeInfo, boolean inTransaction, boolean needLock,
@@ -4264,12 +3147,10 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         } finally {
             if (result == null || result.isRight()) {
                 BeEcompErrorManager.getInstance().logBeSystemError("Change LifecycleState - Certify");
-                if (inTransaction == false) {
-                    log.debug("operation failed. do rollback");
+                if (!inTransaction) {
                     titanDao.rollback();
                 }
-            } else if (inTransaction == false) {
-                log.debug("operation success. do commit");
+            } else if (!inTransaction) {
                 titanDao.commit();
             }
         }
@@ -4277,17 +3158,8 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
     private Either<Resource, ResponseFormat> nodeFullCertification(String uniqueId, User user,
                                                                    LifecycleChangeInfoWithAction lifecycleChangeInfo, boolean inTransaction, boolean needLock) {
-        Either<Resource, ResponseFormat> result = lifecycleBusinessLogic.changeState(uniqueId, user,
-                LifeCycleTransitionEnum.CERTIFICATION_REQUEST, lifecycleChangeInfo, inTransaction, needLock);
-        if (result.isLeft()) {
-            result = lifecycleBusinessLogic.changeState(uniqueId, user, LifeCycleTransitionEnum.START_CERTIFICATION,
-                    lifecycleChangeInfo, inTransaction, needLock);
-        }
-        if (result.isLeft()) {
-            result = lifecycleBusinessLogic.changeState(uniqueId, user, LifeCycleTransitionEnum.CERTIFY,
-                    lifecycleChangeInfo, inTransaction, needLock);
-        }
-        return result;
+        return lifecycleBusinessLogic.changeState(uniqueId, user, LifeCycleTransitionEnum.CERTIFY,
+                lifecycleChangeInfo, inTransaction, needLock);
     }
 
     private Either<Resource, ResponseFormat> nodeForceCertification(Resource resource, User user,
@@ -4296,93 +3168,83 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 needLock);
     }
 
-
-    public Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> createOrUpdateResourceByImport(
+    public ImmutablePair<Resource, ActionStatus> createOrUpdateResourceByImport(
             Resource resource, User user, boolean isNormative, boolean isInTransaction, boolean needLock,
             CsarInfo csarInfo, String nodeName, boolean isNested) {
 
-        // check if resource already exist
-        Either<Resource, StorageOperationStatus> latestByName = toscaOperationFacade
-                .getLatestByName(resource.getName());
-        Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> result = null;
-
-        // create
-        if (latestByName.isRight() && latestByName.right().value().equals(StorageOperationStatus.NOT_FOUND)) {
-
-            Either<Resource, StorageOperationStatus> latestByToscaName = toscaOperationFacade
-                    .getLatestByToscaResourceName(resource.getToscaResourceName());
-            if (csarInfo != null && csarInfo.isUpdate() && nodeName != null && latestByToscaName.isRight()
-                    && latestByToscaName.right().value().equals(StorageOperationStatus.NOT_FOUND)) {
-                latestByToscaName = toscaOperationFacade
-                        .getLatestByToscaResourceName(buildNestedToscaResourceName(resource.getResourceType().name(),
-                                csarInfo.getVfResourceName(), nodeName).getRight());
-                // update
-                if (latestByToscaName.isLeft()) {
-                    log.debug("validate derived before update");
-                    Either<Boolean, ResponseFormat> eitherValidation = validateNestedDerivedFromDuringUpdate(
-                            latestByToscaName.left().value(), resource,
-                            ValidationUtils.hasBeenCertified(latestByToscaName.left().value().getVersion()));
-                    if (eitherValidation.isRight()) {
-                        result = createResourceByImport(resource, user, isNormative, isInTransaction, csarInfo);
-                    } else {
-                        result = updateExistingResourceByImport(resource, latestByToscaName.left().value(), user,
-                                isNormative, needLock, isNested);
-                    }
-                }
-            }
-            if (result == null && latestByToscaName.isRight()
-                    && latestByToscaName.right().value().equals(StorageOperationStatus.NOT_FOUND)) {
-                result = createResourceByImport(resource, user, isNormative, isInTransaction, csarInfo);
-            } else if (result == null) {
-                StorageOperationStatus status = latestByName.right().value();
+        ImmutablePair<Resource, ActionStatus> result = null;
+        // check if resource already exists (search by tosca name = type)
+        boolean isNestedResource = isNestedResourceUpdate(csarInfo, nodeName);
+        Either<Resource, StorageOperationStatus> latestByToscaName = toscaOperationFacade
+                .getLatestByToscaResourceName(resource.getToscaResourceName());
+
+        if (latestByToscaName.isLeft()) {
+            Resource foundResource = latestByToscaName.left().value();
+            // we don't allow updating names of top level types
+            if (!isNestedResource &&
+                    !StringUtils.equals(resource.getName(), foundResource.getName())) {
                 BeEcompErrorManager.getInstance().logBeComponentMissingError("Create / Update resource by import",
                         ComponentTypeEnum.RESOURCE.getValue(), resource.getName());
-                log.debug("resource already exist {}. status={}", resource.getName(), status);
+                log.debug("resource already exist new name={} old name={} same type={}", resource.getName(),
+                        foundResource.getName(), resource.getToscaResourceName());
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.RESOURCE_ALREADY_EXISTS);
                 componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.IMPORT_RESOURCE);
-                result = Either.right(responseFormat);
+                throwComponentException(responseFormat);
             }
-
-        }
-
-        // update
-        else if (latestByName.isLeft()) {
-            result = updateExistingResourceByImport(resource, latestByName.left().value(), user, isNormative, needLock,
-                    isNested);
-        }
-
-        // error
-        else {
-            StorageOperationStatus status = latestByName.right().value();
+            result = updateExistingResourceByImport(resource, foundResource, user, isNormative, needLock, isNested);
+        } else if (isNotFound(latestByToscaName)) {
+            if (isNestedResource) {
+                result = createOrUpdateNestedResource(resource, user, isNormative, isInTransaction, needLock, csarInfo, isNested, nodeName);
+            } else {
+                result = createResourceByImport(resource, user, isNormative, isInTransaction, csarInfo);
+            }
+        } else {
+            StorageOperationStatus status = latestByToscaName.right().value();
             log.debug("failed to get latest version of resource {}. status={}", resource.getName(), status);
             ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                    componentsUtils.convertFromStorageResponse(latestByName.right().value()), resource);
+                    componentsUtils.convertFromStorageResponse(latestByToscaName.right().value()), resource);
             componentsUtils.auditResource(responseFormat, user, resource, AuditingActionEnum.IMPORT_RESOURCE);
-            result = Either.right(responseFormat);
+            throwComponentException(responseFormat);
         }
         return result;
+    }
 
+    private boolean isNestedResourceUpdate(CsarInfo csarInfo, String nodeName) {
+        return csarInfo != null && csarInfo.isUpdate() && nodeName != null;
     }
 
-    private Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> createResourceByImport(Resource resource,
-                                                                                                 User user, boolean isNormative, boolean isInTransaction, CsarInfo csarInfo) {
+    private ImmutablePair<Resource, ActionStatus> createOrUpdateNestedResource(Resource resource, User user, boolean isNormative, boolean isInTransaction, boolean needLock, CsarInfo csarInfo, boolean isNested, String nodeName) {
+        Either<Component, StorageOperationStatus> latestByToscaName = toscaOperationFacade.getLatestByToscaResourceName(buildNestedToscaResourceName(
+                resource.getResourceType().name(), csarInfo.getVfResourceName(), nodeName).getRight());
+        if (latestByToscaName.isLeft()) {
+            Resource nestedResource = (Resource) latestByToscaName.left().value();
+            log.debug(VALIDATE_DERIVED_BEFORE_UPDATE);
+            Either<Boolean, ResponseFormat> eitherValidation = validateNestedDerivedFromDuringUpdate(nestedResource, resource,
+                    ValidationUtils.hasBeenCertified(nestedResource.getVersion()));
+            if (eitherValidation.isRight()) {
+                return createResourceByImport(resource, user, isNormative, isInTransaction, csarInfo);
+            }
+            return updateExistingResourceByImport(resource, nestedResource, user, isNormative, needLock, isNested);
+        } else {
+            return createResourceByImport(resource, user, isNormative, isInTransaction, csarInfo);
+        }
+    }
+
+    private boolean isNotFound(Either<Resource, StorageOperationStatus> getResourceEither) {
+        return getResourceEither.isRight() && getResourceEither.right().value() == StorageOperationStatus.NOT_FOUND;
+    }
+
+    private ImmutablePair<Resource, ActionStatus> createResourceByImport(Resource resource,
+                                                                         User user, boolean isNormative, boolean isInTransaction, CsarInfo csarInfo) {
         log.debug("resource with name {} does not exist. create new resource", resource.getName());
-        Either<Resource, ResponseFormat> response = validateResourceBeforeCreate(resource, user,
+        validateResourceBeforeCreate(resource, user,
                 AuditingActionEnum.IMPORT_RESOURCE, isInTransaction, csarInfo);
-        if (response.isRight()) {
-            return Either.right(response.right().value());
-        }
-        Either<Resource, ResponseFormat> createResponse = createResourceByDao(resource, user,
+        Resource createdResource = createResourceByDao(resource, user,
                 AuditingActionEnum.IMPORT_RESOURCE, isNormative, isInTransaction);
-        if (createResponse.isRight()) {
-            return Either.right(createResponse.right().value());
-        } else {
-            ImmutablePair<Resource, ActionStatus> resourcePair = new ImmutablePair<>(createResponse.left().value(),
-                    ActionStatus.CREATED);
-            ASDCKpiApi.countImportResourcesKPI();
-            return Either.left(resourcePair);
-
-        }
+        ImmutablePair<Resource, ActionStatus> resourcePair = new ImmutablePair<>(createdResource,
+                ActionStatus.CREATED);
+        ASDCKpiApi.countImportResourcesKPI();
+        return resourcePair;
     }
 
     public boolean isResourceExist(String resourceName) {
@@ -4390,53 +3252,20 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return latestByName.isLeft();
     }
 
-    private Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> updateExistingResourceByImport(
+    private ImmutablePair<Resource, ActionStatus> updateExistingResourceByImport(
             Resource newResource, Resource oldResource, User user, boolean inTransaction, boolean needLock,
             boolean isNested) {
         String lockedResourceId = oldResource.getUniqueId();
         log.debug("found resource: name={}, id={}, version={}, state={}", oldResource.getName(), lockedResourceId,
                 oldResource.getVersion(), oldResource.getLifecycleState());
-        Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> result = null;
+        ImmutablePair<Resource, ActionStatus> resourcePair = null;
         try {
-            if (needLock) {
-                Either<Boolean, ResponseFormat> lockResult = lockComponent(lockedResourceId, oldResource,
-                        "Update Resource by Import");
-                if (lockResult.isRight()) {
-                    return Either.right(lockResult.right().value());
-                }
-            }
-
-            Either<Resource, ResponseFormat> prepareResourceForUpdate = prepareResourceForUpdate(oldResource, user,
-                    inTransaction, false);
-            if (prepareResourceForUpdate.isRight()) {
-                ResponseFormat responseFormat = prepareResourceForUpdate.right().value();
-                log.info("resource {} cannot be updated. reason={}", lockedResourceId,
-                        responseFormat.getFormattedMessage());
-                componentsUtils.auditResource(responseFormat, user, newResource, AuditingActionEnum.IMPORT_RESOURCE,
-                        ResourceAuditData.newBuilder()
-                                .state(oldResource.getLifecycleState().name())
-                                .version(oldResource.getVersion())
-                                .build());
-                result = Either.right(prepareResourceForUpdate.right().value());
-                return result;
-            }
-            oldResource = prepareResourceForUpdate.left().value();
-
+            lockComponent(lockedResourceId, oldResource, needLock, "Update Resource by Import");
+            oldResource = prepareResourceForUpdate(oldResource, newResource, user, inTransaction, false);
             mergeOldResourceMetadataWithNew(oldResource, newResource);
 
-            Either<Boolean, ResponseFormat> validateFieldsResponse = validateResourceFieldsBeforeUpdate(oldResource,
-                    newResource, inTransaction, isNested);
-            if (validateFieldsResponse.isRight()) {
-                result = Either.right(validateFieldsResponse.right().value());
-                return result;
-            }
-
-            validateFieldsResponse = validateCapabilityTypesCreate(user, getCapabilityTypeOperation(), newResource,
-                    AuditingActionEnum.IMPORT_RESOURCE, inTransaction);
-            if (validateFieldsResponse.isRight()) {
-                return Either.right(validateFieldsResponse.right().value());
-            }
-
+            validateResourceFieldsBeforeUpdate(oldResource, newResource, inTransaction, isNested);
+            validateCapabilityTypesCreate(user, getCapabilityTypeOperation(), newResource, AuditingActionEnum.IMPORT_RESOURCE, inTransaction);
             // contact info normalization
             newResource.setContactId(newResource.getContactId().toLowerCase());
             // non-updatable fields
@@ -4468,9 +3297,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             if (newResource.getDerivedFromGenericVersion() == null || newResource.getDerivedFromGenericVersion().isEmpty()) {
                 newResource.setDerivedFromGenericVersion(oldResource.getDerivedFromGenericVersion());
             }
-            // TODO rhalili: handle artifacts here (delete from old resource and
             // add for new)
-            // TODO rbetzer: remove after migration - in case of resources
             // created without tosca artifacts - add the placeholders
             if (newResource.getToscaArtifacts() == null || newResource.getToscaArtifacts().isEmpty()) {
                 setToscaArtifactsPlaceHolders(newResource, user);
@@ -4483,31 +3310,29 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                         componentsUtils.convertFromStorageResponse(overrideResource.right().value()), newResource);
                 componentsUtils.auditResource(responseFormat, user, newResource, AuditingActionEnum.IMPORT_RESOURCE);
 
-                result = Either.right(responseFormat);
-                return result;
+                throwComponentException(responseFormat);
             }
 
             log.debug("Resource updated successfully!!!");
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.OK);
             componentsUtils.auditResource(responseFormat, user, newResource, AuditingActionEnum.IMPORT_RESOURCE,
-                    ResourceAuditData.newBuilder()
-                            .state(oldResource.getLifecycleState().name()).version(oldResource.getVersion()).build());
-
+                    ResourceVersionInfo.newBuilder()
+                            .state(oldResource.getLifecycleState()
+                                    .name())
+                            .version(oldResource.getVersion())
+                            .build());
 
-            ImmutablePair<Resource, ActionStatus> resourcePair = new ImmutablePair<>(overrideResource.left().value(),
+            resourcePair = new ImmutablePair<>(overrideResource.left().value(),
                     ActionStatus.OK);
-            result = Either.left(resourcePair);
-            return result;
+            return resourcePair;
         } finally {
-            if (result == null || result.isRight()) {
+            if (resourcePair == null) {
                 BeEcompErrorManager.getInstance().logBeSystemError("Change LifecycleState - Certify");
-                log.debug("operation failed. do rollback");
                 titanDao.rollback();
-            } else if (inTransaction == false) {
-                log.debug("operation success. do commit");
+            } else if (!inTransaction) {
                 titanDao.commit();
             }
-            if (needLock == true) {
+            if (needLock) {
                 log.debug("unlock resource {}", lockedResourceId);
                 graphLockOperation.unlockComponent(lockedResourceId, NodeTypeEnum.Resource);
             }
@@ -4552,45 +3377,37 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
     }
 
-    private Either<Resource, ResponseFormat> prepareResourceForUpdate(Resource latestResource, User user,
-                                                                      boolean inTransaction, boolean needLock) {
+    private Resource prepareResourceForUpdate(Resource oldResource, Resource newResource, User user,
+                                              boolean inTransaction, boolean needLock) {
 
-        Either<Resource, ResponseFormat> result = Either.left(latestResource);
-        // check if user can edit resource
-        if (!ComponentValidationUtils.canWorkOnResource(latestResource, user.getUserId())) {
+        if (!ComponentValidationUtils.canWorkOnResource(oldResource, user.getUserId())) {
             // checkout
-            Either<Resource, ResponseFormat> changeState = lifecycleBusinessLogic.changeState(
-                    latestResource.getUniqueId(), user, LifeCycleTransitionEnum.CHECKOUT,
-                    new LifecycleChangeInfoWithAction("update by import"), inTransaction, needLock);
-            result = changeState;
+            return lifecycleBusinessLogic.changeState(
+                    oldResource.getUniqueId(), user, LifeCycleTransitionEnum.CHECKOUT,
+                    new LifecycleChangeInfoWithAction("update by import"), inTransaction, needLock)
+                    .left()
+                    .on(response -> failOnChangeState(response, user, oldResource, newResource));
         }
-
-        return result;
+        return oldResource;
     }
 
-    public Either<Resource, ResponseFormat> validateResourceBeforeCreate(Resource resource, User user,
-                                                                         AuditingActionEnum actionEnum, boolean inTransaction, CsarInfo csarInfo) {
-
-        Either<Boolean, ResponseFormat> eitherValidation = validateResourceFieldsBeforeCreate(user, resource,
-                actionEnum, inTransaction);
-        if (eitherValidation.isRight()) {
-            return Either.right(eitherValidation.right().value());
-        }
+    private Resource failOnChangeState(ResponseFormat response, User user, Resource oldResource, Resource newResource) {
+        log.info("resource {} cannot be updated. reason={}", oldResource.getUniqueId(),
+                response.getFormattedMessage());
+        componentsUtils.auditResource(response, user, newResource, AuditingActionEnum.IMPORT_RESOURCE,
+                ResourceVersionInfo.newBuilder()
+                        .state(oldResource.getLifecycleState().name())
+                        .version(oldResource.getVersion())
+                        .build());
+        throw new ComponentException(response);
+    }
 
-        eitherValidation = validateCapabilityTypesCreate(user, getCapabilityTypeOperation(), resource, actionEnum,
-                inTransaction);
-        if (eitherValidation.isRight()) {
-            return Either.right(eitherValidation.right().value());
-        }
-        eitherValidation = validateLifecycleTypesCreate(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return Either.right(eitherValidation.right().value());
-        }
-        eitherValidation = validateResourceType(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return Either.right(eitherValidation.right().value());
-        }
+    public Resource validateResourceBeforeCreate(Resource resource, User user, AuditingActionEnum actionEnum, boolean inTransaction, CsarInfo csarInfo) {
 
+        validateResourceFieldsBeforeCreate(user, resource, actionEnum, inTransaction);
+        validateCapabilityTypesCreate(user, getCapabilityTypeOperation(), resource, actionEnum, inTransaction);
+        validateLifecycleTypesCreate(user, resource, actionEnum);
+        validateResourceType(user, resource, actionEnum);
         resource.setCreatorUserId(user.getUserId());
         resource.setCreatorFullName(user.getFirstName() + " " + user.getLastName());
         resource.setContactId(resource.getContactId().toLowerCase());
@@ -4611,7 +3428,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         String invariantUUID = UniqueIdBuilder.buildInvariantUUID();
         resource.setInvariantUUID(invariantUUID);
 
-        return Either.left(resource);
+        return resource;
     }
 
     private Either<Boolean, ResponseFormat> validateResourceType(User user, Resource resource,
@@ -4702,20 +3519,21 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         if (eitherCapTypeFound.isRight()) {
             if (eitherCapTypeFound.right().value() == StorageOperationStatus.NOT_FOUND) {
                 BeEcompErrorManager.getInstance().logBeGraphObjectMissingError(
-                        "Create Resource - validateCapabilityTypesCreate", "Capability Type", type);
+                        CREATE_RESOURCE_VALIDATE_CAPABILITY_TYPES, "Capability Type", type);
                 log.debug("Capability Type: {} is required by resource: {} but does not exist in the DB", type,
                         resource.getName());
                 BeEcompErrorManager.getInstance()
-                        .logBeDaoSystemError("Create Resource - validateCapabilityTypesCreate");
+                        .logBeDaoSystemError(CREATE_RESOURCE_VALIDATE_CAPABILITY_TYPES);
             }
             log.debug("Trying to get capability type {} failed with error: {}", type,
                     eitherCapTypeFound.right().value().name());
             ResponseFormat errorResponse = null;
-            if (type != null)
+            if (type != null) {
                 errorResponse = componentsUtils.getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE, type);
-            else
+            } else {
                 errorResponse = componentsUtils.getResponseFormatByElement(ActionStatus.MISSING_CAPABILITY_TYPE,
                         validationObjects);
+            }
             eitherResult = Either.right(errorResponse);
             componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
         }
@@ -4731,11 +3549,11 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         if (eitherCapTypeFound.isRight()) {
             if (eitherCapTypeFound.right().value() == StorageOperationStatus.NOT_FOUND) {
                 BeEcompErrorManager.getInstance().logBeGraphObjectMissingError(
-                        "Create Resource - validateCapabilityTypesCreate", "Capability Type", typeEntry.getKey());
+                        CREATE_RESOURCE_VALIDATE_CAPABILITY_TYPES, "Capability Type", typeEntry.getKey());
                 log.debug("Capability Type: {} is required by resource: {} but does not exist in the DB",
                         typeEntry.getKey(), resource.getName());
                 BeEcompErrorManager.getInstance()
-                        .logBeDaoSystemError("Create Resource - validateCapabilityTypesCreate");
+                        .logBeDaoSystemError(CREATE_RESOURCE_VALIDATE_CAPABILITY_TYPES);
             }
             log.debug("Trying to get capability type {} failed with error: {}", typeEntry.getKey(),
                     eitherCapTypeFound.right().value().name());
@@ -4749,7 +3567,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             for (CapabilityDefinition capDef : typeEntry.getValue()) {
                 List<ComponentInstanceProperty> properties = capDef.getProperties();
                 if (properties == null || properties.isEmpty()) {
-                    properties = new ArrayList<ComponentInstanceProperty>();
+                    properties = new ArrayList<>();
                     for (Entry<String, PropertyDefinition> prop : capabilityTypeDefinition.getProperties().entrySet()) {
                         ComponentInstanceProperty newProp = new ComponentInstanceProperty(prop.getValue());
                         properties.add(newProp);
@@ -4775,50 +3593,53 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return eitherResult;
     }
 
-    public Either<Resource, ResponseFormat> createResourceByDao(Resource resource, User user,
-            AuditingActionEnum actionEnum, boolean isNormative, boolean inTransaction) {
+    public Resource createResourceByDao(Resource resource, User user,
+                                        AuditingActionEnum actionEnum, boolean isNormative, boolean inTransaction) {
         // create resource
 
         // lock new resource name in order to avoid creation resource with same
         // name
-        if (inTransaction == false) {
+        Resource createdResource = null;
+        if (!inTransaction) {
             Either<Boolean, ResponseFormat> lockResult = lockComponentByName(resource.getSystemName(), resource,
-                    "Create Resource");
+                    CREATE_RESOURCE);
             if (lockResult.isRight()) {
                 ResponseFormat responseFormat = lockResult.right().value();
                 componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-                return Either.right(responseFormat);
+                throw new ComponentException(responseFormat);
             }
 
             log.debug("name is locked {} status = {}", resource.getSystemName(), lockResult);
         }
         try {
             if (resource.deriveFromGeneric()) {
-                Either<Resource, ResponseFormat> genericResourceEither = handleResourceGenericType(resource);
-                if (genericResourceEither.isRight())
-                    return genericResourceEither;
+                handleResourceGenericType(resource);
             }
-
-            Either<Resource, ResponseFormat> respStatus = createResourceTransaction(resource, user, isNormative,
-                    inTransaction);
-            if (respStatus.isLeft()) {
-                componentsUtils.auditResource(componentsUtils.getResponseFormat(ActionStatus.CREATED), user,
-                        respStatus.left().value(), actionEnum);
-                ASDCKpiApi.countCreatedResourcesKPI();
-            } else
-                componentsUtils.auditResource(respStatus.right().value(), user, resource, actionEnum);
-            return respStatus;
-
-        } finally {
-            if (inTransaction == false) {
+           createdResource = createResourceTransaction(resource, user, isNormative
+           );
+            componentsUtils.auditResource(componentsUtils.getResponseFormat(ActionStatus.CREATED), user,
+                    createdResource, actionEnum);
+            ASDCKpiApi.countCreatedResourcesKPI();
+        } catch(ComponentException e) {
+            ResponseFormat responseFormat = e.getResponseFormat() == null ? componentsUtils.getResponseFormat(e.getActionStatus(), e.getParams()) : e.getResponseFormat();
+            componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
+            throw e;
+        } catch (StorageException e){
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(e.getStorageOperationStatus()));
+            componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
+            throw e;
+        }
+        finally {
+            if (!inTransaction) {
                 graphLockOperation.unlockComponentByName(resource.getSystemName(), resource.getUniqueId(),
                         NodeTypeEnum.Resource);
             }
         }
+        return createdResource;
     }
 
-    private Either<Resource, ResponseFormat> createResourceTransaction(Resource resource, User user,
-                                                                       boolean isNormative, boolean inTransaction) {
+    private Resource createResourceTransaction(Resource resource, User user,
+                                               boolean isNormative) {
         // validate resource name uniqueness
         log.debug("validate resource name");
         Either<Boolean, StorageOperationStatus> eitherValidation = toscaOperationFacade.validateComponentNameExists(
@@ -4828,41 +3649,37 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     eitherValidation.right().value());
             ResponseFormat errorResponse = componentsUtils
                     .getResponseFormat(componentsUtils.convertFromStorageResponse(eitherValidation.right().value()));
-            return Either.right(errorResponse);
+            throw new ComponentException(errorResponse);
         }
         if (eitherValidation.left().value()) {
             log.debug("resource with name: {}, already exists", resource.getName());
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST,
                     ComponentTypeEnum.RESOURCE.getValue(), resource.getName());
-            return Either.right(errorResponse);
+            throw new ComponentException(errorResponse);
         }
 
         log.debug("send resource {} to dao for create", resource.getName());
 
         createArtifactsPlaceHolderData(resource, user);
-
-        //
-
         // enrich object
         if (!isNormative) {
             log.debug("enrich resource with creator, version and state");
             resource.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
             resource.setVersion(INITIAL_VERSION);
             resource.setHighestVersion(true);
-            if (resource.getResourceType() != null && resource.getResourceType() != ResourceTypeEnum.CVFC)
+            if (resource.getResourceType() != null && resource.getResourceType() != ResourceTypeEnum.CVFC) {
                 resource.setAbstract(false);
+            }
         }
+        return toscaOperationFacade.createToscaComponent(resource)
+                .left()
+                .on(r->throwComponentExceptionByResource(r, resource));
+    }
 
-        Either<Resource, StorageOperationStatus> createToscaElement = toscaOperationFacade
-                .createToscaComponent(resource);
-        if (createToscaElement.isLeft()) {
-            return Either.left(createToscaElement.left().value());
-        }
-
+    private Resource throwComponentExceptionByResource(StorageOperationStatus status, Resource resource) {
         ResponseFormat responseFormat = componentsUtils.getResponseFormatByResource(
-                componentsUtils.convertFromStorageResponse(createToscaElement.right().value()), resource);
-
-        return Either.right(responseFormat);
+                componentsUtils.convertFromStorageResponse(status), resource);
+        throw new ComponentException(responseFormat);
     }
 
     private void createArtifactsPlaceHolderData(Resource resource, User user) {
@@ -4882,47 +3699,49 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         Resource resource = (Resource) component;
         Map<String, ArtifactDefinition> artifactMap = resource.getDeploymentArtifacts();
         if (artifactMap == null) {
-            artifactMap = new HashMap<String, ArtifactDefinition>();
+            artifactMap = new HashMap<>();
         }
         Map<String, Object> deploymentResourceArtifacts = ConfigurationManager.getConfigurationManager()
                 .getConfiguration().getDeploymentResourceArtifacts();
         if (deploymentResourceArtifacts != null) {
-            Iterator<Entry<String, Object>> iterator = deploymentResourceArtifacts.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Entry<String, Object> currEntry = iterator.next();
-                boolean shouldCreateArtifact = true;
-                Map<String, Object> artifactDetails = (Map<String, Object>) currEntry.getValue();
-                Object object = artifactDetails.get(PLACE_HOLDER_RESOURCE_TYPES);
-                if (object != null) {
-                    List<String> artifactTypes = (List<String>) object;
-                    if (!artifactTypes.contains(resource.getResourceType().name())) {
-                        shouldCreateArtifact = false;
-                        continue;
-                    }
-                } else {
-                    log.info("resource types for artifact placeholder {} were not defined. default is all resources",
-                            currEntry.getKey());
-                }
-                if (shouldCreateArtifact) {
-                    if (artifactsBusinessLogic != null) {
-                        ArtifactDefinition artifactDefinition = artifactsBusinessLogic.createArtifactPlaceHolderInfo(
-                                resource.getUniqueId(), currEntry.getKey(), (Map<String, Object>) currEntry.getValue(),
-                                user, ArtifactGroupTypeEnum.DEPLOYMENT);
-                        if (artifactDefinition != null
-                                && !artifactMap.containsKey(artifactDefinition.getArtifactLabel()))
-                            artifactMap.put(artifactDefinition.getArtifactLabel(), artifactDefinition);
-                    }
+            Map<String, ArtifactDefinition> finalArtifactMap = artifactMap;
+            deploymentResourceArtifacts.forEach((k, v)->processDeploymentResourceArtifacts(user, resource, finalArtifactMap, k,v));
+        }
+        resource.setDeploymentArtifacts(artifactMap);
+    }
+
+    private void processDeploymentResourceArtifacts(User user, Resource resource, Map<String, ArtifactDefinition> artifactMap, String k, Object v) {
+        boolean shouldCreateArtifact = true;
+        Map<String, Object> artifactDetails = (Map<String, Object>) v;
+        Object object = artifactDetails.get(PLACE_HOLDER_RESOURCE_TYPES);
+        if (object != null) {
+            List<String> artifactTypes = (List<String>) object;
+            if (!artifactTypes.contains(resource.getResourceType().name())) {
+                shouldCreateArtifact = false;
+                return;
+            }
+        } else {
+            log.info("resource types for artifact placeholder {} were not defined. default is all resources",
+                    k);
+        }
+        if (shouldCreateArtifact) {
+            if (artifactsBusinessLogic != null) {
+                ArtifactDefinition artifactDefinition = artifactsBusinessLogic.createArtifactPlaceHolderInfo(
+                        resource.getUniqueId(), k, (Map<String, Object>) v,
+                        user, ArtifactGroupTypeEnum.DEPLOYMENT);
+                if (artifactDefinition != null
+                        && !artifactMap.containsKey(artifactDefinition.getArtifactLabel())) {
+                    artifactMap.put(artifactDefinition.getArtifactLabel(), artifactDefinition);
                 }
             }
         }
-        resource.setDeploymentArtifacts(artifactMap);
     }
 
     @SuppressWarnings("unchecked")
     private void setInformationalArtifactsPlaceHolder(Resource resource, User user) {
         Map<String, ArtifactDefinition> artifactMap = resource.getArtifacts();
         if (artifactMap == null) {
-            artifactMap = new HashMap<String, ArtifactDefinition>();
+            artifactMap = new HashMap<>();
         }
         String resourceUniqueId = resource.getUniqueId();
         List<String> exludeResourceCategory = ConfigurationManager.getConfigurationManager().getConfiguration()
@@ -4935,25 +3754,12 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         boolean isCreateArtifact = true;
         if (exludeResourceCategory != null) {
             String category = categories.get(0).getName();
-            for (String exlude : exludeResourceCategory) {
-                if (exlude.equalsIgnoreCase(category)) {
-                    isCreateArtifact = false;
-                    break;
-                }
-            }
-
+            isCreateArtifact = exludeResourceCategory.stream().noneMatch(e->e.equalsIgnoreCase(category));
         }
         if (isCreateArtifact && exludeResourceType != null) {
             String resourceType = resource.getResourceType().name();
-            for (String type : exludeResourceType) {
-                if (type.equalsIgnoreCase(resourceType)) {
-                    isCreateArtifact = false;
-                    break;
-                }
-            }
-
+            isCreateArtifact = exludeResourceType.stream().noneMatch(e->e.equalsIgnoreCase(resourceType));
         }
-
         if (informationalResourceArtifacts != null && isCreateArtifact) {
             Set<String> keys = informationalResourceArtifacts.keySet();
             for (String informationalResourceArtifactName : keys) {
@@ -4978,10 +3784,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
      */
     public ResponseFormat deleteResource(String resourceId, User user) {
         ResponseFormat responseFormat;
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(user, "Delete Resource", false);
-        if (eitherCreator.isRight()) {
-            return eitherCreator.right().value();
-        }
+        validateUserExists(user, DELETE_RESOURCE, false);
 
         Either<Resource, StorageOperationStatus> resourceStatus = toscaOperationFacade.getToscaElement(resourceId);
         if (resourceStatus.isRight()) {
@@ -4995,7 +3798,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         StorageOperationStatus result = StorageOperationStatus.OK;
         Either<Boolean, ResponseFormat> lockResult = lockComponent(resourceId, resource, "Mark resource to delete");
         if (lockResult.isRight()) {
-            result = StorageOperationStatus.GENERAL_ERROR;
             return componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
         }
 
@@ -5012,10 +3814,8 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
         } finally {
             if (result == null || !result.equals(StorageOperationStatus.OK)) {
-                log.warn("operation failed. do rollback");
                 titanDao.rollback();
             } else {
-                log.debug("operation success. do commit");
                 titanDao.commit();
             }
             graphLockOperation.unlockComponent(resourceId, NodeTypeEnum.Resource);
@@ -5025,11 +3825,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
     public ResponseFormat deleteResourceByNameAndVersion(String resourceName, String version, User user) {
         ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.NO_CONTENT);
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(user, "Delete Resource", false);
-        if (eitherCreator.isRight()) {
-            return eitherCreator.right().value();
-        }
-
+        validateUserExists(user, DELETE_RESOURCE, false);
         Resource resource = null;
         StorageOperationStatus result = StorageOperationStatus.OK;
         try {
@@ -5046,18 +3842,16 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
         } finally {
             if (result == null || !result.equals(StorageOperationStatus.OK)) {
-                log.warn("operation failed. do rollback");
                 titanDao.rollback();
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(result);
                 responseFormat = componentsUtils.getResponseFormatByResource(actionStatus, resourceName);
             } else {
-                log.debug("operation success. do commit");
                 titanDao.commit();
             }
         }
         if (resource != null) {
             Either<Boolean, ResponseFormat> lockResult = lockComponent(resource.getUniqueId(), resource,
-                    "Delete Resource");
+                    DELETE_RESOURCE);
             if (lockResult.isRight()) {
                 result = StorageOperationStatus.GENERAL_ERROR;
                 return componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
@@ -5072,10 +3866,8 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
             } finally {
                 if (result == null || !result.equals(StorageOperationStatus.OK)) {
-                    log.warn("operation failed. do rollback");
                     titanDao.rollback();
                 } else {
-                    log.debug("operation success. do commit");
                     titanDao.commit();
                 }
                 graphLockOperation.unlockComponent(resource.getUniqueId(), NodeTypeEnum.Resource);
@@ -5087,10 +3879,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
     public Either<Resource, ResponseFormat> getResource(String resourceId, User user) {
 
         if (user != null) {
-            Either<User, ResponseFormat> eitherCreator = validateUserExists(user, "Create Resource", false);
-            if (eitherCreator.isRight()) {
-                return Either.right(eitherCreator.right().value());
-            }
+            validateUserExists(user, CREATE_RESOURCE, false);
         }
 
         Either<Resource, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(resourceId);
@@ -5110,10 +3899,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
     public Either<Resource, ResponseFormat> getResourceByNameAndVersion(String resourceName, String resourceVersion,
                                                                         String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Resource By Name And Version", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get Resource By Name And Version", false);
 
         Either<Resource, StorageOperationStatus> getResource = toscaOperationFacade
                 .getComponentByNameAndVersion(ComponentTypeEnum.RESOURCE, resourceName, resourceVersion);
@@ -5132,15 +3918,12 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
      * @param inTransaction      TODO
      * @param resourceIdToUpdate - the resource identifier
      * @param newResource
-     * @return Either<Resource, responseFormat>
+     * @return Either<Resource ,   responseFormat>
      */
-    public Either<Resource, ResponseFormat> updateResourceMetadata(String resourceIdToUpdate, Resource newResource,
-                                                                   Resource currentResource, User user, boolean inTransaction) {
+    public Resource updateResourceMetadata(String resourceIdToUpdate, Resource newResource,
+                                           Resource currentResource, User user, boolean inTransaction) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(user.getUserId(), "update Resource Metadata", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(user.getUserId(), "update Resource Metadata", false);
 
         log.debug("Get resource with id {}", resourceIdToUpdate);
         boolean needToUnlock = false;
@@ -5151,7 +3934,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 Either<Resource, StorageOperationStatus> storageStatus = toscaOperationFacade
                         .getToscaElement(resourceIdToUpdate);
                 if (storageStatus.isRight()) {
-                    return Either.right(componentsUtils.getResponseFormatByResource(
+                    throw new ComponentException(componentsUtils.getResponseFormatByResource(
                             componentsUtils.convertFromStorageResponse(storageStatus.right().value()), ""));
                 }
 
@@ -5160,7 +3943,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             // verify that resource is checked-out and the user is the last
             // updater
             if (!ComponentValidationUtils.canWorkOnResource(currentResource, user.getUserId())) {
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
+                throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
             }
 
             // lock resource
@@ -5172,7 +3955,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 log.debug("Failed to lock resource: {}, error - {}", resourceIdToUpdate, lockResult);
                 ResponseFormat responseFormat = componentsUtils
                         .getResponseFormat(componentsUtils.convertFromStorageResponse(lockResult));
-                return Either.right(responseFormat);
+                throw new ComponentException(responseFormat);
             }
 
             needToUnlock = true;
@@ -5185,118 +3968,42 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             // This code is not called from import resources, because of root
             // VF "derivedFrom" should be null (or ignored)
             if (ModelConverter.isAtomicComponent(currentResource)) {
-                Either<Boolean, ResponseFormat> derivedFromNotEmptyEither = validateDerivedFromNotEmpty(null,
-                        newResource, null);
-                if (derivedFromNotEmptyEither.isRight()) {
-                    log.debug("for updated resource {}, derived from field is empty", newResource.getName());
-                    return Either.right(derivedFromNotEmptyEither.right().value());
-                }
-
-                derivedFromNotEmptyEither = validateDerivedFromNotEmpty(null, currentResource, null);
-                if (derivedFromNotEmptyEither.isRight()) {
-                    log.debug("for current resource {}, derived from field is empty", currentResource.getName());
-                    return Either.right(derivedFromNotEmptyEither.right().value());
-                }
+                validateDerivedFromNotEmpty(null, newResource, null);
+                validateDerivedFromNotEmpty(null, currentResource, null);
             } else {
                 newResource.setDerivedFrom(null);
             }
 
-            Either<Boolean, ResponseFormat> validateAndUpdateInterfacesEither = validateAndUpdateInterfaces(resourceIdToUpdate, newResource);
-            if (validateAndUpdateInterfacesEither.isRight()) {
-                log.error("failed to validate and update Interfaces !!!");
-                rollbackNeeded = true;
-                return Either.right(validateAndUpdateInterfacesEither.right().value());
-            }
-
             Either<Resource, ResponseFormat> dataModelResponse = updateResourceMetadata(resourceIdToUpdate, newResource,
                     user, currentResource, false, true);
             if (dataModelResponse.isRight()) {
                 log.debug("failed to update resource metadata!!!");
                 rollbackNeeded = true;
-                return Either.right(dataModelResponse.right().value());
+                throw new ComponentException(dataModelResponse.right().value());
             }
 
             log.debug("Resource metadata updated successfully!!!");
             rollbackNeeded = false;
-            return Either.left(dataModelResponse.left().value());
+            return dataModelResponse.left().value();
 
-        } finally {
+        } catch (ComponentException|StorageException e){
+            rollback(inTransaction, newResource, null, null);
+            throw e;
+        }
+        finally {
             if (!inTransaction) {
-                if (rollbackNeeded) {
-                    titanDao.rollback();
-                } else {
-                    titanDao.commit();
-                }
+                titanDao.commit();
             }
-
             if (needToUnlock) {
                 graphLockOperation.unlockComponent(resourceIdToUpdate, NodeTypeEnum.Resource);
             }
         }
     }
 
-    private Either<List<GroupDefinition>, Boolean> updateComponentGroupName(String replacePattern, String with,
-                                                                            List<GroupDefinition> oldGroup) {
-        if (oldGroup == null || with == null || replacePattern == null || with.isEmpty() || replacePattern.isEmpty()) {
-            if (log.isInfoEnabled())
-                log.info("cannot update group name , invalid args -> replacePattern:{} , with:{} , oldGroup:{}",
-                        replacePattern, with, oldGroup == null ? null : " < size : " + oldGroup.size() + " >");
-            return Either.right(false);
-        }
-        List<GroupDefinition> list = oldGroup.stream().map(group -> new GroupDefinition(group))
-                .collect(Collectors.toList());
-        for (GroupDefinition group : list) {
-            if (group != null && group.isSamePrefix(replacePattern)) {
-                String prefix = group.getName().substring(0, replacePattern.length());
-                String newGroupName = group.getName().replaceFirst(prefix, with);
-                group.setName(newGroupName);
-            }
-        }
-        return Either.left(list);
-    }
-
-    private boolean isComponentNameChanged(Resource newResource, Resource oldResource) {
-        if (newResource != null && oldResource != null) { // TODO - must protect
-            // all chain against
-            // null , use
-            // optional
-            String futureName = newResource.getComponentMetadataDefinition().getMetadataDataDefinition().getName();
-            String oldName = oldResource.getComponentMetadataDefinition().getMetadataDataDefinition().getName();
-            return !oldName.equals(futureName);
-        }
-        return false;
-    }
-
     private Either<Resource, ResponseFormat> updateResourceMetadata(String resourceIdToUpdate, Resource newResource,
                                                                     User user, Resource currentResource, boolean shouldLock, boolean inTransaction) {
-        // region -> Update groups name for newResource
-        if (isComponentNameChanged(currentResource, newResource)) {
-            String replacePattern = Optional.ofNullable( // get currentResource
-                    // name from
-                    // metadata
-                    Optional.ofNullable(
-                            Optional.ofNullable(currentResource).orElse(null).getComponentMetadataDefinition())
-                            .orElse(null).getMetadataDataDefinition())
-                    .orElse(null).getName();
-            String with = Optional.ofNullable( // get newResource name from
-                    // metadata
-                    Optional.ofNullable(Optional.ofNullable(newResource).orElse(null).getComponentMetadataDefinition())
-                            .orElse(null).getMetadataDataDefinition())
-                    .orElse(null).getName();
-            if (with != null && replacePattern != null) {
-                Either<List<GroupDefinition>, Boolean> result = updateComponentGroupName(replacePattern, with,
-                        currentResource.getGroups());
-                if (result.isLeft())
-                    newResource.setGroups((List<GroupDefinition>) result.left().value());
-            }
-        }
-        // endregion
-
-        Either<Boolean, ResponseFormat> validateResourceFields = validateResourceFieldsBeforeUpdate(currentResource,
-                newResource, inTransaction, false);
-        if (validateResourceFields.isRight()) {
-            return Either.right(validateResourceFields.right().value());
-        }
+        updateVfModuleGroupsNames(currentResource, newResource);
+        validateResourceFieldsBeforeUpdate(currentResource, newResource, inTransaction, false);
         // Setting last updater and uniqueId
         newResource.setContactId(newResource.getContactId().toLowerCase());
         newResource.setLastUpdaterUserId(user.getUserId());
@@ -5306,7 +4013,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         newResource.setCreationDate(currentResource.getCreationDate());
 
         Either<Boolean, ResponseFormat> processUpdateOfDerivedFrom = processUpdateOfDerivedFrom(currentResource,
-                newResource, user.getUserId(), shouldLock, inTransaction);
+                newResource, user.getUserId(), inTransaction);
 
         if (processUpdateOfDerivedFrom.isRight()) {
             log.debug("Couldn't update derived from for resource {}", resourceIdToUpdate);
@@ -5314,13 +4021,13 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
 
         log.debug("send resource {} to dao for update", newResource.getUniqueId());
-        if (newResource != null && newResource.getGroups() != null) {
+        if (isNotEmpty(newResource.getGroups())) {
             for (GroupDefinition group : newResource.getGroups()) {
-                if (newResource.getComponentMetadataDefinition() != null
-                        && newResource.getComponentMetadataDefinition().getMetadataDataDefinition() != null)
+                if (group.getType().equals(Constants.DEFAULT_GROUP_VF_MODULE)) {
                     groupBusinessLogic.validateAndUpdateGroupMetadata(
                             newResource.getComponentMetadataDefinition().getMetadataDataDefinition().getUniqueId(),
-                            user, ComponentTypeEnum.RESOURCE_INSTANCE, group, true, false);
+                            user, newResource.getComponentType(), group, true, false);
+                }
             }
         }
         Either<Resource, StorageOperationStatus> dataModelResponse = toscaOperationFacade
@@ -5337,92 +4044,77 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(dataModelResponse.left().value());
     }
 
+
+    private void updateVfModuleGroupsNames(Resource currentResource, Resource newResource) {
+        if(currentResource.getGroups() != null && !currentResource.getName().equals(newResource.getName())){
+            List<GroupDefinition> updatedGroups = currentResource.getGroups()
+                    .stream()
+                    .map(group -> getUpdatedGroup(group, currentResource.getName(), newResource.getName()))
+                    .collect(toList());
+            newResource.setGroups(updatedGroups);
+        }
+    }
+
+    private GroupDefinition getUpdatedGroup(GroupDefinition currGroup, String replacePattern, String with) {
+        GroupDefinition updatedGroup = new GroupDefinition(currGroup);
+        if(updatedGroup.isSamePrefix(replacePattern) && updatedGroup.getType().equals(Constants.DEFAULT_GROUP_VF_MODULE)){
+            String prefix = updatedGroup.getName().substring(0, replacePattern.length());
+            String newGroupName = updatedGroup.getName().replaceFirst(prefix, with);
+            updatedGroup.setName(newGroupName);
+        }
+        return updatedGroup;
+    }
     /**
      * validateResourceFieldsBeforeCreate
      *
-     * @param user      - modifier data (userId)
-     * @return Either<Boolean, ErrorResponse>
+     * @param user - modifier data (userId)
+     * @return Either<Boolean   ,       ErrorResponse>
      */
     private Either<Boolean, ResponseFormat> validateResourceFieldsBeforeCreate(User user, Resource resource,
                                                                                AuditingActionEnum actionEnum, boolean inTransaction) {
-        Either<Boolean, ResponseFormat> componentsFieldsValidation = validateComponentFieldsBeforeCreate(user, resource,
-                actionEnum);
-        if (componentsFieldsValidation.isRight()) {
-            return componentsFieldsValidation;
-        }
-
-
+        validateComponentFieldsBeforeCreate(user, resource, actionEnum);
         // validate category
         log.debug("validate category");
-        Either<Boolean, ResponseFormat> eitherValidation = validateCategory(user, resource, actionEnum, inTransaction);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
+        validateCategory(user, resource, actionEnum, inTransaction);
         // validate vendor name & release & model number
         log.debug("validate vendor name");
-        eitherValidation = validateVendorName(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
+        validateVendorName(user, resource, actionEnum);
         log.debug("validate vendor release");
-        eitherValidation = validateVendorReleaseName(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
+        validateVendorReleaseName(user, resource, actionEnum);
         log.debug("validate resource vendor model number");
-        eitherValidation = validateResourceVendorModelNumber(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-
+        validateResourceVendorModelNumber(user, resource, actionEnum);
         // validate cost
         log.debug("validate cost");
-        eitherValidation = validateCost(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
+        validateCost(resource);
         // validate licenseType
         log.debug("validate licenseType");
-        eitherValidation = validateLicenseType(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
+        validateLicenseType(user, resource, actionEnum);
         // validate template (derived from)
         log.debug("validate derived from");
         if (!ModelConverter.isAtomicComponent(resource) && resource.getResourceType() != ResourceTypeEnum.CVFC) {
             resource.setDerivedFrom(null);
         }
-        eitherValidation = validateDerivedFromExist(user, resource, actionEnum);
-        if (eitherValidation.isRight()) {
-            return Either.right(eitherValidation.right().value());
-        }
-
+        validateDerivedFromExist(user, resource, actionEnum);
         // warn about non-updatable fields
         checkComponentFieldsForOverrideAttempt(resource);
         String currentCreatorFullName = resource.getCreatorFullName();
         if (currentCreatorFullName != null) {
-            log.warn("Resource Creator fullname is automatically set and cannot be updated");
+            log.debug("Resource Creator fullname is automatically set and cannot be updated");
         }
 
         String currentLastUpdaterFullName = resource.getLastUpdaterFullName();
         if (currentLastUpdaterFullName != null) {
-            log.warn("Resource LastUpdater fullname is automatically set and cannot be updated");
+            log.debug("Resource LastUpdater fullname is automatically set and cannot be updated");
         }
 
         Long currentLastUpdateDate = resource.getLastUpdateDate();
         if (currentLastUpdateDate != null) {
-            log.warn("Resource last update date is automatically set and cannot be updated");
+            log.debug("Resource last update date is automatically set and cannot be updated");
         }
 
         Boolean currentAbstract = resource.isAbstract();
         if (currentAbstract != null) {
-            log.warn("Resource abstract is automatically set and cannot be updated");
+            log.debug("Resource abstract is automatically set and cannot be updated");
         }
 
         return Either.left(true);
@@ -5433,159 +4125,96 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
      *
      * @param currentResource - Resource object to validate
      * @param isNested
-     * @return Either<Boolean, ErrorResponse>
      */
-    private Either<Boolean, ResponseFormat> validateResourceFieldsBeforeUpdate(Resource currentResource,
-                                                                               Resource updateInfoResource, boolean inTransaction, boolean isNested) {
-
-        boolean hasBeenCertified = ValidationUtils.hasBeenCertified(currentResource.getVersion());
-
-        // validate resource name
-        log.debug("validate resource name before update");
-        Either<Boolean, ResponseFormat> eitherValidation = validateResourceName(currentResource, updateInfoResource,
-                hasBeenCertified, isNested);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        // validate description
-        log.debug("validate description before update");
-        eitherValidation = validateDescriptionAndCleanup(null, updateInfoResource, null);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate icon before update");
-        eitherValidation = validateIcon(currentResource, updateInfoResource, hasBeenCertified);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate tags before update");
-        eitherValidation = validateTagsListAndRemoveDuplicates(null, updateInfoResource, null);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate vendor name before update");
-        eitherValidation = validateVendorName(currentResource, updateInfoResource, hasBeenCertified);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate resource vendor model number before update");
-        eitherValidation = validateResourceVendorModelNumber(currentResource, updateInfoResource);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate vendor release before update");
-        eitherValidation = validateVendorReleaseName(null, updateInfoResource, null);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate contact info before update");
-        eitherValidation = validateContactId(null, updateInfoResource, null);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate derived before update");
-        eitherValidation = validateDerivedFromDuringUpdate(currentResource, updateInfoResource, hasBeenCertified);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
-
-        log.debug("validate category before update");
-        eitherValidation = validateCategory(currentResource, updateInfoResource, hasBeenCertified, inTransaction);
-        if (eitherValidation.isRight()) {
-            return eitherValidation;
-        }
+    private void validateResourceFieldsBeforeUpdate(Resource currentResource, Resource updateInfoResource,
+                                                    boolean inTransaction, boolean isNested) {
+        validateFields(currentResource, updateInfoResource, inTransaction, isNested);
+        warnNonEditableFields(currentResource, updateInfoResource);
+    }
 
-        // warn about non-updatable fields
+    private void warnNonEditableFields(Resource currentResource, Resource updateInfoResource) {
         String currentResourceVersion = currentResource.getVersion();
         String updatedResourceVersion = updateInfoResource.getVersion();
 
         if ((updatedResourceVersion != null) && (!updatedResourceVersion.equals(currentResourceVersion))) {
-            log.warn("Resource version is automatically set and cannot be updated");
+            log.debug("Resource version is automatically set and cannot be updated");
         }
 
         String currentCreatorUserId = currentResource.getCreatorUserId();
         String updatedCreatorUserId = updateInfoResource.getCreatorUserId();
 
         if ((updatedCreatorUserId != null) && (!updatedCreatorUserId.equals(currentCreatorUserId))) {
-            log.warn("Resource Creator UserId is automatically set and cannot be updated");
+            log.debug("Resource Creator UserId is automatically set and cannot be updated");
         }
 
         String currentCreatorFullName = currentResource.getCreatorFullName();
         String updatedCreatorFullName = updateInfoResource.getCreatorFullName();
 
         if ((updatedCreatorFullName != null) && (!updatedCreatorFullName.equals(currentCreatorFullName))) {
-            log.warn("Resource Creator fullname is automatically set and cannot be updated");
+            log.debug("Resource Creator fullname is automatically set and cannot be updated");
         }
 
         String currentLastUpdaterUserId = currentResource.getLastUpdaterUserId();
         String updatedLastUpdaterUserId = updateInfoResource.getLastUpdaterUserId();
 
         if ((updatedLastUpdaterUserId != null) && (!updatedLastUpdaterUserId.equals(currentLastUpdaterUserId))) {
-            log.warn("Resource LastUpdater userId is automatically set and cannot be updated");
+            log.debug("Resource LastUpdater userId is automatically set and cannot be updated");
         }
 
         String currentLastUpdaterFullName = currentResource.getLastUpdaterFullName();
         String updatedLastUpdaterFullName = updateInfoResource.getLastUpdaterFullName();
 
         if ((updatedLastUpdaterFullName != null) && (!updatedLastUpdaterFullName.equals(currentLastUpdaterFullName))) {
-            log.warn("Resource LastUpdater fullname is automatically set and cannot be updated");
+            log.debug("Resource LastUpdater fullname is automatically set and cannot be updated");
         }
 
         Long currentCreationDate = currentResource.getCreationDate();
         Long updatedCreationDate = updateInfoResource.getCreationDate();
 
         if ((updatedCreationDate != null) && (!updatedCreationDate.equals(currentCreationDate))) {
-            log.warn("Resource Creation date is automatically set and cannot be updated");
+            log.debug("Resource Creation date is automatically set and cannot be updated");
         }
 
         Long currentLastUpdateDate = currentResource.getLastUpdateDate();
         Long updatedLastUpdateDate = updateInfoResource.getLastUpdateDate();
 
         if ((updatedLastUpdateDate != null) && (!updatedLastUpdateDate.equals(currentLastUpdateDate))) {
-            log.warn("Resource last update date is automatically set and cannot be updated");
+            log.debug("Resource last update date is automatically set and cannot be updated");
         }
 
         LifecycleStateEnum currentLifecycleState = currentResource.getLifecycleState();
         LifecycleStateEnum updatedLifecycleState = updateInfoResource.getLifecycleState();
 
         if ((updatedLifecycleState != null) && (!updatedLifecycleState.equals(currentLifecycleState))) {
-            log.warn("Resource lifecycle state date is automatically set and cannot be updated");
+            log.debug("Resource lifecycle state date is automatically set and cannot be updated");
         }
 
         Boolean currentAbstract = currentResource.isAbstract();
         Boolean updatedAbstract = updateInfoResource.isAbstract();
 
         if ((updatedAbstract != null) && (!updatedAbstract.equals(currentAbstract))) {
-            log.warn("Resource abstract is automatically set and cannot be updated");
+            log.debug("Resource abstract is automatically set and cannot be updated");
         }
 
         Boolean currentHighestVersion = currentResource.isHighestVersion();
         Boolean updatedHighestVersion = updateInfoResource.isHighestVersion();
 
         if ((updatedHighestVersion != null) && (!updatedHighestVersion.equals(currentHighestVersion))) {
-            log.warn("Resource highest version is automatically set and cannot be updated");
+            log.debug("Resource highest version is automatically set and cannot be updated");
         }
 
         String currentUuid = currentResource.getUUID();
         String updatedUuid = updateInfoResource.getUUID();
 
         if ((updatedUuid != null) && (!updatedUuid.equals(currentUuid))) {
-            log.warn("Resource UUID is automatically set and cannot be updated");
+            log.debug("Resource UUID is automatically set and cannot be updated");
         }
 
         ResourceTypeEnum currentResourceType = currentResource.getResourceType();
         ResourceTypeEnum updatedResourceType = updateInfoResource.getResourceType();
 
         if ((updatedResourceType != null) && (!updatedResourceType.equals(currentResourceType))) {
-            log.warn("Resource Type  cannot be updated");
+            log.debug("Resource Type  cannot be updated");
 
         }
         updateInfoResource.setResourceType(currentResource.getResourceType());
@@ -5594,44 +4223,59 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         String updatedInvariantUuid = updateInfoResource.getInvariantUUID();
 
         if ((updatedInvariantUuid != null) && (!updatedInvariantUuid.equals(currentInvariantUuid))) {
-            log.warn("Resource invariant UUID is automatically set and cannot be updated");
+            log.debug("Resource invariant UUID is automatically set and cannot be updated");
             updateInfoResource.setInvariantUUID(currentInvariantUuid);
         }
-        return Either.left(true);
+    }
+
+    private void validateFields(Resource currentResource, Resource updateInfoResource, boolean inTransaction, boolean isNested) {
+        boolean hasBeenCertified = ValidationUtils.hasBeenCertified(currentResource.getVersion());
+        log.debug("validate resource name before update");
+        validateResourceName(currentResource, updateInfoResource, hasBeenCertified, isNested);
+        log.debug("validate description before update");
+        validateDescriptionAndCleanup(null, updateInfoResource, null);
+        log.debug("validate icon before update");
+        validateIcon(currentResource, updateInfoResource, hasBeenCertified);
+        log.debug("validate tags before update");
+        validateTagsListAndRemoveDuplicates(null, updateInfoResource, null);
+        log.debug("validate vendor name before update");
+        validateVendorName(null, updateInfoResource, null);
+        log.debug("validate resource vendor model number before update");
+        validateResourceVendorModelNumber(currentResource, updateInfoResource);
+        log.debug("validate vendor release before update");
+        validateVendorReleaseName(null, updateInfoResource, null);
+        log.debug("validate contact info before update");
+        validateContactId(null, updateInfoResource, null);
+        log.debug(VALIDATE_DERIVED_BEFORE_UPDATE);
+        validateDerivedFromDuringUpdate(currentResource, updateInfoResource, hasBeenCertified);
+        log.debug("validate category before update");
+        validateCategory(currentResource, updateInfoResource, hasBeenCertified, inTransaction);
     }
 
 
     private boolean isResourceNameEquals(Resource currentResource, Resource updateInfoResource) {
         String resourceNameUpdated = updateInfoResource.getName();
         String resourceNameCurrent = currentResource.getName();
-        if (resourceNameCurrent.equals(resourceNameUpdated))
+        if (resourceNameCurrent.equals(resourceNameUpdated)) {
             return true;
+        }
         // In case of CVFC type we should support the case of old VF with CVFC
         // instances that were created without the "Cvfc" suffix
         return currentResource.getResourceType().equals(ResourceTypeEnum.CVFC) &&
-               resourceNameUpdated.equals(addCvfcSuffixToResourceName(resourceNameCurrent));
+                resourceNameUpdated.equals(addCvfcSuffixToResourceName(resourceNameCurrent));
     }
 
     private String addCvfcSuffixToResourceName(String resourceName) {
         return resourceName + "Cvfc";
     }
 
-    private Either<Boolean, ResponseFormat> validateResourceName(Resource currentResource, Resource updateInfoResource,
-                                                                 boolean hasBeenCertified, boolean isNested) {
+    private void validateResourceName(Resource currentResource, Resource updateInfoResource,
+                                      boolean hasBeenCertified, boolean isNested) {
         String resourceNameUpdated = updateInfoResource.getName();
         if (!isResourceNameEquals(currentResource, updateInfoResource)) {
             if (isNested || !hasBeenCertified) {
-                Either<Boolean, ResponseFormat> validateResourceNameResponse = validateComponentName(null,
-                        updateInfoResource, null);
-                if (validateResourceNameResponse.isRight()) {
-                    ResponseFormat errorResponse = validateResourceNameResponse.right().value();
-                    return Either.right(errorResponse);
-                }
-                validateResourceNameResponse = validateResourceNameExists(updateInfoResource);
-                if (validateResourceNameResponse.isRight()) {
-                    ResponseFormat errorResponse = validateResourceNameResponse.right().value();
-                    return Either.right(errorResponse);
-                }
+                validateComponentName(null, updateInfoResource, null);
+                validateResourceNameUniqueness(updateInfoResource);
                 currentResource.setName(resourceNameUpdated);
                 currentResource.setNormalizedName(ValidationUtils.normaliseComponentName(resourceNameUpdated));
                 currentResource.setSystemName(ValidationUtils.convertToSystemName(resourceNameUpdated));
@@ -5639,82 +4283,35 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             } else {
                 log.info("Resource name: {}, cannot be updated once the resource has been certified once.",
                         resourceNameUpdated);
-                ResponseFormat errorResponse = componentsUtils
-                        .getResponseFormat(ActionStatus.RESOURCE_NAME_CANNOT_BE_CHANGED);
-                return Either.right(errorResponse);
+                throw new ComponentException(ActionStatus.RESOURCE_NAME_CANNOT_BE_CHANGED);
             }
         }
-        return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateIcon(Resource currentResource, Resource updateInfoResource,
-                                                         boolean hasBeenCertified) {
+    private void validateIcon(Resource currentResource, Resource updateInfoResource, boolean hasBeenCertified) {
         String iconUpdated = updateInfoResource.getIcon();
         String iconCurrent = currentResource.getIcon();
         if (!iconCurrent.equals(iconUpdated)) {
             if (!hasBeenCertified) {
-                Either<Boolean, ResponseFormat> validateIcon = validateIcon(null, updateInfoResource, null);
-                if (validateIcon.isRight()) {
-                    ResponseFormat errorResponse = validateIcon.right().value();
-                    return Either.right(errorResponse);
-                }
+                validateIcon(null, updateInfoResource, null);
             } else {
                 log.info("Icon {} cannot be updated once the resource has been certified once.", iconUpdated);
-                ResponseFormat errorResponse = componentsUtils
-                        .getResponseFormat(ActionStatus.RESOURCE_ICON_CANNOT_BE_CHANGED);
-                return Either.right(errorResponse);
+                throw new ComponentException(ActionStatus.RESOURCE_ICON_CANNOT_BE_CHANGED);
             }
         }
-        return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateVendorName(Resource currentResource, Resource updateInfoResource,
-                                                               boolean hasBeenCertified) {
-        String vendorNameUpdated = updateInfoResource.getVendorName();
-        String vendorNameCurrent = currentResource.getVendorName();
-        if (!vendorNameCurrent.equals(vendorNameUpdated)) {
-            if(updateInfoResource.getResourceType().equals(ResourceTypeEnum.VF) && hasBeenCertified ){
-                 log.info("Vendor name {} cannot be updated once the resource has been certified once.",
-                         vendorNameUpdated);
-                 ResponseFormat errorResponse = componentsUtils
-                         .getResponseFormat(ActionStatus.RESOURCE_VENDOR_NAME_CANNOT_BE_CHANGED);
-                 return Either.right(errorResponse);
-
-            }
-            else {
-                Either<Boolean, ResponseFormat> validateVendorName = validateVendorName(null, updateInfoResource, null);
-                if (validateVendorName.isRight()) {
-                    ResponseFormat errorResponse = validateVendorName.right().value();
-                    return Either.right(errorResponse);
-                }
-            }
-        }
-        return Either.left(true);
-    }
-
-    private Either<Boolean, ResponseFormat> validateResourceVendorModelNumber(Resource currentResource,
-                                                                              Resource updateInfoResource) {
+    private void validateResourceVendorModelNumber(Resource currentResource, Resource updateInfoResource) {
         String updatedResourceVendorModelNumber = updateInfoResource.getResourceVendorModelNumber();
         String currentResourceVendorModelNumber = currentResource.getResourceVendorModelNumber();
         if (!currentResourceVendorModelNumber.equals(updatedResourceVendorModelNumber)) {
-            Either<Boolean, ResponseFormat> validateResourceVendorModelNumber = validateResourceVendorModelNumber(null,
-                    updateInfoResource, null);
-            if (validateResourceVendorModelNumber.isRight()) {
-                ResponseFormat errorResponse = validateResourceVendorModelNumber.right().value();
-                return Either.right(errorResponse);
-            }
+            validateResourceVendorModelNumber(null, updateInfoResource, null);
         }
-        return Either.left(true);
     }
 
     private Either<Boolean, ResponseFormat> validateCategory(Resource currentResource, Resource updateInfoResource,
                                                              boolean hasBeenCertified, boolean inTransaction) {
-        Either<Boolean, ResponseFormat> validateCategoryName = validateCategory(null, updateInfoResource, null,
-                inTransaction);
-        if (validateCategoryName.isRight()) {
-            ResponseFormat errorResponse = validateCategoryName.right().value();
-            return Either.right(errorResponse);
-        }
+        validateCategory(null, updateInfoResource, null, inTransaction);
         if (hasBeenCertified) {
             CategoryDefinition currentCategory = currentResource.getCategories().get(0);
             SubCategoryDefinition currentSubCategory = currentCategory.getSubcategories().get(0);
@@ -5748,11 +4345,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
         if (!derivedFromCurrent.equals(derivedFromUpdated)) {
             if (!hasBeenCertified) {
-                Either<Boolean, ResponseFormat> validateDerivedFromExistsEither = validateDerivedFromExist(null,
-                        updateInfoResource, null);
-                if (validateDerivedFromExistsEither.isRight()) {
-                    return validateDerivedFromExistsEither;
-                }
+                validateDerivedFromExist(null, updateInfoResource, null);
             } else {
                 Either<Boolean, ResponseFormat> validateDerivedFromExtending = validateDerivedFromExtending(null,
                         currentResource, updateInfoResource, null);
@@ -5790,11 +4383,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
         if (!derivedFromCurrent.equals(derivedFromUpdated)) {
             if (!hasBeenCertified) {
-                Either<Boolean, ResponseFormat> validateDerivedFromExistsEither = validateDerivedFromExist(null,
-                        updateInfoResource, null);
-                if (validateDerivedFromExistsEither.isRight()) {
-                    return validateDerivedFromExistsEither;
-                }
+                validateDerivedFromExist(null, updateInfoResource, null);
             } else {
                 Either<Boolean, ResponseFormat> validateDerivedFromExtending = validateDerivedFromExtending(null,
                         currentResource, updateInfoResource, null);
@@ -5808,16 +4397,11 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateDerivedFromExist(User user, Resource resource,
-                                                                     AuditingActionEnum actionEnum) {
-
+    private void validateDerivedFromExist(User user, Resource resource,  AuditingActionEnum actionEnum) {
         if (resource.getDerivedFrom() == null || resource.getDerivedFrom().isEmpty()) {
-            return Either.left(true);
+            return;
         }
-
-
         String templateName = resource.getDerivedFrom().get(0);
-
         Either<Boolean, StorageOperationStatus> dataModelResponse = toscaOperationFacade
                 .validateToscaResourceNameExists(templateName);
         if (dataModelResponse.isRight()) {
@@ -5828,16 +4412,13 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     .getResponseFormatByResource(componentsUtils.convertFromStorageResponse(storageStatus), resource);
             log.trace("audit before sending response");
             componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-            return Either.right(responseFormat);
+            throw new ComponentException(componentsUtils.convertFromStorageResponse(storageStatus));
         } else if (!dataModelResponse.left().value()) {
             log.info("resource template with name: {}, does not exists", templateName);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.PARENT_RESOURCE_NOT_FOUND);
             componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-
-            return Either.right(responseFormat);
-
+            throw new ComponentException(ActionStatus.PARENT_RESOURCE_NOT_FOUND);
         }
-        return Either.left(true);
     }
 
     // Tal G for extending inheritance US815447
@@ -5872,8 +4453,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(true);
     }
 
-    public Either<Boolean, ResponseFormat> validateDerivedFromNotEmpty(User user, Resource resource,
-                                                                       AuditingActionEnum actionEnum) {
+    public void validateDerivedFromNotEmpty(User user, Resource resource, AuditingActionEnum actionEnum) {
         log.debug("validate resource derivedFrom field");
         if ((resource.getDerivedFrom() == null) || (resource.getDerivedFrom().isEmpty())
                 || (resource.getDerivedFrom().get(0)) == null || (resource.getDerivedFrom().get(0).trim().isEmpty())) {
@@ -5882,230 +4462,194 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                     .getResponseFormat(ActionStatus.MISSING_DERIVED_FROM_TEMPLATE);
             componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
 
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.MISSING_DERIVED_FROM_TEMPLATE);
         }
-        return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateResourceNameExists(Resource resource) {
+    private void validateResourceNameUniqueness(Resource resource) {
 
         Either<Boolean, StorageOperationStatus> resourceOperationResponse = toscaOperationFacade
                 .validateComponentNameExists(resource.getName(), resource.getResourceType(),
                         resource.getComponentType());
-        if (resourceOperationResponse.isLeft()) {
-            if (!resourceOperationResponse.left().value()) {
-                return Either.left(false);
-            } else {
-                log.debug("resource with name: {}, already exists", resource.getName());
-                ResponseFormat errorResponse = componentsUtils.getResponseFormat(
-                        ActionStatus.COMPONENT_NAME_ALREADY_EXIST, ComponentTypeEnum.RESOURCE.getValue(),
-                        resource.getName());
-                return Either.right(errorResponse);
-            }
+        if (resourceOperationResponse.isLeft() && resourceOperationResponse.left().value()) {
+            log.debug("resource with name: {}, already exists", resource.getName());
+            throw new ComponentException(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, ComponentTypeEnum.RESOURCE.getValue(),
+                    resource.getName());
+        } else if(resourceOperationResponse.isRight()){
+            log.debug("error while validateResourceNameExists for resource: {}", resource.getName());
+            throw new StorageException(resourceOperationResponse.right().value());
         }
-        log.debug("error while validateResourceNameExists for resource: {}", resource.getName());
-        ResponseFormat errorResponse = componentsUtils.getResponseFormat(
-                componentsUtils.convertFromStorageResponse(resourceOperationResponse.right().value()));
-        return Either.right(errorResponse);
     }
 
 
-    private Either<Boolean, ResponseFormat> validateCategory(User user, Resource resource,
-                                                             AuditingActionEnum actionEnum, boolean inTransaction) {
+    private void validateCategory(User user, Resource resource,
+                                  AuditingActionEnum actionEnum, boolean inTransaction) {
 
         List<CategoryDefinition> categories = resource.getCategories();
-        if (categories == null || categories.size() == 0) {
-            log.debug("Resource category is empty");
+        if (CollectionUtils.isEmpty(categories)) {
+            log.debug(CATEGORY_IS_EMPTY);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_CATEGORY,
                     ComponentTypeEnum.RESOURCE.getValue());
             componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_CATEGORY,
+                    ComponentTypeEnum.RESOURCE.getValue());
         }
         if (categories.size() > 1) {
             log.debug("Must be only one category for resource");
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-                    ActionStatus.COMPONENT_TOO_MUCH_CATEGORIES, ComponentTypeEnum.RESOURCE.getValue());
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.COMPONENT_TOO_MUCH_CATEGORIES, ComponentTypeEnum.RESOURCE.getValue());
         }
         CategoryDefinition category = categories.get(0);
         List<SubCategoryDefinition> subcategories = category.getSubcategories();
-        if (subcategories == null || subcategories.size() == 0) {
+        if (CollectionUtils.isEmpty(subcategories)) {
             log.debug("Missinig subcategory for resource");
-            ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(ActionStatus.COMPONENT_MISSING_SUBCATEGORY);
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_SUBCATEGORY);
         }
         if (subcategories.size() > 1) {
             log.debug("Must be only one sub category for resource");
-            ResponseFormat responseFormat = componentsUtils
-                    .getResponseFormat(ActionStatus.RESOURCE_TOO_MUCH_SUBCATEGORIES);
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.RESOURCE_TOO_MUCH_SUBCATEGORIES);
         }
 
         SubCategoryDefinition subcategory = subcategories.get(0);
 
         if (!ValidationUtils.validateStringNotEmpty(category.getName())) {
-            log.debug("Resource category is empty");
+            log.debug(CATEGORY_IS_EMPTY);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_CATEGORY,
                     ComponentTypeEnum.RESOURCE.getValue());
             componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_CATEGORY,
+                    ComponentTypeEnum.RESOURCE.getValue());
         }
         if (!ValidationUtils.validateStringNotEmpty(subcategory.getName())) {
-            log.debug("Resource category is empty");
+            log.debug(CATEGORY_IS_EMPTY);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(
                     ActionStatus.COMPONENT_MISSING_SUBCATEGORY, ComponentTypeEnum.RESOURCE.getValue());
             componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-            return Either.right(responseFormat);
-        }
-
-        Either<Boolean, ResponseFormat> validateCategory = validateCategoryListed(category, subcategory, inTransaction);
-        if (validateCategory.isRight()) {
-            ResponseFormat responseFormat = validateCategory.right().value();
-            componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.COMPONENT_MISSING_SUBCATEGORY, ComponentTypeEnum.RESOURCE.getValue());
         }
 
-        return Either.left(true);
+        validateCategoryListed(category, subcategory, user, resource, actionEnum, inTransaction);
     }
 
-    private Either<Boolean, ResponseFormat> validateCategoryListed(CategoryDefinition category,
-                                                                   SubCategoryDefinition subcategory, boolean inTransaction) {
+    private void validateCategoryListed(CategoryDefinition category, SubCategoryDefinition subcategory,
+                                        User user, Resource resource, AuditingActionEnum actionEnum, boolean inTransaction) {
+        ResponseFormat responseFormat;
         if (category != null && subcategory != null) {
             log.debug("validating resource category {} against valid categories list", category);
             Either<List<CategoryDefinition>, ActionStatus> categories = elementDao
                     .getAllCategories(NodeTypeEnum.ResourceNewCategory, inTransaction);
             if (categories.isRight()) {
                 log.debug("failed to retrive resource categories from Titan");
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(categories.right().value());
-                return Either.right(responseFormat);
+                responseFormat = componentsUtils.getResponseFormat(categories.right().value());
+                componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
+                throw new ComponentException(categories.right().value());
             }
             List<CategoryDefinition> categoryList = categories.left().value();
-            for (CategoryDefinition cat : categoryList) {
-                if (cat.getName().equals(category.getName())) {
-                    for (SubCategoryDefinition subcat : cat.getSubcategories()) {
-                        if (subcat.getName().equals(subcategory.getName())) {
-                            return Either.left(true);
-                        }
-                    }
-                    log.debug(
-                            "SubCategory {} is not part of resource category group. Resource subcategory valid values are {}",
-                            subcategory, cat.getSubcategories());
-                    return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_CATEGORY,
-                            ComponentTypeEnum.RESOURCE.getValue()));
-                }
+            Optional<CategoryDefinition> foundCategory = categoryList.stream()
+                    .filter(cat -> cat.getName().equals(category.getName()))
+                    .findFirst();
+            if(!foundCategory.isPresent()){
+                log.debug("Category {} is not part of resource category group. Resource category valid values are {}",
+                        category, categoryList);
+                failOnInvalidCategory(user, resource, actionEnum);
+            }
+            Optional<SubCategoryDefinition> foundSubcategory = foundCategory.get()
+                    .getSubcategories()
+                    .stream()
+                    .filter(subcat -> subcat.getName().equals(subcategory.getName()))
+                    .findFirst();
+            if(!foundSubcategory.isPresent()){
+                log.debug("SubCategory {} is not part of resource category group. Resource subcategory valid values are {}",
+                        subcategory, foundCategory.get().getSubcategories());
+                failOnInvalidCategory(user, resource, actionEnum);
             }
-            log.debug("Category {} is not part of resource category group. Resource category valid values are {}",
-                    category, categoryList);
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_CATEGORY,
-                    ComponentTypeEnum.RESOURCE.getValue()));
         }
-        return Either.left(false);
     }
 
-    public Either<Boolean, ResponseFormat> validateVendorReleaseName(User user, Resource resource,
-                                                                     AuditingActionEnum actionEnum) {
-        String vendorRelease = resource.getVendorRelease();
+    private void failOnInvalidCategory(User user, Resource resource, AuditingActionEnum actionEnum) {
+        ResponseFormat responseFormat;
+        responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INVALID_CATEGORY,
+                ComponentTypeEnum.RESOURCE.getValue());
+        componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
+        throw new ComponentException(ActionStatus.COMPONENT_INVALID_CATEGORY,
+                ComponentTypeEnum.RESOURCE.getValue());
+    }
 
+    public void validateVendorReleaseName(User user, Resource resource, AuditingActionEnum actionEnum) {
+        String vendorRelease = resource.getVendorRelease();
         log.debug("validate vendor relese name");
         if (!ValidationUtils.validateStringNotEmpty(vendorRelease)) {
             log.info("vendor relese name is missing.");
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.MISSING_VENDOR_RELEASE);
             componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
-            return Either.right(errorResponse);
+            throw new ComponentException(ActionStatus.MISSING_VENDOR_RELEASE);
         }
 
-        Either<Boolean, ResponseFormat> validateVendorReleaseResponse = validateVendorReleaseName(vendorRelease);
-        if (validateVendorReleaseResponse.isRight()) {
-            ResponseFormat responseFormat = validateVendorReleaseResponse.right().value();
-            componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-        }
-        return validateVendorReleaseResponse;
+        validateVendorReleaseName(vendorRelease, user, resource, actionEnum);
     }
 
-    public Either<Boolean, ResponseFormat> validateVendorReleaseName(String vendorRelease) {
+    public void validateVendorReleaseName(String vendorRelease, User user, Resource resource, AuditingActionEnum actionEnum) {
         if (vendorRelease != null) {
             if (!ValidationUtils.validateVendorReleaseLength(vendorRelease)) {
                 log.info("vendor release exceds limit.");
                 ResponseFormat errorResponse = componentsUtils.getResponseFormat(
                         ActionStatus.VENDOR_RELEASE_EXCEEDS_LIMIT, "" + ValidationUtils.VENDOR_RELEASE_MAX_LENGTH);
-                return Either.right(errorResponse);
+                componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
+                throw new ComponentException(ActionStatus.VENDOR_RELEASE_EXCEEDS_LIMIT, "" + ValidationUtils.VENDOR_RELEASE_MAX_LENGTH);
             }
 
             if (!ValidationUtils.validateVendorRelease(vendorRelease)) {
                 log.info("vendor release  is not valid.");
                 ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_VENDOR_RELEASE);
-                return Either.right(errorResponse);
+                componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
+                throw new ComponentException(ActionStatus.INVALID_VENDOR_RELEASE);
             }
-            return Either.left(true);
         }
-        return Either.left(false);
-
     }
 
-    private Either<Boolean, ResponseFormat> validateVendorName(User user, Resource resource,
-                                                               AuditingActionEnum actionEnum) {
+    private void validateVendorName(User user, Resource resource,
+                                    AuditingActionEnum actionEnum) {
         String vendorName = resource.getVendorName();
         if (!ValidationUtils.validateStringNotEmpty(vendorName)) {
             log.info("vendor name is missing.");
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.MISSING_VENDOR_NAME);
             componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
-            return Either.right(errorResponse);
-        }
-
-        Either<Boolean, ResponseFormat> validateVendorNameResponse = validateVendorName(vendorName);
-        if (validateVendorNameResponse.isRight()) {
-            ResponseFormat responseFormat = validateVendorNameResponse.right().value();
-            componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
+            throw new ComponentException(ActionStatus.MISSING_VENDOR_NAME);
         }
-        return validateVendorNameResponse;
-
-    }
-
-    private Either<Boolean, ResponseFormat> validateResourceVendorModelNumber(User user, Resource resource,
-                                                                              AuditingActionEnum actionEnum) {
-        String resourceVendorModelNumber = resource.getResourceVendorModelNumber();
-        Either<Boolean, ResponseFormat> validateResourceVendorModelNumber = validateResourceVendorModelNumber(
-                resourceVendorModelNumber);
-        if (validateResourceVendorModelNumber.isRight()) {
-            ResponseFormat responseFormat = validateResourceVendorModelNumber.right().value();
-            componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
-        }
-        return validateResourceVendorModelNumber;
-
+        validateVendorName(vendorName, user, resource, actionEnum);
     }
 
-    private Either<Boolean, ResponseFormat> validateVendorName(String vendorName) {
+    private void validateVendorName(String vendorName, User user, Resource resource,
+                                    AuditingActionEnum actionEnum) {
         if (vendorName != null) {
             if (!ValidationUtils.validateVendorNameLength(vendorName)) {
                 log.info("vendor name exceds limit.");
                 ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.VENDOR_NAME_EXCEEDS_LIMIT,
                         "" + ValidationUtils.VENDOR_NAME_MAX_LENGTH);
-                return Either.right(errorResponse);
+                componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
+                throw new ComponentException(ActionStatus.VENDOR_NAME_EXCEEDS_LIMIT,
+                        "" + ValidationUtils.VENDOR_NAME_MAX_LENGTH);
             }
 
             if (!ValidationUtils.validateVendorName(vendorName)) {
                 log.info("vendor name  is not valid.");
                 ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_VENDOR_NAME);
-                return Either.right(errorResponse);
+                componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
+                throw new ComponentException(ActionStatus.INVALID_VENDOR_NAME);
             }
-            return Either.left(true);
-
         }
-        return Either.left(false);
-
     }
 
-    private Either<Boolean, ResponseFormat> validateResourceVendorModelNumber(String resourceVendorModelNumber) {
-        if (StringUtils.isEmpty(resourceVendorModelNumber)) {
-            return Either.left(true);
-        } else {
+    private void validateResourceVendorModelNumber(User user, Resource resource, AuditingActionEnum actionEnum) {
+        String resourceVendorModelNumber = resource.getResourceVendorModelNumber();
+        if (StringUtils.isNotEmpty(resourceVendorModelNumber)) {
             if (!ValidationUtils.validateResourceVendorModelNumberLength(resourceVendorModelNumber)) {
                 log.info("resource vendor model number exceeds limit.");
                 ResponseFormat errorResponse = componentsUtils.getResponseFormat(
                         ActionStatus.RESOURCE_VENDOR_MODEL_NUMBER_EXCEEDS_LIMIT,
                         "" + ValidationUtils.RESOURCE_VENDOR_MODEL_NUMBER_MAX_LENGTH);
-                return Either.right(errorResponse);
+                componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
+                throw new ComponentException(ActionStatus.RESOURCE_VENDOR_MODEL_NUMBER_EXCEEDS_LIMIT,
+                        "" + ValidationUtils.RESOURCE_VENDOR_MODEL_NUMBER_MAX_LENGTH);
             }
             // resource vendor model number is currently validated as vendor
             // name
@@ -6113,49 +4657,45 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 log.info("resource vendor model number  is not valid.");
                 ResponseFormat errorResponse = componentsUtils
                         .getResponseFormat(ActionStatus.INVALID_RESOURCE_VENDOR_MODEL_NUMBER);
-                return Either.right(errorResponse);
+                componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
+                throw new ComponentException(ActionStatus.INVALID_RESOURCE_VENDOR_MODEL_NUMBER);
             }
-            return Either.left(true);
         }
     }
 
 
-    private Either<Boolean, ResponseFormat> validateCost(User user, Resource resource, AuditingActionEnum actionEnum) {
+    private void validateCost(Resource resource) {
         String cost = resource.getCost();
         if (cost != null) {
-
             if (!ValidationUtils.validateCost(cost)) {
                 log.debug("resource cost is invalid.");
-                ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
-                return Either.right(errorResponse);
+                throw new ComponentException(ActionStatus.INVALID_CONTENT);
             }
         }
-        return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateLicenseType(User user, Resource resource,
-                                                                AuditingActionEnum actionEnum) {
+    private void validateLicenseType(User user, Resource resource,
+                                     AuditingActionEnum actionEnum) {
         log.debug("validate licenseType");
         String licenseType = resource.getLicenseType();
         if (licenseType != null) {
             List<String> licenseTypes = ConfigurationManager.getConfigurationManager().getConfiguration()
                     .getLicenseTypes();
             if (!licenseTypes.contains(licenseType)) {
-                log.debug("License type {} isn't configured");
+                log.debug("License type {} isn't configured", licenseType);
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT);
                 if (actionEnum != null) {
                     // In update case, no audit is required
                     componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
                 }
-                return Either.right(responseFormat);
+                throw new ComponentException(ActionStatus.INVALID_CONTENT);
             }
         }
-        return Either.left(true);
     }
 
     private Either<Boolean, ResponseFormat> processUpdateOfDerivedFrom(Resource currentResource,
-                                                                       Resource updatedResource, String userId, boolean shouldLock, boolean inTransaction) {
-        Either<Operation, ResponseFormat> deleteArtifactByInterface = null;
+                                                                       Resource updatedResource, String userId, boolean inTransaction) {
+        Either<Operation, ResponseFormat> deleteArtifactByInterface;
         if (updatedResource.getDerivedFrom() != null) {
             log.debug("Starting derived from update for resource {}", updatedResource.getUniqueId());
             log.debug("1. Removing interface artifacts from graph");
@@ -6206,8 +4746,9 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             if (findPropertiesOfNode.isRight()
                     && !findPropertiesOfNode.right().value().equals(StorageOperationStatus.OK)) {
                 log.debug("Failed to remove all properties of resource");
-                if (!inTransaction)
+                if (!inTransaction) {
                     titanDao.rollback();
+                }
                 return Either.right(componentsUtils.getResponseFormat(
                         componentsUtils.convertFromStorageResponse(findPropertiesOfNode.right().value())));
             }
@@ -6216,8 +4757,10 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
             log.debug("Derived from wasn't changed during update");
         }
 
-        if (!inTransaction)
-            titanDao.commit();
+        if (inTransaction) {
+            return Either.left(true);
+        }
+        titanDao.commit();
         return Either.left(true);
 
     }
@@ -6245,57 +4788,74 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         log.debug("validate resource properties default values");
         Either<Boolean, ResponseFormat> eitherResult = Either.left(true);
         List<PropertyDefinition> properties = resource.getProperties();
+        if (properties != null) {
+            eitherResult = iterateOverProperties(properties);
+        }
+        return eitherResult;
+    }
+
+    public Either<Boolean, ResponseFormat> iterateOverProperties(List<PropertyDefinition> properties){
+        Either<Boolean, ResponseFormat> eitherResult = Either.left(true);
         String type = null;
         String innerType = null;
-        if (properties != null) {
-            for (PropertyDefinition property : properties) {
-                if (!propertyOperation.isPropertyTypeValid(property)) {
-                    log.info("Invalid type for property");
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-                            ActionStatus.INVALID_PROPERTY_TYPE, property.getType(), property.getName());
-                    eitherResult = Either.right(responseFormat);
-                    break;
-                }
+        for (PropertyDefinition property : properties) {
+            if (!propertyOperation.isPropertyTypeValid(property)) {
+                log.info("Invalid type for property {}", property);
+                ResponseFormat responseFormat = componentsUtils.getResponseFormat(
+                        ActionStatus.INVALID_PROPERTY_TYPE, property.getType(), property.getName());
+                eitherResult = Either.right(responseFormat);
+                break;
+            }
 
-                Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes = getAllDataTypes(
-                        applicationDataTypeCache);
-                if (allDataTypes.isRight()) {
-                    return Either.right(allDataTypes.right().value());
-                }
+            Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes = getAllDataTypes(
+                    applicationDataTypeCache);
+            if (allDataTypes.isRight()) {
+                return Either.right(allDataTypes.right().value());
+            }
 
-                type = property.getType();
-                if (type.equals(ToscaPropertyType.LIST.getType()) || type.equals(ToscaPropertyType.MAP.getType())) {
-                    ImmutablePair<String, Boolean> propertyInnerTypeValid = propertyOperation
-                            .isPropertyInnerTypeValid(property, allDataTypes.left().value());
-                    innerType = propertyInnerTypeValid.getLeft();
-                    if (!propertyInnerTypeValid.getRight().booleanValue()) {
-                        log.info("Invalid inner type for property");
-                        ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-                                ActionStatus.INVALID_PROPERTY_INNER_TYPE, innerType, property.getName());
-                        eitherResult = Either.right(responseFormat);
-                        break;
-                    }
-                }
+            type = property.getType();
 
-                if (!propertyOperation.isPropertyDefaultValueValid(property, allDataTypes.left().value())) {
-                    log.info("Invalid default value for property");
-                    ResponseFormat responseFormat;
-                    if (type.equals(ToscaPropertyType.LIST.getType()) || type.equals(ToscaPropertyType.MAP.getType())) {
-                        responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_COMPLEX_DEFAULT_VALUE,
-                                property.getName(), type, innerType, property.getDefaultValue());
-                    } else {
-                        responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_DEFAULT_VALUE,
-                                property.getName(), type, property.getDefaultValue());
-                    }
-                    eitherResult = Either.right(responseFormat);
+            if (type.equals(ToscaPropertyType.LIST.getType()) || type.equals(ToscaPropertyType.MAP.getType())) {
+                ResponseFormat responseFormat = validateMapOrListPropertyType(property, innerType, allDataTypes.left().value());
+                if(responseFormat != null) {
                     break;
-
                 }
             }
+            eitherResult = validateDefaultPropertyValue(property, allDataTypes.left().value(), type, innerType);
         }
         return eitherResult;
     }
 
+    private Either<Boolean,ResponseFormat> validateDefaultPropertyValue(PropertyDefinition property, Map<String, DataTypeDefinition> allDataTypes, String type, String innerType) {
+        if (!propertyOperation.isPropertyDefaultValueValid(property, allDataTypes)) {
+            log.info("Invalid default value for property {}", property);
+            ResponseFormat responseFormat;
+            if (type.equals(ToscaPropertyType.LIST.getType()) || type.equals(ToscaPropertyType.MAP.getType())) {
+                responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_COMPLEX_DEFAULT_VALUE,
+                        property.getName(), type, innerType, property.getDefaultValue());
+            } else {
+                responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_DEFAULT_VALUE,
+                        property.getName(), type, property.getDefaultValue());
+            }
+            return Either.right(responseFormat);
+
+        }
+        return Either.left(true);
+    }
+
+    private ResponseFormat validateMapOrListPropertyType(PropertyDefinition property, String innerType, Map<String, DataTypeDefinition> allDataTypes) {
+        ResponseFormat responseFormat = null;
+        ImmutablePair<String, Boolean> propertyInnerTypeValid = propertyOperation
+                .isPropertyInnerTypeValid(property, allDataTypes);
+        innerType = propertyInnerTypeValid.getLeft();
+        if (!propertyInnerTypeValid.getRight().booleanValue()) {
+            log.info("Invalid inner type for property {}", property);
+            responseFormat = componentsUtils.getResponseFormat(
+                    ActionStatus.INVALID_PROPERTY_INNER_TYPE, innerType, property.getName());
+        }
+        return responseFormat;
+    }
+
     @Override
     public Either<List<String>, ResponseFormat> deleteMarkedComponents() {
         return deleteMarkedComponents(ComponentTypeEnum.RESOURCE);
@@ -6314,205 +4874,12 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return componentTypeForResponse;
     }
 
-    private Either<Map<String, GroupDefinition>, ResponseFormat> createGroupsFromYaml(String yamlFileName,
-                                                                                      Map<String, Object> toscaJson, Resource resource) {
-
-        Map<String, GroupDefinition> groups = new HashMap<String, GroupDefinition>();
-        Either<Map<String, GroupDefinition>, ResponseFormat> result = Either.left(groups);
-
-        Either<Map<String, Object>, ResultStatusEnum> eitherNodesTemlates = ImportUtils
-                .findFirstToscaMapElement(toscaJson, ToscaTagNamesEnum.GROUPS);
-        if (eitherNodesTemlates.isLeft()) {
-            Map<String, Object> jsonNodeTemplates = eitherNodesTemlates.left().value();
-
-            if (jsonNodeTemplates != null && false == jsonNodeTemplates.isEmpty()) {
-                Iterator<Entry<String, Object>> nodesNameValue = jsonNodeTemplates.entrySet().iterator();
-                while (nodesNameValue.hasNext()) {
-                    Entry<String, Object> groupNameValue = nodesNameValue.next();
-
-                    String groupName = groupNameValue.getKey();
-                    Either<GroupDefinition, ResponseFormat> eitherNode = createGroupInfo(groupName,
-                            groupNameValue.getValue());
-                    if (eitherNode.isRight()) {
-                        String message = "Failed when creating group: " + groupNameValue.getKey() + " for resource:"
-                                + resource.getName();
-                        BeEcompErrorManager.getInstance().logInternalFlowError("ImportResource", message,
-                                ErrorSeverity.INFO);
-                        return Either.right(eitherNode.right().value());
-                    } else {
-                        GroupDefinition groupDefinition = eitherNode.left().value();
-                        groups.put(groupName, groupDefinition);
-                    }
-                }
-            }
-        }
-
-        return result;
-    }
-
-    private Either<Map<String, InputDefinition>, ResponseFormat> createInputsFromYaml(String yamlFileName,
-                                                                                      Map<String, Object> toscaJson, Resource resource) {
-
-        Either<Map<String, InputDefinition>, ResultStatusEnum> inputs = ImportUtils.getInputs(toscaJson);
-        if (inputs.isRight()) {
-            String message = "Failed when creating inputs:  for resource:" + resource.getName();
-            BeEcompErrorManager.getInstance().logInternalFlowError("ImportResource", message, ErrorSeverity.INFO);
-            Map<String, InputDefinition> resultMap = new HashMap<>();
-            return Either.left(resultMap);
-
-        }
-
-        Either<Map<String, InputDefinition>, ResponseFormat> result = Either.left(inputs.left().value());
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Either<GroupDefinition, ResponseFormat> createGroupInfo(String groupName, Object groupTemplateJson) {
-
-        GroupDefinition groupInfo = new GroupDefinition();
-        groupInfo.setName(groupName);
-        Either<GroupDefinition, ResponseFormat> result = Either.left(groupInfo);
-
-        try {
-            if (groupTemplateJson != null && groupTemplateJson instanceof Map) {
-                Map<String, Object> groupTemplateJsonMap = (Map<String, Object>) groupTemplateJson;
-                String groupType = (String) groupTemplateJsonMap.get(ToscaTagNamesEnum.TYPE.getElementName());
-                if (!StringUtils.isEmpty(groupType)) {
-                    groupInfo.setType(groupType);
-                } else {
-                    log.debug("The 'type' member is not found under group {}", groupName);
-                    return Either
-                            .right(componentsUtils.getResponseFormat(ActionStatus.GROUP_MISSING_GROUP_TYPE, groupName));
-                }
-
-                if (groupTemplateJsonMap.containsKey(ToscaTagNamesEnum.DESCRIPTION.getElementName())) {
-                    groupInfo.setDescription(
-                            (String) groupTemplateJsonMap.get(ToscaTagNamesEnum.DESCRIPTION.getElementName()));
-                }
-
-                if (groupTemplateJsonMap.containsKey(ToscaTagNamesEnum.MEMBERS.getElementName())) {
-                    Object members = groupTemplateJsonMap.get(ToscaTagNamesEnum.MEMBERS.getElementName());
-                    if (members != null) {
-                        if (members instanceof List) {
-                            Map<String, String> membersLoaded = new HashMap<>();
-                            List<?> membersAsList = (List<?>) members;
-                            for (Object member : membersAsList) {
-                                membersLoaded.put(member.toString(), "");
-                            }
-                            groupInfo.setMembers(membersLoaded);
-                        } else {
-                            log.debug("The 'members' member is not of type list under group {}", groupName);
-                            return Either
-                                    .right(componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE));
-                        }
-                    }
-                }
-
-                if (groupTemplateJsonMap.containsKey(ToscaTagNamesEnum.PROPERTIES.getElementName())) {
-                    Object properties = groupTemplateJsonMap.get(ToscaTagNamesEnum.PROPERTIES.getElementName());
-
-                    Either<List<GroupProperty>, ResponseFormat> regResponse = createPropertiesValueModuleFromYaml(
-                            properties, groupName, groupType);
-                    if (regResponse.isRight())
-                        return Either.right(regResponse.right().value());
-                    if (regResponse.left().value().size() > 0) {
-                        groupInfo.convertFromGroupProperties(regResponse.left().value());
-                    }
-                }
-
-            } else {
-                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE));
-            }
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeSystemError("Import Resource - create group");
-            log.debug("error when creating group, message:{}", e.getMessage(), e);
-            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML));
-        }
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private Either<List<GroupProperty>, ResponseFormat> createPropertiesValueModuleFromYaml(Object properties,
-                                                                                            String groupName, String groupType) {
-
-        List<GroupProperty> result = new ArrayList<>();
-
-        if (properties == null) {
-            return Either.left(result);
-        }
-
-        Either<GroupTypeDefinition, StorageOperationStatus> groupTypeRes = groupTypeOperation
-                .getLatestGroupTypeByType(groupType, true);
-
-        if (groupTypeRes.isRight()) {
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.GROUP_TYPE_IS_INVALID, groupType));
-        }
-
-        Map<String, PropertyDefinition> gtProperties = new HashMap<>();
-        GroupTypeDefinition groupTypeDefinition = groupTypeRes.left().value();
-
-        List<PropertyDefinition> propertiesDef = groupTypeDefinition.getProperties();
-
-        if (propertiesDef != null) {
-            gtProperties = propertiesDef.stream().collect(Collectors.toMap(p -> p.getName(), p -> p));
-        }
-
-        if (properties != null) {
-
-            if (properties instanceof Map) {
-
-                Map<String, Object> props = (Map<String, Object>) properties;
-                for (Entry<String, Object> entry : props.entrySet()) {
-
-                    String propName = entry.getKey();
-                    Object value = entry.getValue();
-
-                    PropertyDefinition gtDefinition = gtProperties.get(propName);
-                    if (gtDefinition == null) {
-                        return Either.right(componentsUtils.getResponseFormat(ActionStatus.GROUP_PROPERTY_NOT_FOUND,
-                                propName, groupName, groupType));
-                    }
-
-                    ToscaPropertyType type = ToscaPropertyType.isValidType(gtDefinition.getType());
-
-                    String convertedValue = null;
-                    if (value != null) {
-                        if (type == null || value instanceof Map || value instanceof List) {
-                            convertedValue = gson.toJson(value);
-                        } else {
-                            convertedValue = value.toString();
-                        }
-                    }
-
-                    GroupProperty groupProperty = new GroupProperty();
-                    groupProperty.setValue(convertedValue);
-                    groupProperty.setName(propName);
-
-                    log.trace("After building group property {}", groupProperty);
-
-                    result.add(groupProperty);
-                }
-
-            }
-
-        }
-
-        return Either.left(result);
-    }
-
     public Either<Resource, ResponseFormat> getLatestResourceFromCsarUuid(String csarUuid, User user) {
-
         // validate user
         if (user != null) {
-            Either<User, ResponseFormat> userValidation = validateUserExists(user, "Get resource from csar UUID",
+            validateUserExists(user, "Get resource from csar UUID",
                     false);
-            if (userValidation.isRight()) {
-                return Either.right(userValidation.right().value());
-            }
         }
-
         // get resource from csar uuid
         Either<Resource, StorageOperationStatus> either = toscaOperationFacade
                 .getLatestComponentByCsarOrName(ComponentTypeEnum.RESOURCE, csarUuid, "");
@@ -6527,91 +4894,92 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 
     @Override
     public Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(
-            String componentId, ComponentTypeEnum componentTypeEnum, String userId, String searchText) {
+            String componentId, String userId) {
         return null;
     }
 
-    private Either<Map<String, List<CapabilityDefinition>>, ResponseFormat> getValidComponentInstanceCapabilities(
+    private Map<String, List<CapabilityDefinition>> getValidComponentInstanceCapabilities(
             String resourceId, Map<String, List<CapabilityDefinition>> defaultCapabilities,
             Map<String, List<UploadCapInfo>> uploadedCapabilities) {
-        ResponseFormat responseFormat;
+
         Map<String, List<CapabilityDefinition>> validCapabilitiesMap = new HashMap<>();
+        uploadedCapabilities.forEach((k,v)->addValidComponentInstanceCapabilities(k,v,resourceId,defaultCapabilities,validCapabilitiesMap));
+        return validCapabilitiesMap;
+    }
+
+    private void addValidComponentInstanceCapabilities(String key, List<UploadCapInfo> capabilities, String resourceId, Map<String, List<CapabilityDefinition>> defaultCapabilities, Map<String, List<CapabilityDefinition>> validCapabilitiesMap){
+        String capabilityType = capabilities.get(0).getType();
+        if (defaultCapabilities.containsKey(capabilityType)) {
+            CapabilityDefinition defaultCapability = getCapability(resourceId, defaultCapabilities, capabilityType);
+            validateCapabilityProperties(capabilities, resourceId, defaultCapability);
+            List<CapabilityDefinition> validCapabilityList = new ArrayList<>();
+            validCapabilityList.add(defaultCapability);
+            validCapabilitiesMap.put(key, validCapabilityList);
+        } else {
+            throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE, capabilityType));
+        }
+    }
 
-        for (Entry<String, List<UploadCapInfo>> uploadedCapabilitiesEntry : uploadedCapabilities.entrySet()) {
-            String capabilityType = uploadedCapabilitiesEntry.getValue().get(0).getType();
-            if (!defaultCapabilities.containsKey(capabilityType)) {
-                responseFormat = componentsUtils.getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE,
-                        capabilityType);
-                return Either.right(responseFormat);
-            } else {
-                CapabilityDefinition defaultCapability;
-                if (CollectionUtils.isNotEmpty(defaultCapabilities.get(capabilityType).get(0).getProperties())) {
-                    defaultCapability = defaultCapabilities.get(capabilityType).get(0);
-                } else {
-                    Either<Component, StorageOperationStatus> getFullComponentRes = toscaOperationFacade
-                            .getToscaFullElement(resourceId);
-                    if (getFullComponentRes.isRight()) {
-                        log.debug("Failed to get full component {}. Status is {}. ", resourceId,
-                                getFullComponentRes.right().value());
-                        responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NOT_FOUND,
-                                resourceId);
-                        return Either.right(responseFormat);
-                    }
-                    defaultCapability = getFullComponentRes.left().value().getCapabilities().get(capabilityType).get(0);
-                }
-                if (CollectionUtils.isEmpty(defaultCapability.getProperties())
-                        && CollectionUtils.isNotEmpty(uploadedCapabilitiesEntry.getValue().get(0).getProperties())) {
-                    log.debug("Failed to validate capability {} of component {}. Property list is empty. ",
-                            defaultCapability.getName(), resourceId);
-                    log.debug(
-                            "Failed to update capability property values. Property list of fetched capability {} is empty. ",
-                            defaultCapability.getName());
-                    responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND, resourceId);
-                    return Either.right(responseFormat);
-                }
-                if (CollectionUtils.isNotEmpty(defaultCapability.getProperties())
-                        && CollectionUtils.isNotEmpty(uploadedCapabilitiesEntry.getValue().get(0).getProperties())) {
-                    Either<Boolean, String> validationRes = validateUniquenessUpdateUploadedComponentInstanceCapability(
-                            defaultCapability, uploadedCapabilitiesEntry.getValue().get(0));
-                    if (validationRes.isRight()) {
-                        responseFormat = componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NAME_ALREADY_EXISTS,
-                                validationRes.right().value());
-                        return Either.right(responseFormat);
-                    }
-                }
-                List<CapabilityDefinition> validCapabilityList = new ArrayList<>();
-                validCapabilityList.add(defaultCapability);
-                validCapabilitiesMap.put(uploadedCapabilitiesEntry.getKey(), validCapabilityList);
+    private void validateCapabilityProperties(List<UploadCapInfo> capabilities, String resourceId, CapabilityDefinition defaultCapability) {
+        if (CollectionUtils.isEmpty(defaultCapability.getProperties())
+                && isNotEmpty(capabilities.get(0).getProperties())) {
+            log.debug("Failed to validate capability {} of component {}. Property list is empty. ",
+                    defaultCapability.getName(), resourceId);
+            log.debug(
+                    "Failed to update capability property values. Property list of fetched capability {} is empty. ",
+                    defaultCapability.getName());
+            throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND, resourceId));
+        } else if (isNotEmpty(capabilities.get(0).getProperties())) {
+            validateUniquenessUpdateUploadedComponentInstanceCapability(defaultCapability, capabilities.get(0));
+        }
+    }
+
+    private CapabilityDefinition getCapability(String resourceId, Map<String, List<CapabilityDefinition>> defaultCapabilities, String capabilityType) {
+        CapabilityDefinition defaultCapability;
+        if (isNotEmpty(defaultCapabilities.get(capabilityType).get(0).getProperties())) {
+            defaultCapability = defaultCapabilities.get(capabilityType).get(0);
+        } else {
+            Either<Component, StorageOperationStatus> getFullComponentRes = toscaOperationFacade
+                    .getToscaFullElement(resourceId);
+            if (getFullComponentRes.isRight()) {
+                log.debug("Failed to get full component {}. Status is {}. ", resourceId,
+                        getFullComponentRes.right().value());
+                throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NOT_FOUND,
+                        resourceId));
             }
+            defaultCapability = getFullComponentRes.left().value().getCapabilities().get(capabilityType).get(0);
         }
-        return Either.left(validCapabilitiesMap);
+        return defaultCapability;
     }
 
-    private Either<Boolean, String> validateUniquenessUpdateUploadedComponentInstanceCapability(
+    private void validateUniquenessUpdateUploadedComponentInstanceCapability(
             CapabilityDefinition defaultCapability, UploadCapInfo uploadedCapability) {
         List<ComponentInstanceProperty> validProperties = new ArrayList<>();
         Map<String, PropertyDefinition> defaultProperties = defaultCapability.getProperties().stream()
-                .collect(Collectors.toMap(PropertyDefinition::getName, Function.identity()));
+                .collect(toMap(PropertyDefinition::getName, Function.identity()));
         List<UploadPropInfo> uploadedProperties = uploadedCapability.getProperties();
         for (UploadPropInfo property : uploadedProperties) {
             String propertyName = property.getName().toLowerCase();
             String propertyType = property.getType();
             ComponentInstanceProperty validProperty;
-            if (defaultProperties.containsKey(propertyName)) {
-                if (propertyType != null && !defaultProperties.get(propertyName).getType().equals(propertyType)) {
-                    return Either.right(propertyName);
-                }
+            if (defaultProperties.containsKey(propertyName) && propertTypeEqualsTo(defaultProperties, propertyName, propertyType)) {
+                throw new ComponentException(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NAME_ALREADY_EXISTS,
+                        propertyName));
             }
             validProperty = new ComponentInstanceProperty();
             validProperty.setName(propertyName);
-            if (property.getValue() != null)
+            if (property.getValue() != null) {
                 validProperty.setValue(property.getValue().toString());
+            }
             validProperty.setDescription(property.getDescription());
             validProperty.setPassword(property.isPassword());
             validProperties.add(validProperty);
         }
         defaultCapability.setProperties(validProperties);
-        return Either.left(true);
+    }
+
+    private boolean propertTypeEqualsTo(Map<String, PropertyDefinition> defaultProperties, String propertyName, String propertyType) {
+        return propertyType != null && !defaultProperties.get(propertyName).getType().equals(propertyType);
     }
 
     private Either<EnumMap<ArtifactOperationEnum, List<NonMetaArtifactInfo>>, ResponseFormat> organizeVfCsarArtifactsByArtifactOperation(
@@ -6623,7 +4991,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
         Either<EnumMap<ArtifactOperationEnum, List<NonMetaArtifactInfo>>, ResponseFormat> nodeTypeArtifactsToHandleRes = Either
                 .left(nodeTypeArtifactsToHandle);
-        ;
         try {
             // add all found Csar artifacts to list to upload
             List<NonMetaArtifactInfo> artifactsToUpload = new ArrayList<>(artifactPathAndNameList);
@@ -6684,12 +5051,15 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
                 }
             }
             if (responseWrapper.isEmpty()) {
-                if (!artifactsToUpload.isEmpty())
+                if (!artifactsToUpload.isEmpty()) {
                     nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.CREATE, artifactsToUpload);
-                if (!artifactsToUpdate.isEmpty())
+                }
+                if (!artifactsToUpdate.isEmpty()) {
                     nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.UPDATE, artifactsToUpdate);
-                if (!artifactsToDelete.isEmpty())
+                }
+                if (!artifactsToDelete.isEmpty()) {
                     nodeTypeArtifactsToHandle.put(ArtifactOperationEnum.DELETE, artifactsToDelete);
+                }
             }
             if (!responseWrapper.isEmpty()) {
                 nodeTypeArtifactsToHandleRes = Either.right(responseWrapper.getInnerElement());
@@ -6702,7 +5072,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         return nodeTypeArtifactsToHandleRes;
     }
 
-    private ImmutablePair<String, String> buildNestedToscaResourceName(String nodeResourceType, String vfResourceName,
+    ImmutablePair<String, String> buildNestedToscaResourceName(String nodeResourceType, String vfResourceName,
                                                                        String nodeTypeFullName) {
         String actualType;
         String actualVfName;
@@ -6743,11 +5113,8 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         this.cacheManagerOperation = cacheManagerOperation;
     }
 
-    ///////////////////////////////////////// DataModel
-    ///////////////////////////////////////// refactoring/////////////////////////////////////////////
     @Override
-    public Either<UiComponentDataTransfer, ResponseFormat> getUiComponentDataTransferByComponentId(String resourceId,
-                                                                                                   List<String> dataParamsToReturn) {
+    public Either<UiComponentDataTransfer, ResponseFormat> getUiComponentDataTransferByComponentId(String resourceId, List<String> dataParamsToReturn) {
 
         ComponentParametersView paramsToRetuen = new ComponentParametersView(dataParamsToReturn);
         Either<Resource, StorageOperationStatus> resourceResultEither = toscaOperationFacade.getToscaElement(resourceId,
@@ -6765,7 +5132,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
 
         Resource resource = resourceResultEither.left().value();
-        UiComponentDataTransfer dataTransfer = UiComponentDataConverter.getUiDataTransferFromResourceByParams(resource,
+        UiComponentDataTransfer dataTransfer = uiComponentDataConverter.getUiDataTransferFromResourceByParams(resource,
                 dataParamsToReturn);
         return Either.left(dataTransfer);
     }
@@ -6786,65 +5153,4 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
         }
     }
 
-    private Either<Boolean, ResponseFormat> validateAndUpdateInterfaces(String resourceId, Resource resourceUpdate) {
-        Either<Resource, StorageOperationStatus> resourceStorageOperationStatusEither =
-                toscaOperationFacade.getToscaElement(resourceId);
-        if (resourceStorageOperationStatusEither.isRight()) {
-            StorageOperationStatus errorStatus = resourceStorageOperationStatusEither.right().value();
-            log.error("Failed to fetch resource information by resource id {}, error {}", resourceId, errorStatus);
-            return Either.right(componentsUtils
-                    .getResponseFormat(componentsUtils.convertFromStorageResponse(errorStatus)));
-        }
-
-        Resource storedResource = resourceStorageOperationStatusEither.left().value();
-        Map<String, InterfaceDefinition> storedResourceInterfaces = storedResource.getInterfaces();
-
-        if(!storedResource.getName().equals(resourceUpdate.getName()) ) {
-            Collection<InterfaceDefinition> interfaceDefinitionListFromToscaName = InterfaceUtils
-                    .getInterfaceDefinitionListFromToscaName(storedResource.getInterfaces().values(),
-                            storedResource.getName());
-
-            for (InterfaceDefinition interfaceDefinition : storedResourceInterfaces.values()) {
-                Either<InterfaceDefinition, ResponseFormat> updateInterfaceDefinitionEither = updateInterfaceDefinition(resourceUpdate,
-                        interfaceDefinition,
-                        interfaceDefinitionListFromToscaName);
-                if(updateInterfaceDefinitionEither.isRight()) {
-                    return Either.right(updateInterfaceDefinitionEither.right().value());
-                }
-            }
-        }
-
-        return  Either.left(Boolean.TRUE);
-    }
-
-    private Either<InterfaceDefinition, ResponseFormat > updateInterfaceDefinition(Resource resourceUpdate,
-                                                                                   InterfaceDefinition interfaceDefinition,
-                                                                                   Collection<InterfaceDefinition> interfaceDefinitionListFromToscaName) {
-        interfaceDefinitionListFromToscaName.forEach(interfaceDefinitionFromList -> {
-            if(interfaceDefinitionFromList.getToscaResourceName().equals(interfaceDefinition
-                    .getToscaResourceName())) {
-                log.info("Going to Update interface definition toscaResourceName {} to {}",
-                        interfaceDefinitionFromList.getToscaResourceName(),
-                        InterfaceUtils.createInterfaceToscaResourceName(resourceUpdate.getName()));
-                interfaceDefinition.setToscaResourceName(InterfaceUtils
-                        .createInterfaceToscaResourceName(resourceUpdate.getName()));
-            }
-        } );
-        try {
-            Either<InterfaceDefinition, StorageOperationStatus> interfaceUpdate = interfaceOperation
-                    .updateInterface(resourceUpdate.getUniqueId(), interfaceDefinition);
-            if (interfaceUpdate.isRight()) {
-                log.error("Failed to Update interface {}. Response is {}. ", resourceUpdate.getName(), interfaceUpdate.right().value());
-                titanDao.rollback();
-                return Either.right(componentsUtils
-                        .getResponseFormat(componentsUtils.convertFromStorageResponse(interfaceUpdate.right().value(), ComponentTypeEnum.RESOURCE)));
-            }
-        } catch (Exception e) {
-            log.error("Exception occurred during update interface toscaResourceName  : {}", e.getMessage(), e);
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-
-        return Either.left( interfaceDefinition);
-
-    }
 }
\ No newline at end of file
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java
index 6d6d80b840..42858f4d57 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceImportManager.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,30 +20,17 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletContext;
-
+import fj.data.Either;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
 import org.openecomp.sdc.be.auditing.impl.AuditingManager;
 import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditImportResourceAdminEventFactory;
+import org.openecomp.sdc.be.components.csar.CsarInfo;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
 import org.openecomp.sdc.be.components.impl.ImportUtils.Constants;
 import org.openecomp.sdc.be.components.impl.ImportUtils.ResultStatusEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
@@ -54,17 +41,7 @@ import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.CsarInfo;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.RequirementDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.UploadResourceInfo;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
@@ -73,18 +50,24 @@ import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.CapabilityTypeOperation;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ThreadLocalsHolder;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.WebApplicationContext;
 import org.yaml.snakeyaml.Yaml;
 
-import fj.data.Either;
+import javax.servlet.ServletContext;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Component("resourceImportManager")
 public class ResourceImportManager {
@@ -103,7 +86,7 @@ public class ResourceImportManager {
     @Autowired
     protected ComponentsUtils componentsUtils;
 
-    public final static Pattern PROPERTY_NAME_PATTERN_IGNORE_LENGTH = Pattern
+    public static final Pattern PROPERTY_NAME_PATTERN_IGNORE_LENGTH = Pattern
             .compile("[\\w\\-\\_\\d\\:]+");
     @Autowired
     protected CapabilityTypeOperation capabilityTypeOperation;
@@ -112,7 +95,7 @@ public class ResourceImportManager {
 
     private ResponseFormatManager responseFormatManager;
 
-    private static final Logger log = LoggerFactory.getLogger(ResourceImportManager.class);
+    private static final Logger log = Logger.getLogger(ResourceImportManager.class);
 
     public void setToscaOperationFacade(ToscaOperationFacade toscaOperationFacade) {
         this.toscaOperationFacade = toscaOperationFacade;
@@ -137,7 +120,7 @@ public class ResourceImportManager {
     }
 
     public Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> importCertifiedResource(String resourceYml, UploadResourceInfo resourceMetaData, User creator, Function<Resource, Either<Boolean, ResponseFormat>> validationFunction,
-            LifecycleChangeInfoWithAction lifecycleChangeInfo, boolean isInTransaction, boolean createNewVersion, boolean needLock, Map<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle, List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, boolean forceCertificationAllowed, CsarInfo csarInfo, String nodeName, boolean isNested) {
+                                                                                                 LifecycleChangeInfoWithAction lifecycleChangeInfo, boolean isInTransaction, boolean createNewVersion, boolean needLock, Map<ArtifactOperationEnum, List<ArtifactDefinition>> nodeTypeArtifactsToHandle, List<ArtifactDefinition> nodeTypesNewCreatedArtifacts, boolean forceCertificationAllowed, CsarInfo csarInfo, String nodeName, boolean isNested) {
         Resource resource = new Resource();
         ImmutablePair<Resource, ActionStatus> responsePair = new ImmutablePair<>(resource, ActionStatus.CREATED);
         Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> response = Either.left(responsePair);
@@ -165,38 +148,39 @@ public class ResourceImportManager {
                         return Either.right(componentsUtils.getResponseFormatByResource(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, resource));
                     }
                 }
-
-                response = resourceBusinessLogic.createOrUpdateResourceByImport(resource, creator, true, isInTransaction, needLock, csarInfo, nodeName, isNested);
+                resource = resourceBusinessLogic.createOrUpdateResourceByImport(resource, creator, true, isInTransaction, needLock, csarInfo, nodeName, isNested).left;
                 Either<Resource, ResponseFormat> changeStateResponse;
-                if (response.isLeft()) {
-                    resource = response.left().value().left;
-
-                    if(nodeTypeArtifactsToHandle !=null && !nodeTypeArtifactsToHandle.isEmpty()){
-                        Either<List<ArtifactDefinition>, ResponseFormat> handleNodeTypeArtifactsRes =
-                                resourceBusinessLogic.handleNodeTypeArtifacts(resource, nodeTypeArtifactsToHandle, nodeTypesNewCreatedArtifacts, creator, isInTransaction, false);
-                        if(handleNodeTypeArtifactsRes.isRight()){
-                            return Either.right(handleNodeTypeArtifactsRes.right().value());
-                        }
-                    }
-                    latestCertifiedResourceId = getLatestCertifiedResourceId(resource);
-                    changeStateResponse = resourceBusinessLogic.propagateStateToCertified(creator, resource, lifecycleChangeInfo, isInTransaction, needLock, forceCertificationAllowed);
-                    if (changeStateResponse.isRight()) {
-                        response = Either.right(changeStateResponse.right().value());
-                    } else {
-                        responsePair = new ImmutablePair<>(changeStateResponse.left().value(), response.left().value().right);
-                        response = Either.left(responsePair);
+
+                if (nodeTypeArtifactsToHandle != null && !nodeTypeArtifactsToHandle.isEmpty()) {
+                    Either<List<ArtifactDefinition>, ResponseFormat> handleNodeTypeArtifactsRes =
+                            resourceBusinessLogic.handleNodeTypeArtifacts(resource, nodeTypeArtifactsToHandle, nodeTypesNewCreatedArtifacts, creator, isInTransaction, false);
+                    if (handleNodeTypeArtifactsRes.isRight()) {
+                        return Either.right(handleNodeTypeArtifactsRes.right().value());
                     }
                 }
-            } else {
+                latestCertifiedResourceId = getLatestCertifiedResourceId(resource);
+                changeStateResponse = resourceBusinessLogic.propagateStateToCertified(creator, resource, lifecycleChangeInfo, isInTransaction, needLock, forceCertificationAllowed);
+                if (changeStateResponse.isRight()) {
+                    response = Either.right(changeStateResponse.right().value());
+                }
+                else {
+                    responsePair = new ImmutablePair<>(changeStateResponse.left().value(), response.left()
+                            .value().right);
+                    response = Either.left(responsePair);
+                }
+            }
+            else {
                 ResponseFormat validationErrorResponse = isValidResource.right().value();
                 auditErrorImport(resourceMetaData, creator, validationErrorResponse, true);
                 response = Either.right(validationErrorResponse);
             }
 
-        } catch (RuntimeException e) {
-            ResponseFormat exceptionResponse = handleImportResourceExecption(resourceMetaData, creator, true, e);
+        }
+        catch (RuntimeException e) {
+            ResponseFormat exceptionResponse = handleImportResourceException(resourceMetaData, creator, true, e, null);
             response = Either.right(exceptionResponse);
-        } finally {
+        }
+        finally {
             if (latestCertifiedResourceId != null && needLock) {
                 log.debug("unlock resource {}", latestCertifiedResourceId);
                 graphLockOperation.unlockComponent(latestCertifiedResourceId, NodeTypeEnum.Resource);
@@ -217,7 +201,8 @@ public class ResourceImportManager {
                 }
             }
             return allVersions.get(String.valueOf(latestCertifiedVersion));
-        } else {
+        }
+        else {
             return null;
         }
     }
@@ -244,7 +229,7 @@ public class ResourceImportManager {
     public Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> importUserDefinedResource(String resourceYml, UploadResourceInfo resourceMetaData, User creator, boolean isInTransaction) {
 
         Resource resource = new Resource();
-        ImmutablePair<Resource, ActionStatus> responsePair = new ImmutablePair<Resource, ActionStatus>(resource, ActionStatus.CREATED);
+        ImmutablePair<Resource, ActionStatus> responsePair = new ImmutablePair<>(resource, ActionStatus.CREATED);
         Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> response = Either.left(responsePair);
 
         try {
@@ -265,26 +250,27 @@ public class ResourceImportManager {
                 return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
             }
 
-            Either<Boolean, ResponseFormat> validateDerivedFromNotEmpty = resourceBusinessLogic.validateDerivedFromNotEmpty(creator, resource, AuditingActionEnum.CREATE_RESOURCE);
-            if (validateDerivedFromNotEmpty.isRight()) {
-                return Either.right(validateDerivedFromNotEmpty.right().value());
-            }
-
+            resourceBusinessLogic.validateDerivedFromNotEmpty(creator, resource, AuditingActionEnum.CREATE_RESOURCE);
             Either<Boolean, ResponseFormat> validatePropertiesTypes = resourceBusinessLogic.validatePropertiesDefaultValues(resource);
 
             if (validatePropertiesTypes.isLeft()) {
-                response = resourceBusinessLogic.createOrUpdateResourceByImport(resource, creator, false, isInTransaction, true, null, null, false);
-            } else {
+                response = Either.left(resourceBusinessLogic.createOrUpdateResourceByImport(resource, creator, false, isInTransaction, true, null, null, false));
+            }
+            else {
                 ResponseFormat validationErrorResponse = validatePropertiesTypes.right().value();
                 auditErrorImport(resourceMetaData, creator, validationErrorResponse, false);
                 response = Either.right(validationErrorResponse);
             }
 
-        } catch (RuntimeException e) {
-            ResponseFormat exceptionResponse = handleImportResourceExecption(resourceMetaData, creator, false, e);
-            response = Either.right(exceptionResponse);
         }
-
+        catch (ComponentException e) {
+            ResponseFormat responseFormat = e.getResponseFormat() != null?
+                    e.getResponseFormat() : getResponseFormatManager().getResponseFormat(e.getActionStatus(), e.getParams());
+            response = Either.right(handleImportResourceException(resourceMetaData, creator, false, e, responseFormat));
+        }
+        catch (RuntimeException e) {
+            response = Either.right(handleImportResourceException(resourceMetaData, creator, false, e, null));
+        }
         return response;
 
     }
@@ -296,9 +282,9 @@ public class ResourceImportManager {
         Map<String, Object> toscaJson = toscaJsonAll;
 
         // Checks if exist and builds the node_types map
-        if (toscaJsonAll.containsKey(ToscaTagNamesEnum.NODE_TYPES.getElementName()) && resource.getResourceType()!=ResourceTypeEnum.CVFC) {
-            toscaJson = new HashMap<String, Object>();
-            toscaJson.put(ToscaTagNamesEnum.NODE_TYPES.getElementName(), toscaJsonAll.get(ToscaTagNamesEnum.NODE_TYPES.getElementName()));
+        if (toscaJsonAll.containsKey(TypeUtils.ToscaTagNamesEnum.NODE_TYPES.getElementName()) && resource.getResourceType() != ResourceTypeEnum.CVFC) {
+            toscaJson = new HashMap<>();
+            toscaJson.put(TypeUtils.ToscaTagNamesEnum.NODE_TYPES.getElementName(), toscaJsonAll.get(TypeUtils.ToscaTagNamesEnum.NODE_TYPES.getElementName()));
         }
         // Derived From
         Either<Resource, ResponseFormat> setDerivedFrom = setDerivedFrom(toscaJson, resource);
@@ -306,7 +292,7 @@ public class ResourceImportManager {
             return Either.right(setDerivedFrom.right().value());
         }
         Resource parentResource = setDerivedFrom.left().value();
-        if(StringUtils.isEmpty(resource.getToscaResourceName())) {
+        if (StringUtils.isEmpty(resource.getToscaResourceName())) {
             setToscaResourceName(toscaJson, resource);
         }
         setAttributes(toscaJson, resource);
@@ -328,7 +314,7 @@ public class ResourceImportManager {
     }
 
     private void setToscaResourceName(Map<String, Object> toscaJson, Resource resource) {
-        Either<Map<String, Object>, ResultStatusEnum> toscaElement = ImportUtils.findFirstToscaMapElement(toscaJson, ToscaTagNamesEnum.NODE_TYPES);
+        Either<Map<String, Object>, ResultStatusEnum> toscaElement = ImportUtils.findFirstToscaMapElement(toscaJson, TypeUtils.ToscaTagNamesEnum.NODE_TYPES);
         if (toscaElement.isLeft() || toscaElement.left().value().size() == 1) {
             String toscaResourceName = toscaElement.left().value().keySet().iterator().next();
             resource.setToscaResourceName(toscaResourceName);
@@ -336,17 +322,19 @@ public class ResourceImportManager {
     }
 
     private void setInterfaceLifecycle(Map<String, Object> toscaJson, Resource resource) {
-        Either<Map<String, Object>, ResultStatusEnum> toscaInterfaces = ImportUtils.findFirstToscaMapElement(toscaJson, ToscaTagNamesEnum.INTERFACES);
+        Either<Map<String, Object>, ResultStatusEnum> toscaInterfaces = ImportUtils.findFirstToscaMapElement(toscaJson, TypeUtils.ToscaTagNamesEnum.INTERFACES);
         if (toscaInterfaces.isLeft()) {
             Map<String, Object> jsonInterfaces = toscaInterfaces.left().value();
-            Map<String, InterfaceDefinition> moduleInterfaces = new HashMap<String, InterfaceDefinition>();
+            Map<String, InterfaceDefinition> moduleInterfaces = new HashMap<>();
             Iterator<Entry<String, Object>> interfacesNameValue = jsonInterfaces.entrySet().iterator();
             while (interfacesNameValue.hasNext()) {
                 Entry<String, Object> interfaceNameValue = interfacesNameValue.next();
-                Either<InterfaceDefinition, ResultStatusEnum> eitherInterface = createModuleInterface(interfaceNameValue.getValue());
+                Either<InterfaceDefinition, ResultStatusEnum> eitherInterface = createModuleInterface(interfaceNameValue
+                        .getValue());
                 if (eitherInterface.isRight()) {
                     log.info("error when creating interface:{}, for resource:{}", interfaceNameValue.getKey(), resource.getName());
-                } else {
+                }
+                else {
                     moduleInterfaces.put(interfaceNameValue.getKey(), eitherInterface.left().value());
                 }
 
@@ -365,18 +353,21 @@ public class ResourceImportManager {
             if (interfaceJson instanceof String) {
                 String requirementJsonString = (String) interfaceJson;
                 interf.setType(requirementJsonString);
-            } else if (interfaceJson instanceof Map) {
+            }
+            else if (interfaceJson instanceof Map) {
                 Map<String, Object> requirementJsonMap = (Map<String, Object>) interfaceJson;
-                if (requirementJsonMap.containsKey(ToscaTagNamesEnum.TYPE.getElementName())) {
-                    String type = (String) requirementJsonMap.get(ToscaTagNamesEnum.TYPE.getElementName());
+                if (requirementJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.TYPE.getElementName())) {
+                    String type = (String) requirementJsonMap.get(TypeUtils.ToscaTagNamesEnum.TYPE.getElementName());
                     interf.setType(type);
                     interf.setUniqueId(type.toLowerCase());
                 }
-            } else {
+            }
+            else {
                 result = Either.right(ResultStatusEnum.GENERAL_ERROR);
             }
 
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeSystemError("Import Resource- create interface");
             log.debug("error when creating interface, message:{}", e.getMessage(), e);
             result = Either.right(ResultStatusEnum.GENERAL_ERROR);
@@ -387,10 +378,10 @@ public class ResourceImportManager {
 
     private Either<Boolean, ResponseFormat> setRequirements(Map<String, Object> toscaJson, Resource resource, Resource parentResource) {// Note that parentResource can be null
         Either<Boolean, ResponseFormat> eitherResult = Either.left(true);
-        Either<List<Object>, ResultStatusEnum> toscaRequirements = ImportUtils.findFirstToscaListElement(toscaJson, ToscaTagNamesEnum.REQUIREMENTS);
+        Either<List<Object>, ResultStatusEnum> toscaRequirements = ImportUtils.findFirstToscaListElement(toscaJson, TypeUtils.ToscaTagNamesEnum.REQUIREMENTS);
         if (toscaRequirements.isLeft()) {
             List<Object> jsonRequirements = toscaRequirements.left().value();
-            Map<String, List<RequirementDefinition>> moduleRequirements = new HashMap<String, List<RequirementDefinition>>();
+            Map<String, List<RequirementDefinition>> moduleRequirements = new HashMap<>();
             // Checking for name duplication
             Set<String> reqNames = new HashSet<>();
             // Getting flattened list of capabilities of parent node - cap name
@@ -412,7 +403,8 @@ public class ResourceImportManager {
                     return Either.right(componentsUtils.getResponseFormat(ActionStatus.IMPORT_DUPLICATE_REQ_CAP_NAME, "requirement", reqNameLowerCase));
                 }
                 reqNames.add(reqNameLowerCase);
-                Either<RequirementDefinition, ResponseFormat> eitherRequirement = createRequirementFromImportFile(requirementJsonWrapper.get(requirementName));
+                Either<RequirementDefinition, ResponseFormat> eitherRequirement = createRequirementFromImportFile(requirementJsonWrapper
+                        .get(requirementName));
                 if (eitherRequirement.isRight()) {
                     log.info("error when creating Requirement:{}, for resource:{}", requirementName, resource.getName());
                     return Either.right(eitherRequirement.right().value());
@@ -421,20 +413,25 @@ public class ResourceImportManager {
                 requirementDef.setName(requirementName);
                 if (moduleRequirements.containsKey(requirementDef.getCapability())) {
                     moduleRequirements.get(requirementDef.getCapability()).add(requirementDef);
-                } else {
-                    List<RequirementDefinition> list = new ArrayList<RequirementDefinition>();
+                }
+                else {
+                    List<RequirementDefinition> list = new ArrayList<>();
                     list.add(requirementDef);
                     moduleRequirements.put(requirementDef.getCapability(), list);
                 }
 
                 // Validating against req/cap of "derived from" node
-                Either<Boolean, ResponseFormat> validateVsParentCap = validateCapNameVsDerived(reqName2TypeMap, requirementDef.getCapability(), requirementDef.getName());
+                Either<Boolean, ResponseFormat> validateVsParentCap = validateCapNameVsDerived(reqName2TypeMap, requirementDef
+                        .getCapability(), requirementDef.getName());
                 if (validateVsParentCap.isRight()) {
                     return Either.right(validateVsParentCap.right().value());
                 }
                 if (!validateVsParentCap.left().value()) {
-                    log.debug("Requirement with name {} already exists in parent {}", requirementDef.getName(), parentResource.getName());
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED, "requirement", requirementDef.getName().toLowerCase(), parentResource.getName());
+                    log.debug("Requirement with name {} already exists in parent {}", requirementDef.getName(), parentResource
+                            .getName());
+                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED, "requirement", requirementDef
+                            .getName()
+                            .toLowerCase(), parentResource.getName());
                     return Either.right(responseFormat);
                 }
             }
@@ -455,21 +452,22 @@ public class ResourceImportManager {
             if (requirementJson instanceof String) {
                 String requirementJsonString = (String) requirementJson;
                 requirement.setCapability(requirementJsonString);
-            } else if (requirementJson instanceof Map) {
+            }
+            else if (requirementJson instanceof Map) {
                 Map<String, Object> requirementJsonMap = (Map<String, Object>) requirementJson;
-                if (requirementJsonMap.containsKey(ToscaTagNamesEnum.CAPABILITY.getElementName())) {
-                    requirement.setCapability((String) requirementJsonMap.get(ToscaTagNamesEnum.CAPABILITY.getElementName()));
+                if (requirementJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.CAPABILITY.getElementName())) {
+                    requirement.setCapability((String) requirementJsonMap.get(TypeUtils.ToscaTagNamesEnum.CAPABILITY.getElementName()));
                 }
 
-                if (requirementJsonMap.containsKey(ToscaTagNamesEnum.NODE.getElementName())) {
-                    requirement.setNode((String) requirementJsonMap.get(ToscaTagNamesEnum.NODE.getElementName()));
+                if (requirementJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.NODE.getElementName())) {
+                    requirement.setNode((String) requirementJsonMap.get(TypeUtils.ToscaTagNamesEnum.NODE.getElementName()));
                 }
 
-                if (requirementJsonMap.containsKey(ToscaTagNamesEnum.RELATIONSHIP.getElementName())) {
-                    requirement.setRelationship((String) requirementJsonMap.get(ToscaTagNamesEnum.RELATIONSHIP.getElementName()));
+                if (requirementJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.RELATIONSHIP.getElementName())) {
+                    requirement.setRelationship((String) requirementJsonMap.get(TypeUtils.ToscaTagNamesEnum.RELATIONSHIP.getElementName()));
                 }
-                if (requirementJsonMap.containsKey(ToscaTagNamesEnum.OCCURRENCES.getElementName())) {
-                    List<Object> occurrencesList = (List) requirementJsonMap.get(ToscaTagNamesEnum.OCCURRENCES.getElementName());
+                if (requirementJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.OCCURRENCES.getElementName())) {
+                    List<Object> occurrencesList = (List) requirementJsonMap.get(TypeUtils.ToscaTagNamesEnum.OCCURRENCES.getElementName());
                     Either<Boolean, ResponseFormat> validateAndSetOccurrencesStatus = validateOccurrences(occurrencesList);
                     if (validateAndSetOccurrencesStatus.isRight()) {
                         result = Either.right(validateAndSetOccurrencesStatus.right().value());
@@ -481,11 +479,13 @@ public class ResourceImportManager {
                     }
 
                 }
-            } else {
+            }
+            else {
                 result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML));
             }
 
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeSystemError("Import Resource - create Requirement");
             log.debug("error when creating requirement, message:{}", e.getMessage(), e);
             result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML));
@@ -505,7 +505,7 @@ public class ResourceImportManager {
             if (value != null) {
                 for (Entry<String, PropertyDefinition> entry : value.entrySet()) {
                     String name = entry.getKey();
-                    if(!PROPERTY_NAME_PATTERN_IGNORE_LENGTH.matcher(name).matches()){
+                    if (!PROPERTY_NAME_PATTERN_IGNORE_LENGTH.matcher(name).matches()) {
                         log.debug("The property with invalid name {} occured upon import resource {}. ", name, resource.getName());
                         result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromResultStatusEnum(ResultStatusEnum.INVALID_PROPERTY_NAME, JsonPresentationFields.PROPERTY)));
                     }
@@ -515,8 +515,11 @@ public class ResourceImportManager {
                 }
             }
             resource.setProperties(propertiesList);
-        } else if(properties.right().value() != ResultStatusEnum.ELEMENT_NOT_FOUND){
-            result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromResultStatusEnum(properties.right().value(), JsonPresentationFields.PROPERTY)));
+        }
+        else if (properties.right().value() != ResultStatusEnum.ELEMENT_NOT_FOUND) {
+            result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromResultStatusEnum(properties
+                    .right()
+                    .value(), JsonPresentationFields.PROPERTY)));
         }
         return result;
     }
@@ -536,19 +539,20 @@ public class ResourceImportManager {
                 }
             }
             resource.setAttributes(attributeList);
-        } else {
+        }
+        else {
             result = attributes.right().value();
         }
         return result;
     }
 
     private Either<Resource, ResponseFormat> setDerivedFrom(Map<String, Object> toscaJson, Resource resource) {
-        Either<String, ResultStatusEnum> toscaDerivedFromElement = ImportUtils.findFirstToscaStringElement(toscaJson, ToscaTagNamesEnum.DERIVED_FROM);
+        Either<String, ResultStatusEnum> toscaDerivedFromElement = ImportUtils.findFirstToscaStringElement(toscaJson, TypeUtils.ToscaTagNamesEnum.DERIVED_FROM);
         Resource derivedFromResource = null;
         if (toscaDerivedFromElement.isLeft()) {
             String derivedFrom = toscaDerivedFromElement.left().value();
             log.debug("Derived from TOSCA name is {}", derivedFrom);
-            resource.setDerivedFrom(Arrays.asList(new String[] { derivedFrom }));
+            resource.setDerivedFrom(Arrays.asList(new String[]{derivedFrom}));
             Either<Resource, StorageOperationStatus> latestByToscaResourceName = toscaOperationFacade.getLatestByToscaResourceName(derivedFrom);
 
             if (latestByToscaResourceName.isRight()) {
@@ -558,7 +562,8 @@ public class ResourceImportManager {
                 }
                 log.debug("Error when fetching parent resource {}, error: {}", derivedFrom, operationStatus);
                 ActionStatus convertFromStorageResponse = componentsUtils.convertFromStorageResponse(operationStatus);
-                BeEcompErrorManager.getInstance().logBeComponentMissingError("Import TOSCA YAML", "resource", derivedFrom);
+                BeEcompErrorManager.getInstance()
+                                   .logBeComponentMissingError("Import TOSCA YAML", "resource", derivedFrom);
                 return Either.right(componentsUtils.getResponseFormat(convertFromStorageResponse, derivedFrom));
             }
             derivedFromResource = latestByToscaResourceName.left().value();
@@ -568,10 +573,10 @@ public class ResourceImportManager {
 
     private Either<Boolean, ResponseFormat> setCapabilities(Map<String, Object> toscaJson, Resource resource, Resource parentResource) {// Note that parentResource can be null
         Either<Boolean, ResponseFormat> eitherResult = Either.left(true);
-        Either<Map<String, Object>, ResultStatusEnum> toscaCapabilities = ImportUtils.findFirstToscaMapElement(toscaJson, ToscaTagNamesEnum.CAPABILITIES);
+        Either<Map<String, Object>, ResultStatusEnum> toscaCapabilities = ImportUtils.findFirstToscaMapElement(toscaJson, TypeUtils.ToscaTagNamesEnum.CAPABILITIES);
         if (toscaCapabilities.isLeft()) {
             Map<String, Object> jsonCapabilities = toscaCapabilities.left().value();
-            Map<String, List<CapabilityDefinition>> moduleCapabilities = new HashMap<String, List<CapabilityDefinition>>();
+            Map<String, List<CapabilityDefinition>> moduleCapabilities = new HashMap<>();
             Iterator<Entry<String, Object>> capabilitiesNameValue = jsonCapabilities.entrySet().iterator();
             Set<String> capNames = new HashSet<>();
             // Getting flattened list of capabilities of parent node - cap name
@@ -594,9 +599,11 @@ public class ResourceImportManager {
                 }
                 capNames.add(capNameLowerCase);
 
-                Either<CapabilityDefinition, ResponseFormat> eitherCapability = createCapabilityFromImportFile(capabilityNameValue.getValue());
+                Either<CapabilityDefinition, ResponseFormat> eitherCapability = createCapabilityFromImportFile(capabilityNameValue
+                        .getValue());
                 if (eitherCapability.isRight()) {
-                    log.debug("error when creating capability:{}, for resource:{}", capabilityNameValue.getKey(), resource.getName());
+                    log.debug("error when creating capability:{}, for resource:{}", capabilityNameValue.getKey(), resource
+                            .getName());
                     return Either.right(eitherCapability.right().value());
                 }
 
@@ -604,22 +611,27 @@ public class ResourceImportManager {
                 capabilityDef.setName(capabilityNameValue.getKey());
                 if (moduleCapabilities.containsKey(capabilityDef.getType())) {
                     moduleCapabilities.get(capabilityDef.getType()).add(capabilityDef);
-                } else {
-                    List<CapabilityDefinition> list = new ArrayList<CapabilityDefinition>();
+                }
+                else {
+                    List<CapabilityDefinition> list = new ArrayList<>();
                     list.add(capabilityDef);
                     moduleCapabilities.put(capabilityDef.getType(), list);
                 }
 
                 // Validating against req/cap of "derived from" node
-                Either<Boolean, ResponseFormat> validateVsParentCap = validateCapNameVsDerived(capName2TypeMap, capabilityDef.getType(), capabilityDef.getName());
+                Either<Boolean, ResponseFormat> validateVsParentCap = validateCapNameVsDerived(capName2TypeMap, capabilityDef
+                        .getType(), capabilityDef.getName());
                 if (validateVsParentCap.isRight()) {
                     return Either.right(validateVsParentCap.right().value());
                 }
                 if (!validateVsParentCap.left().value()) {
                     // Here parentResource is for sure not null, so it's
                     // null-safe
-                    log.debug("Capability with name {} already exists in parent {}", capabilityDef.getName(), parentResource.getName());
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED, "capability", capabilityDef.getName().toLowerCase(), parentResource.getName());
+                    log.debug("Capability with name {} already exists in parent {}", capabilityDef.getName(), parentResource
+                            .getName());
+                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.IMPORT_REQ_CAP_NAME_EXISTS_IN_DERIVED, "capability", capabilityDef
+                            .getName()
+                            .toLowerCase(), parentResource.getName());
                     return Either.right(responseFormat);
                 }
             }
@@ -643,7 +655,8 @@ public class ResourceImportManager {
                         if (capName2type.get(nameLowerCase) != null) {
                             String parentResourceName = parentResource.getName();
                             log.debug("Resource with name {} has more than one capability with name {}, ignoring case", parentResourceName, nameLowerCase);
-                            BeEcompErrorManager.getInstance().logInternalDataError("Import resource", "Parent resource " + parentResourceName + " of imported resource has one or more capabilities with name " + nameLowerCase, ErrorSeverity.ERROR);
+                            BeEcompErrorManager.getInstance()
+                                               .logInternalDataError("Import resource", "Parent resource " + parentResourceName + " of imported resource has one or more capabilities with name " + nameLowerCase, ErrorSeverity.ERROR);
                             return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
                         }
                         capName2type.put(nameLowerCase, capDefinition.getType());
@@ -665,7 +678,8 @@ public class ResourceImportManager {
                         if (reqName2type.get(nameLowerCase) != null) {
                             String parentResourceName = parentResource.getName();
                             log.debug("Resource with name {} has more than one requirement with name {}, ignoring case", parentResourceName, nameLowerCase);
-                            BeEcompErrorManager.getInstance().logInternalDataError("Import resource", "Parent resource " + parentResourceName + " of imported resource has one or more requirements with name " + nameLowerCase, ErrorSeverity.ERROR);
+                            BeEcompErrorManager.getInstance()
+                                               .logInternalDataError("Import resource", "Parent resource " + parentResourceName + " of imported resource has one or more requirements with name " + nameLowerCase, ErrorSeverity.ERROR);
                             return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
                         }
                         reqName2type.put(nameLowerCase, reqDefinition.getCapability());
@@ -688,7 +702,9 @@ public class ResourceImportManager {
             Either<Boolean, StorageOperationStatus> capabilityTypeDerivedFrom = capabilityTypeOperation.isCapabilityTypeDerivedFrom(childCapabilityType, parentCapType);
             if (capabilityTypeDerivedFrom.isRight()) {
                 log.debug("Couldn't check whether imported resource capability derives from its parent's capability");
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(capabilityTypeDerivedFrom.right().value()));
+                ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(capabilityTypeDerivedFrom
+                        .right()
+                        .value()));
                 return Either.right(responseFormat);
             }
             return Either.left(capabilityTypeDerivedFrom.left().value());
@@ -705,22 +721,24 @@ public class ResourceImportManager {
             if (capabilityJson instanceof String) {
                 String capabilityJsonString = (String) capabilityJson;
                 capabilityDefinition.setType(capabilityJsonString);
-            } else if (capabilityJson instanceof Map) {
+            }
+            else if (capabilityJson instanceof Map) {
                 Map<String, Object> capabilityJsonMap = (Map<String, Object>) capabilityJson;
                 // Type
-                if (capabilityJsonMap.containsKey(ToscaTagNamesEnum.TYPE.getElementName())) {
-                    capabilityDefinition.setType((String) capabilityJsonMap.get(ToscaTagNamesEnum.TYPE.getElementName()));
+                if (capabilityJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.TYPE.getElementName())) {
+                    capabilityDefinition.setType((String) capabilityJsonMap.get(TypeUtils.ToscaTagNamesEnum.TYPE.getElementName()));
                 }
                 // ValidSourceTypes
-                if (capabilityJsonMap.containsKey(ToscaTagNamesEnum.VALID_SOURCE_TYPES.getElementName())) {
-                    capabilityDefinition.setValidSourceTypes((List<String>) capabilityJsonMap.get(ToscaTagNamesEnum.VALID_SOURCE_TYPES.getElementName()));
+                if (capabilityJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.VALID_SOURCE_TYPES.getElementName())) {
+                    capabilityDefinition.setValidSourceTypes((List<String>) capabilityJsonMap.get(TypeUtils.ToscaTagNamesEnum.VALID_SOURCE_TYPES
+                            .getElementName()));
                 }
                 // ValidSourceTypes
-                if (capabilityJsonMap.containsKey(ToscaTagNamesEnum.DESCRIPTION.getElementName())) {
-                    capabilityDefinition.setDescription((String) capabilityJsonMap.get(ToscaTagNamesEnum.DESCRIPTION.getElementName()));
+                if (capabilityJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.DESCRIPTION.getElementName())) {
+                    capabilityDefinition.setDescription((String) capabilityJsonMap.get(TypeUtils.ToscaTagNamesEnum.DESCRIPTION.getElementName()));
                 }
-                if (capabilityJsonMap.containsKey(ToscaTagNamesEnum.OCCURRENCES.getElementName())) {
-                    List<Object> occurrencesList = (List) capabilityJsonMap.get(ToscaTagNamesEnum.OCCURRENCES.getElementName());
+                if (capabilityJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.OCCURRENCES.getElementName())) {
+                    List<Object> occurrencesList = (List) capabilityJsonMap.get(TypeUtils.ToscaTagNamesEnum.OCCURRENCES.getElementName());
                     Either<Boolean, ResponseFormat> validateAndSetOccurrencesStatus = validateOccurrences(occurrencesList);
                     if (validateAndSetOccurrencesStatus.isRight()) {
                         result = Either.right(validateAndSetOccurrencesStatus.right().value());
@@ -731,24 +749,37 @@ public class ResourceImportManager {
                         capabilityDefinition.setMaxOccurrences(occurrencesList.get(1).toString());
                     }
                 }
-                if (capabilityJsonMap.containsKey(ToscaTagNamesEnum.PROPERTIES.getElementName())) {
+                if (capabilityJsonMap.containsKey(TypeUtils.ToscaTagNamesEnum.PROPERTIES.getElementName())) {
 
                     Either<Map<String, PropertyDefinition>, ResultStatusEnum> propertiesRes = ImportUtils.getProperties(capabilityJsonMap);
                     if (propertiesRes.isRight()) {
                         result = Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_NOT_FOUND));
                         return result;
-                    } else {
-                        propertiesRes.left().value().entrySet().stream().forEach(e -> e.getValue().setName(e.getKey().toLowerCase()));
-                        List<ComponentInstanceProperty> capabilityProperties = propertiesRes.left().value().values().stream().map(p -> new ComponentInstanceProperty(p, p.getDefaultValue(), null)).collect(Collectors.toList());
+                    }
+                    else {
+                        propertiesRes.left()
+                                     .value()
+                                     .entrySet()
+                                     .stream()
+                                     .forEach(e -> e.getValue().setName(e.getKey().toLowerCase()));
+                        List<ComponentInstanceProperty> capabilityProperties = propertiesRes.left()
+                                                                                            .value()
+                                                                                            .values()
+                                                                                            .stream()
+                                                                                            .map(p -> new ComponentInstanceProperty(p, p
+                                                                                                    .getDefaultValue(), null))
+                                                                                            .collect(Collectors.toList());
                         capabilityDefinition.setProperties(capabilityProperties);
                     }
                 }
-            } else if (!(capabilityJson instanceof List)) {
+            }
+            else if (!(capabilityJson instanceof List)) {
 
                 result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML));
 
             }
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeSystemError("Import Resource - create capability");
             log.debug("error when creating capability, message:{}", e.getMessage(), e);
             result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_YAML));
@@ -757,48 +788,28 @@ public class ResourceImportManager {
         return result;
     }
 
-    private ResponseFormat handleImportResourceExecption(UploadResourceInfo resourceMetaData, User user, boolean isNormative, RuntimeException e) {
+    private ResponseFormat handleImportResourceException(UploadResourceInfo resourceMetaData, User user, boolean isNormative, RuntimeException e, ResponseFormat responseFormat) {
+        if(responseFormat == null ){
+            responseFormat = getResponseFormatManager().getResponseFormat(ActionStatus.GENERAL_ERROR);
+        }
         String payloadName = (resourceMetaData != null) ? resourceMetaData.getPayloadName() : "";
         BeEcompErrorManager.getInstance().logBeSystemError("Import Resource " + payloadName);
-
         log.debug("Error when importing resource from payload:{} Exception text: {}", payloadName, e.getMessage(), e);
-        ResponseFormat errorResponseWrapper = getResponseFormatManager().getResponseFormat(ActionStatus.GENERAL_ERROR);
-        auditErrorImport(resourceMetaData, user, errorResponseWrapper, isNormative);
-        return errorResponseWrapper;
+        auditErrorImport(resourceMetaData, user, responseFormat, isNormative);
+        return responseFormat;
     }
 
     private void auditErrorImport(UploadResourceInfo resourceMetaData, User user, ResponseFormat errorResponseWrapper, boolean isNormative) {
-//        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class);
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, AuditingActionEnum.IMPORT_RESOURCE.getName());
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceMetaData.getName());
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, ComponentTypeEnum.RESOURCE.getValue());
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, "");
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, user.getUserId());
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, "");
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, "");
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, errorResponseWrapper.getStatus());
-//        String message = "";
-//        if (errorResponseWrapper.getMessageId() != null) {
-//            message = errorResponseWrapper.getMessageId() + ": ";
-//        }
-//        message += errorResponseWrapper.getFormattedMessage();
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, message);
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, user.getFirstName() + " " + user.getLastName());
-
         String version, lifeCycleState;
         if (isNormative) {
-            version = Constants.FIRST_CERTIFIED_VERSION_VERSION;
+            version = TypeUtils.FIRST_CERTIFIED_VERSION_VERSION;
             lifeCycleState = LifecycleStateEnum.CERTIFIED.name();
-        } else {
+        }
+        else {
             version = "";
             lifeCycleState = LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name();
 
         }
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, version);
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, lifeCycleState);
-//        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TOSCA_NODE_TYPE, "");
-//        getAuditingManager().auditEvent(auditingFields);
-
 
         String message = "";
         if (errorResponseWrapper.getMessageId() != null) {
@@ -807,22 +818,22 @@ public class ResourceImportManager {
         message += errorResponseWrapper.getFormattedMessage();
 
 
-
         AuditEventFactory factory = new AuditImportResourceAdminEventFactory(
                 CommonAuditData.newBuilder()
-                        .status(errorResponseWrapper.getStatus())
-                        .description(message)
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                ResourceAuditData.newBuilder()
-                        .state(lifeCycleState)
-                        .version(version)
-                        .build(),
-                ResourceAuditData.newBuilder()
-                        .state("")
-                        .version("")
-                        .build(),
-                ComponentTypeEnum.RESOURCE.getValue(), resourceMetaData.getName(), "", user, "");
+                               .status(errorResponseWrapper.getStatus())
+                               .description(message)
+                               .requestId(ThreadLocalsHolder.getUuid())
+                               .build(),
+                new ResourceCommonInfo(resourceMetaData.getName(), ComponentTypeEnum.RESOURCE.getValue()),
+                ResourceVersionInfo.newBuilder()
+                                 .state(lifeCycleState)
+                                 .version(version)
+                                 .build(),
+                ResourceVersionInfo.newBuilder()
+                                 .state("")
+                                 .version("")
+                                 .build(),
+                "", user, "");
         getAuditingManager().auditEvent(factory);
 
     }
@@ -838,7 +849,8 @@ public class ResourceImportManager {
         if (categories != null && !categories.isEmpty()) {
             CategoryDefinition categoryDef = categories.get(0);
             resource.setAbstract(false);
-            if (categoryDef != null && categoryDef.getName() != null && categoryDef.getName().equals(Constants.ABSTRACT_CATEGORY_NAME)) {
+            if (categoryDef != null && categoryDef.getName() != null && categoryDef.getName()
+                                                                                   .equals(Constants.ABSTRACT_CATEGORY_NAME)) {
                 SubCategoryDefinition subCategoryDef = categoryDef.getSubcategories().get(0);
                 if (subCategoryDef != null && subCategoryDef.getName().equals(Constants.ABSTRACT_SUBCATEGORY)) {
                     resource.setAbstract(true);
@@ -850,10 +862,11 @@ public class ResourceImportManager {
     private void setConstantMetaData(Resource resource, boolean shouldBeCertified) {
         String version;
         LifecycleStateEnum state;
-        if(shouldBeCertified){
-            version = ImportUtils.Constants.FIRST_CERTIFIED_VERSION_VERSION;
+        if (shouldBeCertified) {
+            version = TypeUtils.FIRST_CERTIFIED_VERSION_VERSION;
             state = ImportUtils.Constants.NORMATIVE_TYPE_LIFE_CYCLE;
-        }else{
+        }
+        else {
             version = ImportUtils.Constants.FIRST_NON_CERTIFIED_VERSION;
             state = ImportUtils.Constants.NORMATIVE_TYPE_LIFE_CYCLE_NOT_CERTIFIED_CHECKOUT;
         }
@@ -880,10 +893,11 @@ public class ResourceImportManager {
         }
         Object minObj = occurrensesList.get(0);
         Object maxObj = occurrensesList.get(1);
-        Integer minOccurrences = null;
+        Integer minOccurrences;
         Integer maxOccurrences = null;
-        if (minObj instanceof Integer)
+        if (minObj instanceof Integer) {
             minOccurrences = (Integer) minObj;
+        }
         else {
             log.debug("Invalid occurrenses format. low_bound occurrense must be Integer {}", minObj);
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_OCCURRENCES);
@@ -898,14 +912,17 @@ public class ResourceImportManager {
         if (maxObj instanceof String) {
             if ("UNBOUNDED".equals(maxObj)) {
                 return Either.left(true);
-            } else {
+            }
+            else {
                 log.debug("Invalid occurrenses format. Max occurrence is {}", maxObj);
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_OCCURRENCES);
                 return Either.right(responseFormat);
             }
-        } else {
-            if (maxObj instanceof Integer)
+        }
+        else {
+            if (maxObj instanceof Integer) {
                 maxOccurrences = (Integer) maxObj;
+            }
             else {
                 log.debug("Invalid occurrenses format.  Max occurrence is {}", maxObj);
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_OCCURRENCES);
@@ -938,8 +955,7 @@ public class ResourceImportManager {
     private ResourceBusinessLogic getResourceBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(org.openecomp.sdc.common.api.Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        ResourceBusinessLogic resourceBl = webApplicationContext.getBean(ResourceBusinessLogic.class);
-        return resourceBl;
+        return webApplicationContext.getBean(ResourceBusinessLogic.class);
     }
 
     public ServletContext getServletContext() {
@@ -966,10 +982,6 @@ public class ResourceImportManager {
         this.resourceBusinessLogic = resourceBusinessLogic;
     }
 
-    public Logger getLog() {
-        return log;
-    }
-
     public IGraphLockOperation getGraphLockOperation() {
         return graphLockOperation;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java
index a6344929a5..19d63f30b4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResponseFormatManager.java
@@ -25,18 +25,17 @@ import org.openecomp.sdc.be.config.ErrorConfiguration;
 import org.openecomp.sdc.be.config.ErrorInfo;
 import org.openecomp.sdc.be.config.ErrorInfo.ErrorInfoType;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.OkResponseInfo;
 import org.openecomp.sdc.exception.PolicyException;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.openecomp.sdc.exception.ServiceException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ResponseFormatManager {
 
     private volatile static ResponseFormatManager instance;
     private static ConfigurationManager configurationManager;
-    private static final Logger log = LoggerFactory.getLogger(ResponseFormatManager.class);
+    private static final Logger log = Logger.getLogger(ResponseFormatManager.class);
 
     public static ResponseFormatManager getInstance() {
         if (instance == null) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
index 48cbb35fdd..f30088ce9c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
@@ -20,30 +20,19 @@
 
 package org.openecomp.sdc.be.components.impl;
 
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.collections.CollectionUtils;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.distribution.engine.IDistributionEngine;
 import org.openecomp.sdc.be.components.distribution.engine.INotificationData;
 import org.openecomp.sdc.be.components.distribution.engine.VfModuleArtifactPayload;
 import org.openecomp.sdc.be.components.health.HealthCheckBusinessLogic;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
 import org.openecomp.sdc.be.components.path.ForwardingPathValidator;
 import org.openecomp.sdc.be.components.validation.ServiceDistributionValidation;
@@ -56,23 +45,13 @@ import org.openecomp.sdc.be.datamodel.ServiceRelations;
 import org.openecomp.sdc.be.datamodel.utils.UiComponentDataConverter;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.InstantiationTypes;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceDistributionReqInfo;
 import org.openecomp.sdc.be.impl.ForwardingPathUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.DistributionStatusEnum;
-import org.openecomp.sdc.be.model.DistributionTransitionEnum;
-import org.openecomp.sdc.be.model.GroupInstance;
-import org.openecomp.sdc.be.model.GroupInstanceProperty;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ForwardingPathOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
@@ -83,12 +62,9 @@ import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.resources.data.ComponentInstanceData;
 import org.openecomp.sdc.be.resources.data.ComponentMetadataData;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.AuditingGenericEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionDeployEvent;
-import org.openecomp.sdc.be.resources.data.auditing.DistributionNotificationEvent;
-import org.openecomp.sdc.be.resources.data.auditing.ResourceAdminEvent;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.*;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
@@ -96,76 +72,67 @@ import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
 import org.openecomp.sdc.common.kpi.api.ASDCKpiApi;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.common.util.ThreadLocalsHolder;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.common.base.Strings;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum.UPDATE_SERVICE_METADATA;
 
 @org.springframework.stereotype.Component("serviceBusinessLogic")
 public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
+    private static final String CHANGE_SERVICE_DISTRIBUTION = "Change Service Distribution";
+	private static final String THE_SERVICE_WITH_SYSTEM_NAME_LOCKED = "The service with system name {} locked. ";
+	private static final String FAILED_TO_LOCK_SERVICE_RESPONSE_IS = "Failed to lock service {}. Response is {}. ";
+	private static final String AUDIT_BEFORE_SENDING_RESPONSE = "audit before sending response";
+	private static final Logger log = Logger.getLogger(ServiceBusinessLogic.class);
+    private static final String INITIAL_VERSION = "0.1";
     private static final String STATUS_SUCCESS_200 = "200";
-
-    private static final String STATUS_DEPLOYED = "DEPLOYED";
-
-    @Autowired
-    private IElementOperation elementDao;
-
+	private static final String STATUS_DEPLOYED = "DEPLOYED";
     @Autowired
     private IDistributionEngine distributionEngine;
-
     @Autowired
     private AuditCassandraDao auditCassandraDao;
-
     @Autowired
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
-
-    @Autowired
-    private GroupBusinessLogic groupBusinessLogic;
-
     @Autowired
     private ICacheMangerOperation cacheManagerOperation;
-
     @Autowired
     private ServiceDistributionValidation serviceDistributionValidation;
 
-    private static final Logger log = LoggerFactory.getLogger(ServiceBusinessLogic.class);
-    private static final String INITIAL_VERSION = "0.1";
     @Autowired
     private ForwardingPathOperation forwardingPathOperation;
-
     @Autowired
     private ForwardingPathValidator forwardingPathValidator;
-
-    public ServiceBusinessLogic() {
-        log.debug("ServiceBusinessLogic started");
-    }
+    @Autowired
+    private UiComponentDataConverter uiComponentDataConverter;
 
     public Either<Service, ResponseFormat> changeServiceDistributionState(String serviceId, String state, LifecycleChangeInfoWithAction commentObj, User user) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(user.getUserId(), "change Service Distribution State", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(user.getUserId(), "change Service Distribution State", false);
 
         log.debug("check request state");
-        Either<DistributionTransitionEnum, ResponseFormat> validateEnum = validateTransitionEnum(state, user);
+        Either<DistributionTransitionEnum, ResponseFormat> validateEnum = validateTransitionEnum(state);
         if (validateEnum.isRight()) {
             return Either.right(validateEnum.right().value());
         }
         DistributionTransitionEnum distributionTransition = validateEnum.left().value();
         AuditingActionEnum auditAction = distributionTransition == DistributionTransitionEnum.APPROVE ? AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_APPROV : AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REJECT;
-        Either<String, ResponseFormat> commentResponse = validateComment(commentObj, user, auditAction);
+        Either<String, ResponseFormat> commentResponse = validateComment(commentObj);
         if (commentResponse.isRight()) {
             return Either.right(commentResponse.right().value());
         }
@@ -211,8 +178,8 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             titanDao.commit();
             Service updatedService = result.left().value();
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.OK);
-            log.debug("audit before sending response");
-            componentsUtils.auditComponent(responseFormat, user, updatedService, auditAction, ComponentTypeEnum.SERVICE, ResourceAuditData.newBuilder().build(), comment);
+            log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
+            componentsUtils.auditComponent(responseFormat, user, updatedService, auditAction, new ResourceCommonInfo(ComponentTypeEnum.SERVICE.getValue()), ResourceVersionInfo.newBuilder().build(), comment);
             return Either.left(result.left().value());
         } finally {
             graphLockOperation.unlockComponent(serviceId, NodeTypeEnum.Service);
@@ -221,10 +188,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     public Either<List<Map<String, Object>>, ResponseFormat> getComponentAuditRecords(String componentVersion, String componentUUID, String userId) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Component Audit Records", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get Component Audit Records", false);
         Either<List<Map<String, Object>>, ActionStatus> result;
         try {
 
@@ -268,24 +232,52 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             return Either.right(eitherCurrVerAudit.right().value());
         }
 
+
+        Either<List<ResourceAdminEvent>, ActionStatus> eitherArchiveRestoreList = getArchiveRestoreEventList(componentUUID);
+        if (eitherArchiveRestoreList.isRight()) {
+            return Either.right(eitherArchiveRestoreList.right().value());
+        }
+
         List<Map<String, Object>> prevVerAuditList = getAuditingFieldsList(eitherprevVerAudit.left().value());
         List<Map<String, Object>> currVerAuditList = getAuditingFieldsList(eitherCurrVerAudit.left().value());
 
-        List<Map<String, Object>> duplicateElements = new ArrayList<Map<String, Object>>();
+        List<Map<String, Object>> duplicateElements = new ArrayList<>();
         duplicateElements.addAll(prevVerAuditList);
         duplicateElements.retainAll(currVerAuditList);
 
-        List<Map<String, Object>> joinedNonDuplicatedList = new ArrayList<Map<String, Object>>();
+        List<Map<String, Object>> joinedNonDuplicatedList = new ArrayList<>();
         joinedNonDuplicatedList.addAll(prevVerAuditList);
         joinedNonDuplicatedList.removeAll(duplicateElements);
         joinedNonDuplicatedList.addAll(currVerAuditList);
+        joinedNonDuplicatedList.addAll(getAuditingFieldsList(eitherArchiveRestoreList.left().value()));
+
 
         return Either.left(joinedNonDuplicatedList);
     }
 
+    private Either<List<ResourceAdminEvent>, ActionStatus> getArchiveRestoreEventList(String componentUUID) {
+        // Archive Query
+        Either<List<ResourceAdminEvent>, ActionStatus> eitherArchiveAudit = auditCassandraDao.getArchiveAuditByServiceInstanceId(componentUUID);
+        if (eitherArchiveAudit.isRight()) {
+            return Either.right(eitherArchiveAudit.right().value());
+        }
+
+        // Restore Query
+        Either<List<ResourceAdminEvent>, ActionStatus> eitherRestoreAudit = auditCassandraDao.getRestoreAuditByServiceInstanceId(componentUUID);
+        if (eitherRestoreAudit.isRight()) {
+            return Either.right(eitherRestoreAudit.right().value());
+        }
+
+        List<ResourceAdminEvent> archiveAudit = new ArrayList<>();
+        archiveAudit.addAll(eitherArchiveAudit.left().value());
+        archiveAudit.addAll(eitherRestoreAudit.left().value());
+
+        return Either.left(archiveAudit);
+    }
+
     private List<Map<String, Object>> getAuditingFieldsList(List<? extends AuditingGenericEvent> prevVerAuditList) {
 
-        List<Map<String, Object>> prevVerAudit = new ArrayList<Map<String, Object>>();
+        List<Map<String, Object>> prevVerAudit = new ArrayList<>();
         for (AuditingGenericEvent auditEvent : prevVerAuditList) {
             auditEvent.fillFields();
             prevVerAudit.add(auditEvent.getFields());
@@ -305,19 +297,10 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     public Either<Service, ResponseFormat> createService(Service service, User user) {
 
         // get user details
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "Create Service", service, AuditingActionEnum.CREATE_RESOURCE, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
-
+        user = validateUser(user, "Create Service", service, AuditingActionEnum.CREATE_RESOURCE, false);
         // validate user role
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, service, new ArrayList<Role>(), AuditingActionEnum.CREATE_RESOURCE, null);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
+        validateUserRole(user, service, new ArrayList<>(), AuditingActionEnum.CREATE_RESOURCE, null);
         service.setCreatorUserId(user.getUserId());
-
         // warn on overridden fields
         checkFieldsForOverideAttampt(service);
         // enrich object
@@ -358,11 +341,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             createMandatoryArtifactsData(service, user);
             createServiceApiArtifactsData(service, user);
             setToscaArtifactsPlaceHolders(service, user);
-            Either<Resource, ResponseFormat> genericServiceEither = fetchAndSetDerivedFromGenericType(service);
-            if (genericServiceEither.isRight())
-                return Either.right(genericServiceEither.right().value());
-
-            generateAndAddInputsFromGenericTypeProperties(service, genericServiceEither.left().value());
+            generateAndAddInputsFromGenericTypeProperties(service, fetchAndSetDerivedFromGenericType(service));
 
             Either<Service, StorageOperationStatus> dataModelResponse = toscaOperationFacade.createToscaComponent(service);
 
@@ -376,7 +355,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             }
 
             ResponseFormat responseFormat = componentsUtils.getResponseFormatByComponent(componentsUtils.convertFromStorageResponse(dataModelResponse.right().value()), service, ComponentTypeEnum.SERVICE);
-            log.debug("audit before sending response");
+            log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
             componentsUtils.auditComponentAdmin(responseFormat, user, service, actionEnum, ComponentTypeEnum.SERVICE);
             return Either.right(responseFormat);
 
@@ -394,7 +373,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         String serviceUniqueId = service.getUniqueId();
         Map<String, ArtifactDefinition> artifactMap = service.getServiceApiArtifacts();
         if (artifactMap == null)
-            artifactMap = new HashMap<String, ArtifactDefinition>();
+            artifactMap = new HashMap<>();
 
         Map<String, Object> serviceApiArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration().getServiceApiArtifacts();
         List<String> exludeServiceCategory = ConfigurationManager.getConfigurationManager().getConfiguration().getExcludeServiceCategory();
@@ -439,77 +418,61 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         service.setInvariantUUID(invariantUUID);
 
         return Either.left(service);
-    }
-
+    }    
+    
+    
+   
     private Either<Boolean, ResponseFormat> validateServiceFieldsBeforeCreate(User user, Service service, AuditingActionEnum actionEnum) {
-        Either<Boolean, ResponseFormat> componentsFieldsValidation = validateComponentFieldsBeforeCreate(user, service, actionEnum);
-        if (componentsFieldsValidation.isRight()) {
-            return componentsFieldsValidation;
-        }
-
-        log.debug("validate service name uniqueness");
-        Either<Boolean, ResponseFormat> serviceNameUniquenessValidation = validateComponentNameUnique(user, service, actionEnum);
-        if (serviceNameUniquenessValidation.isRight()) {
-            return serviceNameUniquenessValidation;
-        }
-
-        log.debug("validate category");
-        Either<Boolean, ResponseFormat> categoryValidation = validateServiceCategory(user, service, actionEnum);
-        if (categoryValidation.isRight()) {
-            return categoryValidation;
-        }
-
-        // validate project name (ProjectCode) - mandatory in service
-        log.debug("validate projectName");
-        Either<Boolean, ResponseFormat> projectCodeValidation = validateProjectCode(user, service, actionEnum);
-        if (projectCodeValidation.isRight()) {
-            return projectCodeValidation;
-        }
+        try {
+            validateComponentFieldsBeforeCreate(user, service, actionEnum);
 
-        log.debug("validate service type");
-        Either<Boolean, ResponseFormat> serviceTypeValidation = validateServiceTypeAndCleanup(user, service, actionEnum);
-        if (serviceTypeValidation.isRight()) {
-            return serviceTypeValidation;
-        }
+            Either<Boolean, ResponseFormat> serviceNameUniquenessValidation = validateComponentNameUnique(user, service, actionEnum);
+            if (serviceNameUniquenessValidation.isRight()) {
+                throw new ComponentException(serviceNameUniquenessValidation.right().value());
+            }
+            Either<Boolean, ResponseFormat> categoryValidation = validateServiceCategory(user, service, actionEnum);
+            if (categoryValidation.isRight()) {
+                return categoryValidation;
+            }
+            Either<Boolean, ResponseFormat> projectCodeValidation = validateProjectCode(user, service, actionEnum);
+            if (projectCodeValidation.isRight()) {
+                return projectCodeValidation;
+            }
+            validateServiceTypeAndCleanup(service);
 
-        log.debug("validate service role");
-        Either<Boolean, ResponseFormat> serviceRoleValidation = validateServiceRoleAndCleanup(user, service, actionEnum);
-        if (serviceRoleValidation.isRight()) {
-            return serviceRoleValidation;
+            Either<Boolean, ResponseFormat> serviceRoleValidation = validateServiceRoleAndCleanup(user, service, actionEnum);
+            if (serviceRoleValidation.isRight()) {
+                return serviceRoleValidation;
+            }
+            return validateInstantiationTypeValue(user, service, actionEnum);
+        } catch (ComponentException exception) {
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(exception);
+            componentsUtils.auditComponentAdmin(responseFormat, user, service,
+                    AuditingActionEnum.CREATE_SERVICE, ComponentTypeEnum.SERVICE);
+            return Either.right(responseFormat);
         }
-
-        return Either.left(true);
-
     }
 
     private Either<Boolean, ResponseFormat> validateServiceCategory(User user, Service service, AuditingActionEnum actionEnum) {
         log.debug("validate Service category");
-
-        if (service.getCategories() == null || service.getCategories().size() == 0) {
+        if (isEmpty(service.getCategories())) {
             ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_MISSING_CATEGORY, ComponentTypeEnum.SERVICE.getValue());
             componentsUtils.auditComponentAdmin(errorResponse, user, service, actionEnum, ComponentTypeEnum.SERVICE);
             return Either.right(errorResponse);
         }
-
         Either<Boolean, ResponseFormat> validatCategory = validateServiceCategory(service.getCategories());
         if (validatCategory.isRight()) {
             ResponseFormat responseFormat = validatCategory.right().value();
             componentsUtils.auditComponentAdmin(responseFormat, user, service, actionEnum, ComponentTypeEnum.SERVICE);
             return Either.right(responseFormat);
         }
-
         return Either.left(true);
     }
 
     public Either<Map<String, Boolean>, ResponseFormat> validateServiceNameExists(String serviceName, String userId) {
-
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "validate Service Name Exists", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "validate Service Name Exists", false);
 
         Either<Boolean, StorageOperationStatus> dataModelResponse = toscaOperationFacade.validateComponentNameUniqueness(serviceName, null, ComponentTypeEnum.SERVICE);
-
         // DE242223
         titanDao.commit();
 
@@ -519,9 +482,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             log.debug("validation was successfully performed.");
             return Either.left(result);
         }
-
         ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(dataModelResponse.right().value()));
-
         return Either.right(responseFormat);
     }
 
@@ -542,17 +503,9 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     public Either<Service, ResponseFormat> updateServiceMetadata(String serviceId, Service serviceUpdate, User user) {
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "updateServiceMetadata", serviceUpdate, null, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
-
+        user = validateUser(user, "updateServiceMetadata", serviceUpdate, null, false);
         // validate user role
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, serviceUpdate, new ArrayList<>(), null, null);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
+        validateUserRole(user, serviceUpdate, new ArrayList<>(), null, null);
 
         Either<Service, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(serviceId);
         if (storageStatus.isRight()) {
@@ -595,17 +548,9 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     public Either<Set<String>, ResponseFormat> deleteForwardingPaths(String serviceId, Set<String> pathIdsToDelete, User user, boolean lock) {
         Service serviceToDelete = initServiceToDeletePaths(serviceId, pathIdsToDelete);
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "deleteForwardingPaths", serviceToDelete, null, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
-
+        user = validateUser(user, "deleteForwardingPaths", serviceToDelete, null, false);
         // validate user role
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, serviceToDelete, new ArrayList<>(), null, null);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
+        validateUserRole(user, serviceToDelete, new ArrayList<>(), null, null);
         Either<Service, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(serviceId);
         if (storageStatus.isRight()) {
             return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(storageStatus.right().value(), ComponentTypeEnum.SERVICE), ""));
@@ -623,12 +568,12 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         try{
             result = forwardingPathOperation.deleteForwardingPath(service ,pathIdsToDelete);
             if (result.isRight()) {
-                log.debug("Failed to lock service {}. Response is {}. ", service.getName(), result.right().value());
+                log.debug(FAILED_TO_LOCK_SERVICE_RESPONSE_IS, service.getName(), result.right().value());
                 titanDao.rollback();
                 return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(storageStatus.right().value(), ComponentTypeEnum.SERVICE)));
             }
             titanDao.commit();
-            log.debug("The service with system name {} locked. ", service.getSystemName());
+            log.debug(THE_SERVICE_WITH_SYSTEM_NAME_LOCKED, service.getSystemName());
 
         } catch (Exception e){
             log.error("Exception occurred during delete forwarding path : {}", e.getMessage(), e);
@@ -669,8 +614,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     private Either<Service, ResponseFormat> createOrUpdateForwardingPath(String serviceId, Service serviceUpdate, User user, boolean isUpdate, String errorContext, boolean lock) {
-        Either<Service, ResponseFormat> eitherCreator1 = validateUserAndRole(serviceUpdate, user, errorContext);
-        if (eitherCreator1 != null) return eitherCreator1;
+        validateUserAndRole(serviceUpdate, user, errorContext);
 
         Map<String, ForwardingPathDataDefinition> forwardingPaths = serviceUpdate.getForwardingPaths();
 
@@ -693,9 +637,6 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         }
         Service storedService = serviceStorageOperationStatusEither.left().value();
 
-        Set<ForwardingPathDataDefinition> forwardingPathDataDefinitions = trimmedForwardingPaths.entrySet().stream().map(entry -> entry.getValue())
-            .collect(Collectors.toSet());
-
         Either<ForwardingPathDataDefinition, StorageOperationStatus> result;
         Either<Component, StorageOperationStatus> forwardingPathOrigin = toscaOperationFacade.getLatestByName(ForwardingPathUtils.FORWARDING_PATH_NODE_NAME);
         if (forwardingPathOrigin.isRight()) {
@@ -715,11 +656,11 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             lockResult =
                 lockComponent(storedService.getUniqueId(), storedService, "Add or Update Forwarding Path on Service");
             if (lockResult.isRight()) {
-                log.debug("Failed to lock service {}. Response is {}. ", storedService.getName(),
+                log.debug(FAILED_TO_LOCK_SERVICE_RESPONSE_IS, storedService.getName(),
                     lockResult.right().value().getFormattedMessage());
                 return Either.right(lockResult.right().value());
             } else {
-                log.debug("The service with system name {} locked. ", storedService.getSystemName());
+                log.debug(THE_SERVICE_WITH_SYSTEM_NAME_LOCKED, storedService.getSystemName());
             }
         }
         Map<String, ForwardingPathDataDefinition> resultMap = new HashMap<>();
@@ -767,175 +708,118 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return service;
     }
 
-    private Either<Service, ResponseFormat> validateUserAndRole(Service serviceUpdate, User user, String errorContext) {
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, errorContext, serviceUpdate, null, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
-
-        // validate user role
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, serviceUpdate, new ArrayList<>(), null, null);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
-        return null;
-    }private Either<Service, ResponseFormat> validateAndUpdateServiceMetadata(User user, Service currentService, Service serviceUpdate) {
+    private void validateUserAndRole(Service serviceUpdate, User user, String errorContext) {
+        user = validateUser(user, errorContext, serviceUpdate, null, false);
+        validateUserRole(user, serviceUpdate, new ArrayList<>(), null, null);
 
-        boolean hasBeenCertified = ValidationUtils.hasBeenCertified(currentService.getVersion());
-        Either<Boolean, ResponseFormat> response = validateAndUpdateCategory(user, currentService, serviceUpdate, hasBeenCertified, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
+    }
 
-        String creatorUserIdUpdated = serviceUpdate.getCreatorUserId();
-        String creatorUserIdCurrent = currentService.getCreatorUserId();
-        if (creatorUserIdUpdated != null && !creatorUserIdCurrent.equals(creatorUserIdUpdated)) {
-            log.info("update srvice: recived request to update creatorUserId to {} the field is not updatable ignoring.", creatorUserIdUpdated);
-        }
+    @VisibleForTesting
+    Either<Service, ResponseFormat> validateAndUpdateServiceMetadata(User user, Service currentService, Service serviceUpdate) {
 
-        String creatorFullNameUpdated = serviceUpdate.getCreatorFullName();
-        String creatorFullNameCurrent = currentService.getCreatorFullName();
-        if (creatorFullNameUpdated != null && !creatorFullNameCurrent.equals(creatorFullNameUpdated)) {
-            log.info("update srvice: recived request to update creatorFullName to {} the field is not updatable ignoring.", creatorFullNameUpdated);
-        }
+        try {
+            boolean hasBeenCertified = ValidationUtils.hasBeenCertified(currentService.getVersion());
+            Either<Boolean, ResponseFormat> response = validateAndUpdateCategory(user, currentService, serviceUpdate, hasBeenCertified, UPDATE_SERVICE_METADATA);
+            if (response.isRight()) {
+                ResponseFormat errorResponse = response.right().value();
+                return Either.right(errorResponse);
+            }
 
-        String lastUpdaterUserIdUpdated = serviceUpdate.getLastUpdaterUserId();
-        String lastUpdaterUserIdCurrent = currentService.getLastUpdaterUserId();
-        if (lastUpdaterUserIdUpdated != null && !lastUpdaterUserIdCurrent.equals(lastUpdaterUserIdUpdated)) {
-            log.info("update srvice: recived request to update lastUpdaterUserId to {} the field is not updatable ignoring.", lastUpdaterUserIdUpdated);
-        }
+            verifyValuesAreIdentical(serviceUpdate.getCreatorUserId(), currentService.getCreatorUserId(), "creatorUserId");
+            verifyValuesAreIdentical(serviceUpdate.getCreatorFullName(), currentService.getCreatorFullName(), "creatorFullName");
+            verifyValuesAreIdentical(serviceUpdate.getLastUpdaterUserId(), currentService.getLastUpdaterUserId(), "lastUpdaterUserId");
+            verifyValuesAreIdentical(serviceUpdate.getLastUpdaterFullName(), currentService.getLastUpdaterFullName(), "lastUpdaterFullName");
 
-        String lastUpdaterFullNameUpdated = serviceUpdate.getLastUpdaterFullName();
-        String lastUpdaterFullNameCurrent = currentService.getLastUpdaterFullName();
-        if (lastUpdaterFullNameUpdated != null && !lastUpdaterFullNameCurrent.equals(lastUpdaterFullNameUpdated)) {
-            log.info("update srvice: recived request to update lastUpdaterFullName to {} the field is not updatable ignoring.", lastUpdaterFullNameUpdated);
-        }
+            response = validateAndUpdateServiceName(user, currentService, serviceUpdate, hasBeenCertified, null);
+            if (response.isRight()) {
+                return Either.right(response.right().value());
+            }
 
-        response = validateAndUpdateServiceName(user, currentService, serviceUpdate, hasBeenCertified, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
+            verifyValuesAreIdentical(serviceUpdate.getDistributionStatus(), currentService.getDistributionStatus(), "distributionStatus");
 
-        DistributionStatusEnum distributionStatusUpdated = serviceUpdate.getDistributionStatus();
-        DistributionStatusEnum distributionStatusCurrent = currentService.getDistributionStatus();
-        if (distributionStatusUpdated != null && !distributionStatusUpdated.name().equals(distributionStatusCurrent != null ? distributionStatusCurrent.name() : null)) {
-            log.info("update service: received request to update distributionStatus to {}. the field is read only, ignoring.", distributionStatusUpdated);
-        }
+            if (serviceUpdate.getProjectCode() != null) {
+                response = validateAndUpdateProjectCode(user, currentService, serviceUpdate, UPDATE_SERVICE_METADATA);
+                if (response.isRight()) {
+                    return Either.right(response.right().value());
+                }
+            }
 
-        if (serviceUpdate.getProjectCode() != null) {
-            response = validateAndUpdateProjectCode(user, currentService, serviceUpdate, null);
+            response = validateAndUpdateIcon(user, currentService, serviceUpdate, hasBeenCertified, UPDATE_SERVICE_METADATA);
             if (response.isRight()) {
-                ResponseFormat errorResponse = response.right().value();
-                return Either.right(errorResponse);
+                return Either.right(response.right().value());
             }
-        }
 
-        response = validateAndUpdateIcon(user, currentService, serviceUpdate, hasBeenCertified, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
-
-        Long creationDateUpdated = serviceUpdate.getCreationDate();
-        Long creationDateCurrent = currentService.getCreationDate();
-        if (creationDateUpdated != null && !creationDateCurrent.equals(creationDateUpdated)) {
-            log.info("update srvice: recived request to update creationDate to {} the field is not updatable ignoring.", creationDateUpdated);
-        }
+            verifyValuesAreIdentical(serviceUpdate.getCreationDate(), currentService.getCreationDate(), "creationDate");
+            verifyValuesAreIdentical(serviceUpdate.getVersion(), currentService.getVersion(), "version");
 
-        String versionUpdated = serviceUpdate.getVersion();
-        String versionCurrent = currentService.getVersion();
-        if (versionUpdated != null && !versionCurrent.equals(versionUpdated)) {
-            log.info("update srvice: recived request to update version to {} the field is not updatable ignoring.", versionUpdated);
-        }
+            response = validateAndUpdateDescription(user, currentService, serviceUpdate, UPDATE_SERVICE_METADATA);
+            if (response.isRight()) {
+                return Either.right(response.right().value());
+            }
 
-        response = validateAndUpdateDescription(user, currentService, serviceUpdate, hasBeenCertified, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
+            response = validateAndUpdateTags(user, currentService, serviceUpdate, UPDATE_SERVICE_METADATA);
+            if (response.isRight()) {
+                return Either.right(response.right().value());
+            }
 
-        response = validateAndUpdateTags(user, currentService, serviceUpdate, hasBeenCertified, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
+            response = validateAndUpdateContactId(user, currentService, serviceUpdate, UPDATE_SERVICE_METADATA);
+            if (response.isRight()) {
+                return Either.right(response.right().value());
+            }
 
-        response = validateAndUpdateContactId(user, currentService, serviceUpdate, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
+            verifyValuesAreIdentical(serviceUpdate.getLastUpdateDate(), currentService.getLastUpdateDate(), "lastUpdateDate");
+            verifyValuesAreIdentical(serviceUpdate.getLifecycleState(), currentService.getLifecycleState(), "lifecycleState");
+            verifyValuesAreIdentical(serviceUpdate.isHighestVersion(), currentService.isHighestVersion(), "isHighestVersion");
+            verifyValuesAreIdentical(serviceUpdate.getUUID(), currentService.getUUID(), "uuid");
 
-        Long lastUpdateDateUpdated = serviceUpdate.getLastUpdateDate();
-        Long lastUpdateDateCurrent = currentService.getLastUpdateDate();
-        if (lastUpdateDateUpdated != null && !lastUpdateDateCurrent.equals(lastUpdateDateUpdated)) {
-            log.info("update srvice: recived request to update lastUpdateDate to {} the field is not updatable ignoring.", lastUpdateDateUpdated);
-        }
+            validateAndUpdateServiceType(currentService, serviceUpdate);
 
-        LifecycleStateEnum lifecycleStateUpdated = serviceUpdate.getLifecycleState();
-        LifecycleStateEnum lifecycleStateCurrent = currentService.getLifecycleState();
-        if (lifecycleStateUpdated != null && !lifecycleStateCurrent.name().equals(lifecycleStateUpdated.name())) {
-            log.info("update srvice: recived request to update lifecycleState to {} the field is not updatable ignoring.", lifecycleStateUpdated);
-        }
+            response = validateAndUpdateServiceRole(user, currentService, serviceUpdate, UPDATE_SERVICE_METADATA);
+            if (response.isRight()) {
+                return Either.right(response.right().value());
+            }
 
-        Boolean isHighestVersionUpdated = serviceUpdate.isHighestVersion();
-        Boolean isHighestVersionCurrent = currentService.isHighestVersion();
-        if (isHighestVersionUpdated != null && !isHighestVersionCurrent.equals(isHighestVersionUpdated)) {
-            log.info("update srvice: recived request to update isHighestVersion to {} the field is not updatable ignoring.", isHighestVersionUpdated);
-        }
+            response = validateAndUpdateInstantiationTypeValue(user, currentService, serviceUpdate, UPDATE_SERVICE_METADATA);
+            if (response.isRight()) {
+                return Either.right(response.right().value());
+            }
 
-        String uuidUpdated = serviceUpdate.getUUID();
-        String uuidCurrent = currentService.getUUID();
-        if (!uuidCurrent.equals(uuidUpdated)) {
-            log.info("update service: recived request to update uuid to {} the field is not updatable ignoring.", uuidUpdated);
-        }
+            verifyValuesAreIdentical(serviceUpdate.getInvariantUUID(), currentService.getInvariantUUID(), "invariantUUID");
 
-        response = validateAndUpdateServiceType(user, currentService, serviceUpdate, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
+            validateAndUpdateEcompNaming(currentService, serviceUpdate);
 
-        response = validateAndUpdateServiceRole(user, currentService, serviceUpdate, null);
-        if (response.isRight()) {
-            ResponseFormat errorResponse = response.right().value();
-            return Either.right(errorResponse);
-        }
+            currentService.setEnvironmentContext(serviceUpdate.getEnvironmentContext());
 
-        String currentInvariantUuid = currentService.getInvariantUUID();
-        String updatedInvariantUuid = serviceUpdate.getInvariantUUID();
+            return Either.left(currentService);
 
-        if ((updatedInvariantUuid != null) && (!updatedInvariantUuid.equals(currentInvariantUuid))) {
-            log.warn("Product invariant UUID is automatically set and cannot be updated");
-            serviceUpdate.setInvariantUUID(currentInvariantUuid);
+        } catch (ComponentException exception) {
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(exception);
+            componentsUtils.auditComponentAdmin(responseFormat, user, serviceUpdate,
+                    AuditingActionEnum.UPDATE_SERVICE_METADATA, ComponentTypeEnum.SERVICE);
+            return Either.right(responseFormat);
         }
-        validateAndUpdateEcompNaming(currentService, serviceUpdate);
-
-        currentService.setEnvironmentContext(serviceUpdate.getEnvironmentContext());
-
-        return Either.left(currentService);
+    }
 
+    private void verifyValuesAreIdentical(Object updatedValue, Object originalValue, String fieldName) {
+        if (updatedValue != null && !updatedValue.equals(originalValue)) {
+            log.info("update service: received request to update {} to {} the field is not updatable ignoring.", fieldName, updatedValue);
+        }
     }
 
     private void validateAndUpdateEcompNaming(Service currentService, Service serviceUpdate) {
-        Boolean isEcompoGeneratedCurr = currentService.isEcompGeneratedNaming();
-        Boolean isEcompoGeneratedUpdate = serviceUpdate.isEcompGeneratedNaming();
-        if (isEcompoGeneratedUpdate != null && isEcompoGeneratedCurr.equals(isEcompoGeneratedUpdate)) {
-            currentService.setEcompGeneratedNaming(isEcompoGeneratedUpdate);
-        }
-        String namingPolicyUpd = serviceUpdate.getNamingPolicy();
-        if (!currentService.isEcompGeneratedNaming()) {
-            if (ValidationUtils.validateStringNotEmpty(namingPolicyUpd)) {
+        Boolean isEcompGeneratedCurr = currentService.isEcompGeneratedNaming();
+        Boolean isEcompGeneratedUpdate = serviceUpdate.isEcompGeneratedNaming();
+        if (isEcompGeneratedUpdate != null && !isEcompGeneratedUpdate.equals(isEcompGeneratedCurr)) {
+            currentService.setEcompGeneratedNaming(isEcompGeneratedUpdate);
+        }
+        String namingPolicyUpdate = serviceUpdate.getNamingPolicy();
+        if (currentService.isEcompGeneratedNaming()) {
+            currentService.setNamingPolicy(namingPolicyUpdate);
+        } else {
+            if (!StringUtils.isEmpty(namingPolicyUpdate)) {
                 log.warn("NamingPolicy must be empty for EcompGeneratedNaming=false");
-                currentService.setNamingPolicy("");
-            } else {
-                currentService.setNamingPolicy(namingPolicyUpd);
             }
-        }else{
-            currentService.setNamingPolicy(namingPolicyUpd);
+            currentService.setNamingPolicy("");
         }
     }
 
@@ -943,17 +827,13 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         String contactIdUpdated = serviceUpdate.getContactId();
         String contactIdCurrent = currentService.getContactId();
         if (!contactIdCurrent.equals(contactIdUpdated)) {
-            Either<Boolean, ResponseFormat> validatContactId = validateContactId(user, serviceUpdate, audatingAction);
-            if (validatContactId.isRight()) {
-                ResponseFormat errorRespons = validatContactId.right().value();
-                return Either.right(errorRespons);
-            }
+           validateContactId(user, serviceUpdate, audatingAction);
             currentService.setContactId(contactIdUpdated.toLowerCase());
         }
         return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateAndUpdateTags(User user, Service currentService, Service serviceUpdate, boolean hasBeenCertified, AuditingActionEnum audatingAction) {
+    private Either<Boolean, ResponseFormat> validateAndUpdateTags(User user, Service currentService, Service serviceUpdate, AuditingActionEnum audatingAction) {
         List<String> tagsUpdated = serviceUpdate.getTags();
         List<String> tagsCurrent = currentService.getTags();
         if (tagsUpdated == null || tagsUpdated.isEmpty()) {
@@ -963,25 +843,17 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         }
 
         if (!(tagsCurrent.containsAll(tagsUpdated) && tagsUpdated.containsAll(tagsCurrent))) {
-            Either<Boolean, ResponseFormat> validatResponse = validateTagsListAndRemoveDuplicates(user, serviceUpdate, audatingAction);
-            if (validatResponse.isRight()) {
-                ResponseFormat errorRespons = validatResponse.right().value();
-                return Either.right(errorRespons);
-            }
+            validateTagsListAndRemoveDuplicates(user, serviceUpdate, audatingAction);
             currentService.setTags(tagsUpdated);
         }
         return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateAndUpdateDescription(User user, Service currentService, Service serviceUpdate, boolean hasBeenCertified, AuditingActionEnum audatingAction) {
+    private Either<Boolean, ResponseFormat> validateAndUpdateDescription(User user, Service currentService, Service serviceUpdate, AuditingActionEnum audatingAction) {
         String descriptionUpdated = serviceUpdate.getDescription();
         String descriptionCurrent = currentService.getDescription();
         if (!descriptionCurrent.equals(descriptionUpdated)) {
-            Either<Boolean, ResponseFormat> validateDescriptionResponse = validateDescriptionAndCleanup(user, serviceUpdate, audatingAction);
-            if (validateDescriptionResponse.isRight()) {
-                ResponseFormat errorRespons = validateDescriptionResponse.right().value();
-                return Either.right(errorRespons);
-            }
+            validateDescriptionAndCleanup(user, serviceUpdate, audatingAction);
             currentService.setDescription(serviceUpdate.getDescription());
         }
         return Either.left(true);
@@ -1008,11 +880,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         String iconCurrent = currentService.getIcon();
         if (!iconCurrent.equals(iconUpdated)) {
             if (!hasBeenCertified) {
-                Either<Boolean, ResponseFormat> validatIconResponse = validateIcon(user, serviceUpdate, audatingAction);
-                if (validatIconResponse.isRight()) {
-                    ResponseFormat errorRespons = validatIconResponse.right().value();
-                    return Either.right(errorRespons);
-                }
+                validateIcon(user, serviceUpdate, audatingAction);
                 currentService.setIcon(iconUpdated);
             } else {
                 log.info("icon {} cannot be updated once the service has been certified once.", iconUpdated);
@@ -1028,12 +896,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         String serviceNameCurrent = currentService.getName();
         if (!serviceNameCurrent.equals(serviceNameUpdated)) {
             if (!hasBeenCertified) {
-                Either<Boolean, ResponseFormat> validatServiceNameResponse = validateComponentName(user, serviceUpdate, auditingAction);
-                if (validatServiceNameResponse.isRight()) {
-                    ResponseFormat errorRespons = validatServiceNameResponse.right().value();
-                    return Either.right(errorRespons);
-                }
-
+                validateComponentName(user, serviceUpdate, auditingAction);
                 Either<Boolean, ResponseFormat> serviceNameUniquenessValidation = validateComponentNameUnique(user, serviceUpdate, auditingAction);
                 if (serviceNameUniquenessValidation.isRight()) {
                     return serviceNameUniquenessValidation;
@@ -1051,54 +914,38 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(true);
     }
 
-    private Either<Boolean, ResponseFormat> validateAndUpdateServiceType(User user, Service currentService, Service updatedService, AuditingActionEnum auditingAction) {
+    private void validateAndUpdateServiceType(Service currentService, Service updatedService) {
         String updatedServiceType = updatedService.getServiceType();
         String currentServiceType = currentService.getServiceType();
         if (!currentServiceType.equals(updatedServiceType)) {
-            Either<Boolean, ResponseFormat> validateServiceType = validateServiceTypeAndCleanup(user, updatedService , auditingAction);
-            if (validateServiceType.isRight()) {
-                ResponseFormat errorResponse = validateServiceType.right().value();
-                componentsUtils.auditComponentAdmin(errorResponse, user, updatedService, auditingAction, ComponentTypeEnum.SERVICE);
-                return Either.right(errorResponse);
-            }
+            validateServiceTypeAndCleanup(updatedService);
             currentService.setServiceType(updatedServiceType);
         }
-        return Either.left(true);
     }
 
-    protected Either<Boolean, ResponseFormat> validateServiceTypeAndCleanup(User user, Component component, AuditingActionEnum actionEnum) {
+    private void validateServiceTypeAndCleanup(Component component) {
+        log.debug("validate service type");
         String serviceType = ((Service)component).getServiceType();
-        if (serviceType != null){
-            serviceType = cleanUpText(serviceType);
-            Either<Boolean, ResponseFormat> validateServiceType = validateServiceType(serviceType);
-            if (validateServiceType.isRight()) {
-                ResponseFormat responseFormat = validateServiceType.right().value();
-                componentsUtils.auditComponentAdmin(responseFormat, user, component, actionEnum, ComponentTypeEnum.SERVICE);
-                return Either.right(responseFormat);
-            }
-            return Either.left(true);
-        } else {
-            return Either.left(false);
+        if (serviceType == null) {
+            log.info("service type is not valid.");
+            throw new ComponentException(ActionStatus.INVALID_SERVICE_TYPE);
         }
+        serviceType = cleanUpText(serviceType);
+        validateServiceType(serviceType);
     }
 
 
-    private Either<Boolean, ResponseFormat> validateServiceType(String serviceType) {
-        if (serviceType.equals("")){
-            return Either.left(true);
-        } else {
-            if (!ValidationUtils.validateServiceTypeLength(serviceType)) {
-                log.info("service type exceeds limit.");
-                ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.SERVICE_TYPE_EXCEEDS_LIMIT, "" + ValidationUtils.SERVICE_TYPE_MAX_LENGTH);
-                return Either.right(errorResponse);
-            }
-
-            if (!ValidationUtils.validateIsEnglish(serviceType)) {
-                log.info("service type is not valid.");
-                ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_SERVICE_TYPE);
-                return Either.right(errorResponse);
-            }
-            return Either.left(true);
+    private void validateServiceType(String serviceType) {
+        if (serviceType.isEmpty()) {
+            return;
+        }
+        if (!ValidationUtils.validateServiceTypeLength(serviceType)) {
+            log.info("service type exceeds limit.");
+            throw new ComponentException(ActionStatus.SERVICE_TYPE_EXCEEDS_LIMIT, "" + ValidationUtils.SERVICE_TYPE_MAX_LENGTH);
+        }
+        if (!ValidationUtils.validateIsEnglish(serviceType)) {
+            log.info("service type is not valid.");
+            throw new ComponentException(ActionStatus.INVALID_SERVICE_TYPE);
         }
     }
 
@@ -1118,6 +965,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     protected Either<Boolean, ResponseFormat> validateServiceRoleAndCleanup(User user, Component component, AuditingActionEnum actionEnum) {
+        log.debug("validate service role");
         String serviceRole = ((Service)component).getServiceRole();
         if (serviceRole != null){
             serviceRole = cleanUpText(serviceRole);
@@ -1134,7 +982,33 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         }
     }
 
+    private Either<Boolean, ResponseFormat> validateAndUpdateInstantiationTypeValue(User user, Service currentService, Service updatedService, AuditingActionEnum auditingAction) {
+        String updatedInstaType= updatedService.getInstantiationType();
+        String currentInstaType = currentService.getInstantiationType();
+        if (!currentInstaType.equals(updatedInstaType)) {
+            Either<Boolean, ResponseFormat> validateInstantiationType = validateInstantiationTypeValue(user, updatedService , auditingAction);
+            if (validateInstantiationType.isRight()) {
+                ResponseFormat errorResponse = validateInstantiationType.right().value();
+                componentsUtils.auditComponentAdmin(errorResponse, user, updatedService, auditingAction, ComponentTypeEnum.SERVICE);
+                return Either.right(errorResponse);
+            }
+            currentService.setInstantiationType(updatedInstaType);
+        }
+        return Either.left(true);
+    }
 
+    private Either<Boolean, ResponseFormat> validateInstantiationTypeValue(User user, Service service, AuditingActionEnum actionEnum) {
+        log.debug("validate instantiation type");
+    	String instantiationType = service.getInstantiationType();
+    	if (!InstantiationTypes.containsName(instantiationType) || instantiationType == null){
+    			log.error("Recieved Instantiation type {} is not valid.", instantiationType);
+    			ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_INSTANTIATION_TYPE);
+    			componentsUtils.auditComponentAdmin(errorResponse, user, service, actionEnum, ComponentTypeEnum.SERVICE);
+    			return Either.right(errorResponse);
+    		}
+    		return Either.left(true);
+    }
+    
     private Either<Boolean, ResponseFormat> validateServiceRole(String serviceRole) {
         if (serviceRole.equals("")){
             return Either.left(true);
@@ -1154,15 +1028,12 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         }
     }
 
-
-
     private Either<Boolean, ResponseFormat> validateAndUpdateCategory(User user, Service currentService, Service serviceUpdate, boolean hasBeenCertified, AuditingActionEnum audatingAction) {
         List<CategoryDefinition> categoryUpdated = serviceUpdate.getCategories();
         List<CategoryDefinition> categoryCurrent = currentService.getCategories();
-        Either<Boolean, ResponseFormat> validatCategoryResponse = validateServiceCategory(user, serviceUpdate, audatingAction);
-        if (validatCategoryResponse.isRight()) {
-            ResponseFormat errorRespons = validatCategoryResponse.right().value();
-            return Either.right(errorRespons);
+        Either<Boolean, ResponseFormat> validateCategoryResponse = validateServiceCategory(user, serviceUpdate, audatingAction);
+        if (validateCategoryResponse.isRight()) {
+            return Either.right(validateCategoryResponse.right().value());
         }
         if (!categoryCurrent.get(0).getName().equals(categoryUpdated.get(0).getName())) {
             if (!hasBeenCertified) {
@@ -1177,7 +1048,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     }
 
-    public Either<Boolean, ResponseFormat> validateServiceCategory(List<CategoryDefinition> list) {
+    private Either<Boolean, ResponseFormat> validateServiceCategory(List<CategoryDefinition> list) {
         if (list != null) {
             if (list.size() > 1) {
                 log.debug("Must be only one category for service");
@@ -1224,16 +1095,13 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(serviceRelations);
 
 
-    }public ResponseFormat deleteService(String serviceId, User user) {
+    }
+
+    public ResponseFormat deleteService(String serviceId, User user) {
         ResponseFormat responseFormat;
         String ecompErrorContext = "delete service";
 
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(user, ecompErrorContext, false);
-        if (eitherCreator.isRight()) {
-            return eitherCreator.right().value();
-        }
-        user = eitherCreator.left().value();
-
+        validateUserExists(user, ecompErrorContext, false);
         Either<Service, StorageOperationStatus> serviceStatus = toscaOperationFacade.getToscaElement(serviceId);
         if (serviceStatus.isRight()) {
             log.debug("failed to get service {}", serviceId);
@@ -1245,12 +1113,9 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         StorageOperationStatus result = StorageOperationStatus.OK;
         Either<Boolean, ResponseFormat> lockResult = lockComponent(service, "Mark service to delete");
         if (lockResult.isRight()) {
-            result = StorageOperationStatus.GENERAL_ERROR;
-            return componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
+            return lockResult.right().value();
         }
-
         try {
-
             result = markComponentToDelete(service);
             if (result.equals(StorageOperationStatus.OK)) {
                 responseFormat = componentsUtils.getResponseFormat(ActionStatus.NO_CONTENT);
@@ -1259,7 +1124,6 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
                 responseFormat = componentsUtils.getResponseFormatByResource(actionStatus, service.getName());
             }
             return responseFormat;
-
         } finally {
             if (result == null || !result.equals(StorageOperationStatus.OK)) {
                 log.warn("operation failed. do rollback");
@@ -1276,16 +1140,8 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     public ResponseFormat deleteServiceByNameAndVersion(String serviceName, String version, User user) {
         ResponseFormat responseFormat;
         String ecompErrorContext = "delete service";
-        Either<User, ResponseFormat> validateEmptyResult = validateUserNotEmpty(user, ecompErrorContext);
-        if (validateEmptyResult.isRight()) {
-            return validateEmptyResult.right().value();
-        }
-
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(user, ecompErrorContext, false);
-        if (eitherCreator.isRight()) {
-            return eitherCreator.right().value();
-        }
-        user = eitherCreator.left().value();
+        validateUserNotEmpty(user, ecompErrorContext);
+        user = validateUserExists(user, ecompErrorContext, false);
 
         Either<Service, ResponseFormat> getResult = getServiceByNameAndVersion(serviceName, version, user.getUserId());
         if (getResult.isRight()) {
@@ -1325,15 +1181,8 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     public Either<Service, ResponseFormat> getService(String serviceId, User user) {
         String ecompErrorContext = "Get service";
-        Either<User, ResponseFormat> validateEmptyResult = validateUserNotEmpty(user, ecompErrorContext);
-        if (validateEmptyResult.isRight()) {
-            return Either.right(validateEmptyResult.right().value());
-        }
-
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(user, ecompErrorContext, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
+        validateUserNotEmpty(user, ecompErrorContext);
+        validateUserExists(user, ecompErrorContext, false);
 
         Either<Service, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(serviceId);
         if (storageStatus.isRight()) {
@@ -1353,10 +1202,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     public Either<Service, ResponseFormat> getServiceByNameAndVersion(String serviceName, String serviceVersion, String userId) {
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "get Service By Name And Version", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "get Service By Name And Version", false);
         Either<Service, StorageOperationStatus> storageStatus = toscaOperationFacade.getComponentByNameAndVersion(ComponentTypeEnum.SERVICE, serviceName, serviceVersion);
         if (storageStatus.isRight()) {
             log.debug("failed to get service by name {} and version {}", serviceName, serviceVersion);
@@ -1375,7 +1221,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         String serviceUniqueId = service.getUniqueId();
         Map<String, ArtifactDefinition> artifactMap = service.getArtifacts();
         if (artifactMap == null)
-            artifactMap = new HashMap<String, ArtifactDefinition>();
+            artifactMap = new HashMap<>();
 
         Map<String, Object> informationalServiceArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration().getInformationalServiceArtifacts();
         List<String> exludeServiceCategory = ConfigurationManager.getConfigurationManager().getConfiguration().getExcludeServiceCategory();
@@ -1416,12 +1262,12 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return artifactInfo;
     }
 
-    private Either<DistributionTransitionEnum, ResponseFormat> validateTransitionEnum(String distributionTransition, User user) {
+    private Either<DistributionTransitionEnum, ResponseFormat> validateTransitionEnum(String distributionTransition) {
         DistributionTransitionEnum transitionEnum = null;
 
         transitionEnum = DistributionTransitionEnum.getFromDisplayName(distributionTransition);
         if (transitionEnum == null) {
-            BeEcompErrorManager.getInstance().logBeSystemError("Change Service Distribution");
+            BeEcompErrorManager.getInstance().logBeSystemError(CHANGE_SERVICE_DISTRIBUTION);
             log.info("state operation is not valid. operations allowed are: {}", DistributionTransitionEnum.valuesAsString());
             ResponseFormat error = componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
             return Either.right(error);
@@ -1430,11 +1276,11 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return Either.left(transitionEnum);
     }
 
-    private Either<String, ResponseFormat> validateComment(LifecycleChangeInfoWithAction comment, User user, AuditingActionEnum auditAction) {
+    private Either<String, ResponseFormat> validateComment(LifecycleChangeInfoWithAction comment) {
         String data = comment.getUserRemarks();
 
         if (data == null || data.trim().isEmpty()) {
-            BeEcompErrorManager.getInstance().logBeInvalidJsonInput("Change Service Distribution");
+            BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CHANGE_SERVICE_DISTRIBUTION);
             log.debug("user comment cannot be empty or null.");
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
         }
@@ -1444,7 +1290,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         data = ValidationUtils.stripOctets(data);
 
         if (!ValidationUtils.validateLength(data, ValidationUtils.COMMENT_MAX_LENGTH)) {
-            BeEcompErrorManager.getInstance().logBeInvalidJsonInput("Change Service Distribution");
+            BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CHANGE_SERVICE_DISTRIBUTION);
             log.debug("user comment exceeds limit.");
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.EXCEEDS_LIMIT, "comment", String.valueOf(ValidationUtils.COMMENT_MAX_LENGTH)));
         }
@@ -1458,8 +1304,8 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         Either<Service, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(serviceId);
         if (storageStatus.isRight()) {
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.SERVICE_NOT_FOUND, serviceId);
-            log.debug("audit before sending response");
-            componentsUtils.auditComponent(responseFormat, user, auditAction, serviceId, ComponentTypeEnum.SERVICE, comment);
+            log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
+            componentsUtils.auditComponent(responseFormat, user, auditAction, new ResourceCommonInfo(serviceId, ComponentTypeEnum.SERVICE.getValue()), comment);
             return Either.right(responseFormat);
         }
         Service service = storageStatus.left().value();
@@ -1477,28 +1323,24 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         log.debug("get user from DB");
 
         // get user details
-        Either<User, ResponseFormat> eitherCreator = validateUser(user, "Activate Distribution", service, auditAction, false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-        user = eitherCreator.left().value();
-
+        user = validateUser(user, "Activate Distribution", service, auditAction, false);
         // validate user role
         List<Role> roles = new ArrayList<>();
         roles.add(Role.ADMIN);
         roles.add(Role.GOVERNOR);
         roles.add(Role.OPS);
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, service, roles, auditAction, comment);
-        if (validateRes.isRight()) {
-            return Either.right(validateRes.right().value());
-        }
+        validateUserRole(user, service, roles, auditAction, comment);
         return Either.left(user);
     }
 
     private void createAudit(User user, AuditingActionEnum auditAction, String comment, Service component, ResponseFormat responseFormat) {
-        log.debug("audit before sending response");
-        componentsUtils.auditComponent(responseFormat, user, component, auditAction, ComponentTypeEnum.SERVICE,
-                ResourceAuditData.newBuilder().state(component.getLifecycleState().name()).version(component.getVersion()).build(), comment);
+        log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
+        componentsUtils.auditComponent(responseFormat, user, component, auditAction, new ResourceCommonInfo(ComponentTypeEnum.SERVICE.getValue()),
+                ResourceVersionInfo.newBuilder()
+                        .state(component.getLifecycleState().name())
+                        .version(component.getVersion())
+                        .build(),
+                comment);
     }
 
     private String getEnvNameFromConfiguration() {
@@ -1517,24 +1359,16 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         ActivationRequestInformation activationRequestInformation = activationRequestInformationEither.left().value();
 
         Either<String, ResponseFormat> result = null;
-        ResponseFormat response = null;
         String did = ThreadLocalsHolder.getUuid();
         Service service = activationRequestInformation.getServiceToActivate();
-
-        StorageOperationStatus readyForDistribution = distributionEngine.verifyServiceHasDeploymentArtifacts(service);
-        if (readyForDistribution.equals(StorageOperationStatus.OK)) {
-            result = buildAndSendServiceNotification(service, envId, did, activationRequestInformation.getWorkloadContext(), modifier);
-        } else {
-            response = componentsUtils.getResponseFormatByDE(componentsUtils.convertFromStorageResponse(readyForDistribution), service.getName(), envId);
-            result = Either.right(response);
-        }
+        result = buildAndSendServiceNotification(service, envId, did, activationRequestInformation.getWorkloadContext(), modifier);
         return result;
     }
 
     public Either<String, ResponseFormat> buildAndSendServiceNotification(Service service, String envId, String did, String workloadContext, User modifier) {
         String envName = getEnvNameFromConfiguration();
         INotificationData notificationData = distributionEngine.buildServiceForDistribution(service, did, workloadContext);
-        ActionStatus notifyServiceResponse = distributionEngine.notifyService(did, service, notificationData, envId, envName, modifier.getUserId(), modifier.getFullName());
+        ActionStatus notifyServiceResponse = distributionEngine.notifyService(did, service, notificationData, envId, envName, modifier);
         if (notifyServiceResponse == ActionStatus.OK) {
             return Either.left(did);
         } else {
@@ -1547,20 +1381,14 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     public Either<Service, ResponseFormat> activateDistribution(String serviceId, String envName, User modifier, HttpServletRequest request) {
 
-        Either<User, ResponseFormat> eitherCreator = validateUserExists(modifier.getUserId(), "activate Distribution", false);
-        if (eitherCreator.isRight()) {
-            return Either.right(eitherCreator.right().value());
-        }
-
-        User user = eitherCreator.left().value();
-
+        User user = validateUserExists(modifier.getUserId(), "activate Distribution", false);
         Either<Service, ResponseFormat> result = null;
         ResponseFormat response = null;
         Service updatedService = null;
         String did = ThreadLocalsHolder.getUuid();
          // DE194021
         String configuredEnvName = ConfigurationManager.getConfigurationManager().getDistributionEngineConfiguration().getEnvironments().get(0);
-        if (configuredEnvName != null && false == envName.equals(configuredEnvName)) {
+        if (configuredEnvName != null && !configuredEnvName.equals(envName)) {
             log.trace("Update environment name to be {} instead of {}", configuredEnvName, envName);
             envName = configuredEnvName;
         }
@@ -1579,17 +1407,20 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         if (serviceRes.isRight()) {
             log.debug("failed retrieving service");
             response = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(serviceRes.right().value(), ComponentTypeEnum.SERVICE), serviceId);
-            componentsUtils.auditComponent(response, user, null, AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST, ComponentTypeEnum.SERVICE,
-                    ResourceAuditData.newBuilder().build(), did);
+            componentsUtils.auditComponent(response, user, null, AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST,
+                    new ResourceCommonInfo(ComponentTypeEnum.SERVICE.getValue()),
+                    ResourceVersionInfo.newBuilder()
+                            .build(),
+                    did);
             return Either.right(response);
         }
         Service service = serviceRes.left().value();
         String dcurrStatus = service.getDistributionStatus().name();
         String updatedStatus = dcurrStatus;
-        StorageOperationStatus readyForDistribution = distributionEngine.isReadyForDistribution(service, envName);
+        StorageOperationStatus readyForDistribution = distributionEngine.isReadyForDistribution(envName);
         if (readyForDistribution.equals(StorageOperationStatus.OK)) {
             INotificationData notificationData = distributionEngine.buildServiceForDistribution(service, did, null);
-            ActionStatus notifyServiceResponse = distributionEngine.notifyService(did, service, notificationData, envName, user.getUserId(), user.getFullName());
+            ActionStatus notifyServiceResponse = distributionEngine.notifyService(did, service, notificationData, envName, user);
             if (notifyServiceResponse == ActionStatus.OK) {
                 Either<Service, ResponseFormat> updateStateRes = updateDistributionStatusForActivation(service, user, DistributionStatusEnum.DISTRIBUTED);
                 if (updateStateRes.isLeft() && updateStateRes.left().value() != null) {
@@ -1609,12 +1440,17 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
                 result = Either.right(response);
             }
         } else {
-            response = componentsUtils.getResponseFormatByDE(componentsUtils.convertFromStorageResponse(readyForDistribution), service.getName(), envName);
+            response = componentsUtils.getResponseFormatByDE(componentsUtils.convertFromStorageResponse(readyForDistribution), envName);
             result = Either.right(response);
         }
-        componentsUtils.auditComponent(response, user, service, AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST, ComponentTypeEnum.SERVICE,
-                ResourceAuditData.newBuilder().distributionStatus(dcurrStatus).build(),
-                ResourceAuditData.newBuilder().distributionStatus(updatedStatus).build(), service.getName(),
+        componentsUtils.auditComponent(response, user, service, AuditingActionEnum.DISTRIBUTION_STATE_CHANGE_REQUEST,
+                new ResourceCommonInfo(service.getName(),ComponentTypeEnum.SERVICE.getValue()),
+                ResourceVersionInfo.newBuilder()
+                        .distributionStatus(dcurrStatus)
+                        .build(),
+                ResourceVersionInfo.newBuilder()
+                        .distributionStatus(updatedStatus)
+                        .build(),
                 null, null, did);
         return result;
     }
@@ -1622,10 +1458,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     // convert to private after deletion of temp url
     public Either<Service, ResponseFormat> updateDistributionStatusForActivation(Service service, User user, DistributionStatusEnum state) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(user.getUserId(), "update Distribution Status For Activation", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(user.getUserId(), "update Distribution Status For Activation", false);
 
         String serviceId = service.getUniqueId();
         Either<Boolean, ResponseFormat> lockResult = lockComponent(serviceId, service, "updateDistributionStatusForActivation");
@@ -1649,11 +1482,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     public Either<Service, ResponseFormat> markDistributionAsDeployed(String serviceId, String did, User user) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(user.getUserId(), "mark Distribution As Deployed", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
-
+        validateUserExists(user.getUserId(), "mark Distribution As Deployed", false);
         log.debug("mark distribution deployed");
 
         AuditingActionEnum auditAction = AuditingActionEnum.DISTRIBUTION_DEPLOY;
@@ -1667,13 +1496,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         }
 
         Service service = getServiceResponse.left().value();
-
-        Either<User, ResponseFormat> validateRoleForDeploy = validateRoleForDeploy(did, user, auditAction, service);
-        if (validateRoleForDeploy.isRight()) {
-            return Either.right(validateRoleForDeploy.right().value());
-        }
-        user = validateRoleForDeploy.left().value();
-
+        user = validateRoleForDeploy(did, user, auditAction, service);
         return checkDistributionAndDeploy(did, user, auditAction, service);
 
     }
@@ -1688,7 +1511,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     private List<ArtifactGenerator<ArtifactDefinition>> buildArtifactGenList(Service service, User modifier, boolean shouldLock, boolean inTransaction, ComponentInstance ri) {
-        List<ArtifactGenerator<ArtifactDefinition>> asList = new ArrayList<ArtifactGenerator<ArtifactDefinition>>();
+        List<ArtifactGenerator<ArtifactDefinition>> asList = new ArrayList<>();
 
         if (ri.getOriginType() == OriginTypeEnum.VF) {
             asList = Arrays.asList(new VfModuleArtifacGenerator(modifier, ri, service, shouldLock, inTransaction));
@@ -1696,15 +1519,15 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return asList;
     }
 
-    private List<GroupInstance> collectGroupsInstanceForCompInstance(ComponentInstance currVF, Wrapper<ResponseFormat> responseWrapper) {
+    private List<GroupInstance> collectGroupsInstanceForCompInstance(ComponentInstance currVF) {
         Map<String, ArtifactDefinition> deploymentArtifacts = currVF.getDeploymentArtifacts();
         if(currVF.getGroupInstances() != null){
-            currVF.getGroupInstances().stream().forEach(gi -> gi.alignArtifactsUuid(deploymentArtifacts));
+            currVF.getGroupInstances().forEach(gi -> gi.alignArtifactsUuid(deploymentArtifacts));
         }
         return currVF.getGroupInstances();
     }
 
-    private ArtifactDefinition getVfModuleInstArtifactForCompInstance(ComponentInstance currVF, Service service, User modifier, List<GroupInstance> groupsForCurrVF, Wrapper<String> payloadWrapper, Wrapper<ResponseFormat> responseWrapper) {
+    private ArtifactDefinition getVfModuleInstArtifactForCompInstance(ComponentInstance currVF, Service service, Wrapper<String> payloadWrapper, Wrapper<ResponseFormat> responseWrapper) {
         ArtifactDefinition vfModuleAertifact = null;
         if (MapUtils.isNotEmpty(currVF.getDeploymentArtifacts())) {
             Optional<ArtifactDefinition> optionalVfModuleArtifact = currVF.getDeploymentArtifacts().values().stream().filter(p -> p.getArtifactType().equals(ArtifactTypeEnum.VF_MODULES_METADATA.name())).findAny();
@@ -1713,7 +1536,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             }
         }
         if (vfModuleAertifact == null) {
-            Either<ArtifactDefinition, ResponseFormat> createVfModuleArtifact = createVfModuleArtifact(modifier, currVF, service, payloadWrapper.getInnerElement());
+            Either<ArtifactDefinition, ResponseFormat> createVfModuleArtifact = createVfModuleArtifact(currVF, service, payloadWrapper.getInnerElement());
             if (createVfModuleArtifact.isLeft()) {
                 vfModuleAertifact = createVfModuleArtifact.left().value();
             } else {
@@ -1724,43 +1547,40 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     private void fillVfModuleInstHeatEnvPayload(List<GroupInstance> groupsForCurrVF, Wrapper<String> payloadWrapper) {
-        // Converts GroupDefinition to VfModuleArtifactPayload which is the
-        // format used in the payload
-
-        List<VfModuleArtifactPayload> vfModulePayloadForCurrVF = new ArrayList<VfModuleArtifactPayload>();
+        List<VfModuleArtifactPayload> vfModulePayloads = new ArrayList<>();
         if (groupsForCurrVF != null) {
             for (GroupInstance groupInstance : groupsForCurrVF) {
                 VfModuleArtifactPayload modulePayload = new VfModuleArtifactPayload(groupInstance);
-                vfModulePayloadForCurrVF.add(modulePayload);
+                vfModulePayloads.add(modulePayload);
             }
-            Collections.sort(vfModulePayloadForCurrVF, (art1, art2) -> VfModuleArtifactPayload.compareByGroupName(art1, art2));
+            vfModulePayloads.sort(VfModuleArtifactPayload::compareByGroupName);
 
             final Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
-            String vfModulePayloadString = gson.toJson(vfModulePayloadForCurrVF);
+            String vfModulePayloadString = gson.toJson(vfModulePayloads);
             payloadWrapper.setInnerElement(vfModulePayloadString);
         }
 
     }
 
     private Either<ArtifactDefinition, ResponseFormat> generateVfModuleInstanceArtifact(User modifier, ComponentInstance currVFInstance, Service service, boolean shouldLock, boolean inTransaction) {
-        ArtifactDefinition vfModuleAertifact = null;
+        ArtifactDefinition vfModuleArtifact = null;
         Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
         Wrapper<String> payloadWrapper = new Wrapper<>();
-        List<GroupInstance> groupsForCurrVF = collectGroupsInstanceForCompInstance(currVFInstance, responseWrapper);
+        List<GroupInstance> groupsForCurrVF = collectGroupsInstanceForCompInstance(currVFInstance);
         if (responseWrapper.isEmpty()) {
             fillVfModuleInstHeatEnvPayload(groupsForCurrVF, payloadWrapper);
         }
         if (responseWrapper.isEmpty() && payloadWrapper.getInnerElement() != null) {
-            vfModuleAertifact = getVfModuleInstArtifactForCompInstance(currVFInstance, service, modifier, groupsForCurrVF, payloadWrapper, responseWrapper);
+            vfModuleArtifact = getVfModuleInstArtifactForCompInstance(currVFInstance, service, payloadWrapper, responseWrapper);
         }
-        if (responseWrapper.isEmpty() && vfModuleAertifact != null) {
-            vfModuleAertifact = fillVfModulePayload(modifier, currVFInstance, vfModuleAertifact, shouldLock, inTransaction, payloadWrapper, responseWrapper, service);
+        if (responseWrapper.isEmpty() && vfModuleArtifact != null) {
+            vfModuleArtifact = fillVfModulePayload(modifier, currVFInstance, vfModuleArtifact, shouldLock, inTransaction, payloadWrapper, responseWrapper, service);
         }
 
         Either<ArtifactDefinition, ResponseFormat> result;
         if (responseWrapper.isEmpty()) {
-            result = Either.left(vfModuleAertifact);
+            result = Either.left(vfModuleArtifact);
         } else {
             result = Either.right(responseWrapper.getInnerElement());
         }
@@ -1770,7 +1590,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     private ArtifactDefinition fillVfModulePayload(User modifier, ComponentInstance currVF, ArtifactDefinition vfModuleArtifact, boolean shouldLock, boolean inTransaction, Wrapper<String> payloadWrapper, Wrapper<ResponseFormat> responseWrapper, Service service) {
         ArtifactDefinition result = null;
-        Either<ArtifactDefinition, ResponseFormat> eitherPayload = artifactsBusinessLogic.generateArtifactPayload(vfModuleArtifact, ComponentTypeEnum.RESOURCE_INSTANCE, service, currVF.getName(), modifier, shouldLock, inTransaction, () -> System.currentTimeMillis(),
+        Either<ArtifactDefinition, ResponseFormat> eitherPayload = artifactsBusinessLogic.generateArtifactPayload(vfModuleArtifact, ComponentTypeEnum.RESOURCE_INSTANCE, service, currVF.getName(), modifier, shouldLock, inTransaction, System::currentTimeMillis,
                 () -> Either.left(artifactsBusinessLogic.createEsArtifactData(vfModuleArtifact, payloadWrapper.getInnerElement().getBytes(StandardCharsets.UTF_8))), currVF.getUniqueId());
         if (eitherPayload.isLeft()) {
             result = eitherPayload.left().value();
@@ -1784,7 +1604,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         return result;
     }
 
-    private Either<ArtifactDefinition, ResponseFormat> createVfModuleArtifact(User modifier, ComponentInstance currVF, Service service, String vfModulePayloadString) {
+    private Either<ArtifactDefinition, ResponseFormat> createVfModuleArtifact(ComponentInstance currVF, Service service, String vfModulePayloadString) {
 
         ArtifactDefinition vfModuleArtifactDefinition = new ArtifactDefinition();
         String newCheckSum = null;
@@ -1918,28 +1738,28 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     }
 
-    private synchronized Either<Service, ResponseFormat> checkDistributionAndDeploy(String did, User user, AuditingActionEnum auditAction, Service service) {
-        boolean isDeployed = isDistributionDeployed(did, service);
+    private synchronized Either<Service, ResponseFormat> checkDistributionAndDeploy(String distributionId, User user, AuditingActionEnum auditAction, Service service) {
+        boolean isDeployed = isDistributionDeployed(distributionId);
         if (isDeployed) {
             return Either.left(service);
         }
-        Either<Boolean, ResponseFormat> distributionSuccess = checkDistributionSuccess(did, user, auditAction, service);
+        Either<Boolean, ResponseFormat> distributionSuccess = checkDistributionSuccess(distributionId, user, auditAction, service);
         if (distributionSuccess.isRight()) {
             return Either.right(distributionSuccess.right().value());
         }
 
-        log.debug("mark distribution {} as deployed - success", did);
-        componentsUtils.auditServiceDistributionDeployed(auditAction, service.getName(), service.getVersion(), service.getUUID(), did, STATUS_DEPLOYED, "OK", user);
+        log.debug("mark distribution {} as deployed - success", distributionId);
+        componentsUtils.auditServiceDistributionDeployed(service.getName(), service.getVersion(), service.getUUID(), distributionId, STATUS_DEPLOYED, "OK", user);
         return Either.left(service);
     }
 
-    private boolean isDistributionDeployed(String did, Service service) {
-        Either<List<DistributionDeployEvent>, ActionStatus> alreadyDeployed = auditCassandraDao.getDistributionDeployByStatus(did, AuditingActionEnum.DISTRIBUTION_DEPLOY.getName(), STATUS_DEPLOYED);
+    private boolean isDistributionDeployed(String distributionId) {
+        Either<List<DistributionDeployEvent>, ActionStatus> alreadyDeployed = auditCassandraDao.getDistributionDeployByStatus(distributionId, AuditingActionEnum.DISTRIBUTION_DEPLOY.getName(), STATUS_DEPLOYED);
 
         boolean isDeployed = false;
         if (alreadyDeployed.isLeft() && !alreadyDeployed.left().value().isEmpty()) {
             // already deployed
-            log.debug("distribution {} is already deployed", did);
+            log.debug("distribution {} is already deployed", distributionId);
             isDeployed = true;
         }
         return isDeployed;
@@ -2010,36 +1830,35 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         message += error.getFormattedMessage();
 
         if (service != null) {
-            componentsUtils.auditServiceDistributionDeployed(auditAction, service.getName(), service.getVersion(), service.getUUID(), did, error.getStatus().toString(), message, user);
+            componentsUtils.auditServiceDistributionDeployed(service.getName(), service.getVersion(), service.getUUID(), did, error.getStatus().toString(), message, user);
         } else {
-            componentsUtils.auditServiceDistributionDeployed(auditAction, "", "", "", did, error.getStatus().toString(), message, user);
+            componentsUtils.auditServiceDistributionDeployed("", "", "", did, error.getStatus().toString(), message, user);
         }
         return error;
     }
 
-    private Either<User, ResponseFormat> validateRoleForDeploy(String did, User user, AuditingActionEnum auditAction, Service service) {
+    private User validateRoleForDeploy(String did, User user, AuditingActionEnum auditAction, Service service) {
         Either<User, ActionStatus> eitherCreator = userAdmin.getUser(user.getUserId(), false);
         if (eitherCreator.isRight() || eitherCreator.left().value() == null) {
             BeEcompErrorManager.getInstance().logBeUserMissingError("Deploy Service", user.getUserId());
             log.debug("validateRoleForDeploy method - user is not listed. userId= {}", user.getUserId());
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.USER_NOT_FOUND, user.getUserId());
             auditDeployError(did, user, auditAction, service, ActionStatus.USER_NOT_FOUND);
-            return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.USER_NOT_FOUND, user.getUserId());
         }
         user = eitherCreator.left().value();
         log.debug("validate user role");
         List<Role> roles = new ArrayList<>();
         roles.add(Role.ADMIN);
         roles.add(Role.OPS);
-        Either<Boolean, ResponseFormat> validateRes = validateUserRole(user, service, roles, auditAction, null);
-        if (validateRes.isRight()) {
+        try{
+            validateUserRole(user, service, roles, auditAction, null);
+        } catch (ComponentException e){
             log.info("role {} is not allowed to perform this action", user.getRole());
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION);
-            auditDeployError(did, user, auditAction, service, ActionStatus.RESTRICTED_OPERATION);
-            return Either.right(responseFormat);
+            auditDeployError(did, user, auditAction, service, e.getActionStatus());
+            throw e;
         }
-        return Either.left(user);
-
+        return user;
     }
 
     @Override
@@ -2055,8 +1874,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     private HealthCheckBusinessLogic getHealthCheckBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        HealthCheckBusinessLogic healthCheckBl = webApplicationContext.getBean(HealthCheckBusinessLogic.class);
-        return healthCheckBl;
+        return webApplicationContext.getBean(HealthCheckBusinessLogic.class);
     }
 
     @Override
@@ -2065,12 +1883,9 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     @Override
-    public Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(String componentId, ComponentTypeEnum componentTypeEnum, String userId, String searchText) {
+    public Either<List<ComponentInstance>, ResponseFormat> getComponentInstancesFilteredByPropertiesAndInputs(String componentId, String userId) {
 
-        Either<User, ResponseFormat> resp = validateUserExists(userId, "Get Component Instances", false);
-        if (resp.isRight()) {
-            return Either.right(resp.right().value());
-        }
+        validateUserExists(userId, "Get Component Instances", false);
         Either<Component, StorageOperationStatus> getComponentRes = toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll);
         if (getComponentRes.isRight()) {
             ResponseFormat responseFormat = componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(getComponentRes.right().value()));
@@ -2100,12 +1915,6 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }/**
      * updates group instance with new property values in case of successful update of group instance related component instance will be updated with new modification time and related service will be updated with new last update date
      *
-     * @param modifier
-     * @param serviceId
-     * @param componentInstanceId
-     * @param groupInstanceId
-     * @param newProperties
-     * @return
      */
     public Either<List<GroupInstanceProperty>, ResponseFormat> updateGroupInstancePropertyValues(User modifier, String serviceId, String componentInstanceId, String groupInstanceId, List<GroupInstanceProperty> newProperties) {
 
@@ -2124,10 +1933,10 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
                 component = validateUserAndComponentRes.left().value().getKey();
                 lockResult = lockComponentByName(component.getSystemName(), component, "Update Group Instance on Service");
                 if (lockResult.isRight()) {
-                    log.debug("Failed to lock service {}. Response is {}. ", component.getName(), lockResult.right().value().getFormattedMessage());
+                    log.debug(FAILED_TO_LOCK_SERVICE_RESPONSE_IS, component.getName(), lockResult.right().value().getFormattedMessage());
                     actionResult = Either.right(lockResult.right().value());
                 } else {
-                    log.debug("The service with system name {} locked. ", component.getSystemName());
+                    log.debug(THE_SERVICE_WITH_SYSTEM_NAME_LOCKED, component.getSystemName());
                 }
             }
             if (actionResult == null) {
@@ -2157,27 +1966,26 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         Either<GroupInstance, ResponseFormat> updateGroupInstanceResult = null;
         GroupInstance updatedGroupInstance = null;
         boolean inTransaction = true;
-        boolean shouldCloseTransaction = true;
         findGroupInstanceRes = findGroupInstanceOnRelatedComponentInstance(component, componentInstanceId, groupInstanceId);
         if (findGroupInstanceRes.isRight()) {
-            log.debug("Group instance {} not found. ", groupInstanceId);
+            log.debug("#validateAndUpdateGroupInstancePropertyValuesAndContainingParents - Group instance {} not found. ", groupInstanceId);
             actionResult = Either.right(findGroupInstanceRes.right().value());
         }
         if (actionResult == null) {
             oldGroupInstance = findGroupInstanceRes.left().value().getValue();
             relatedComponentInstance = findGroupInstanceRes.left().value().getKey();
-            updateGroupInstanceResult = groupBusinessLogic.validateAndUpdateGroupInstancePropertyValues(component.getUniqueId(), componentInstanceId, oldGroupInstance, newProperties, inTransaction);
+            updateGroupInstanceResult = groupBusinessLogic.validateAndUpdateGroupInstancePropertyValues(component.getUniqueId(), componentInstanceId, oldGroupInstance, newProperties);
             if (updateGroupInstanceResult.isRight()) {
-                log.debug("Failed to update group instance {} property values. ", oldGroupInstance.getName());
+                log.debug("#validateAndUpdateGroupInstancePropertyValuesAndContainingParents - Failed to update group instance {} property values. ", oldGroupInstance.getName());
                 actionResult = Either.right(updateGroupInstanceResult.right().value());
             }
         }
         if (actionResult == null) {
             updatedGroupInstance = updateGroupInstanceResult.left().value();
             if (!oldGroupInstance.getModificationTime().equals(updatedGroupInstance.getModificationTime())) {
-                updateParentsModificationTimeRes = updateParentsModificationTimeAndCustomizationUuid(component, relatedComponentInstance, updatedGroupInstance, inTransaction, shouldCloseTransaction);
+                updateParentsModificationTimeRes = updateParentsModificationTimeAndCustomizationUuid(component, relatedComponentInstance, updatedGroupInstance, inTransaction);
                 if (updateParentsModificationTimeRes.isRight()) {
-                    log.debug("Failed to update modification time. ", oldGroupInstance.getName());
+                    log.debug("#validateAndUpdateGroupInstancePropertyValuesAndContainingParents - Failed to update modification time for group instance {}. ", oldGroupInstance.getName());
                     actionResult = Either.right(updateParentsModificationTimeRes.right().value());
                 }
             }
@@ -2189,7 +1997,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
     }
 
     private Either<ImmutablePair<ComponentMetadataData, ComponentInstanceData>, ResponseFormat> updateParentsModificationTimeAndCustomizationUuid(Component component, ComponentInstance relatedComponentInstance, GroupInstance updatedGroupInstance,
-                                                                                                                                                  boolean inTranscation, boolean shouldCloseTransaction) {
+                                                                                                                                                  boolean inTranscation) {
 
         Either<ImmutablePair<ComponentMetadataData, ComponentInstanceData>, ResponseFormat> actionResult;
         Either<ComponentMetadataData, StorageOperationStatus> serviceMetadataUpdateResult;
@@ -2199,7 +2007,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
             log.debug("Failed to update component instance {} after update of group instance {}. ", relatedComponentInstance.getName(), updatedGroupInstance.getName());
             actionResult = Either.right(updateComponentInstanceRes.right().value());
         } else {
-            serviceMetadataUpdateResult = toscaOperationFacade.updateComponentLastUpdateDateOnGraph(component, updatedGroupInstance.getModificationTime());
+            serviceMetadataUpdateResult = toscaOperationFacade.updateComponentLastUpdateDateOnGraph(component);
             if (serviceMetadataUpdateResult.isRight()) {
                 log.debug("Failed to update service {} after update of component instance {} with new property values of group instance {}. ", component.getName(), relatedComponentInstance.getName(), updatedGroupInstance.getName());
                 actionResult = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(serviceMetadataUpdateResult.right().value())));
@@ -2218,21 +2026,21 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         Component component = null;
         Either<User, ResponseFormat> validationUserResult = validateUserIgnoreAudit(modifier, "updateGroupInstancePropertyValues");
         if (validationUserResult.isRight()) {
-            log.debug("Failed to validate user with userId for update service {}. ", modifier.getUserId(), serviceId);
+            log.debug("#validateUserAndComponent - Failed to validate user with userId {}, for update service {}. ", modifier.getUserId(), serviceId);
             result = Either.right(validationUserResult.right().value());
         }
         if (result == null) {
             currUser = validationUserResult.left().value();
             validateComponentExistsRes = validateComponentExists(serviceId, ComponentTypeEnum.SERVICE, null);
             if (validateComponentExistsRes.isRight()) {
-                log.debug("Failed to validate service existing {}. ", serviceId);
+                log.debug("#validateUserAndComponent - Failed to validate service existing {}. ", serviceId);
                 result = Either.right(validateComponentExistsRes.right().value());
             }
         }
         if (result == null) {
             component = validateComponentExistsRes.left().value();
             if (!ComponentValidationUtils.canWorkOnComponent(component, currUser.getUserId())) {
-                log.info("Restricted operation for user: {}, on service: {}", currUser.getUserId(), component.getCreatorUserId());
+                log.info("#validateUserAndComponent - Restricted operation for user: {}, on service: {}", currUser.getUserId(), component.getCreatorUserId());
                 return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
             }
         }
@@ -2250,7 +2058,8 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
         if (foundComponentInstance == null) {
             log.debug("Component instance {} not found on service {}. ", componentInstanceId, component.getName());
             actionResult = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstanceId, "resource instance", "service", component.getName()));
-        } else if (!CollectionUtils.isEmpty(foundComponentInstance.getGroupInstances())) {
+        }
+        else if (isNotEmpty(foundComponentInstance.getGroupInstances())) {
             groupInstance = foundComponentInstance.getGroupInstances().stream().filter(gi -> gi.getUniqueId().equals(groupInstanceId)).findFirst().orElse(null);
             if (groupInstance == null) {
                 log.debug("Group instance {} not found on component instance {}. ", groupInstanceId, foundComponentInstance.getName());
@@ -2265,43 +2074,38 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
 
     private ComponentInstance findRelatedComponentInstance(Component component, String componentInstanceId) {
         ComponentInstance componentInstance = null;
-        if (!CollectionUtils.isEmpty(component.getComponentInstances())) {
+        if (isNotEmpty(component.getComponentInstances())) {
             componentInstance = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(componentInstanceId)).findFirst().orElse(null);
         }
         return componentInstance;
     }
 
     private Either<User, ResponseFormat> validateUserIgnoreAudit(User modifier, String ecompErrorContext) {
-        Either<User, ResponseFormat> result = validateUser(modifier, ecompErrorContext, null, null, false);
-        if (result.isLeft()) {
-            List<Role> roles = new ArrayList<>();
-            roles.add(Role.ADMIN);
-            roles.add(Role.DESIGNER);
-            Either<Boolean, ResponseFormat> validationRoleRes = validateUserRole(result.left().value(), roles);
-            if (validationRoleRes.isRight()) {
-                result = Either.right(validationRoleRes.right().value());
-            }
-        }
-        return result;
+        User user = validateUser(modifier, ecompErrorContext, null, null, false);
+        List<Role> roles = new ArrayList<>();
+        roles.add(Role.ADMIN);
+        roles.add(Role.DESIGNER);
+        validateUserRole(user, roles);
+        return Either.left(user);
     }
 
     public Either<UiComponentDataTransfer, ResponseFormat> getUiComponentDataTransferByComponentId(String serviceId, List<String> dataParamsToReturn) {
 
-        ComponentParametersView paramsToRetuen = new ComponentParametersView(dataParamsToReturn);
-        Either<Service, StorageOperationStatus> serviceResultEither = toscaOperationFacade.getToscaElement(serviceId, paramsToRetuen);
+        ComponentParametersView paramsToReturn = new ComponentParametersView(dataParamsToReturn);
+        Either<Service, StorageOperationStatus> serviceResultEither = toscaOperationFacade.getToscaElement(serviceId, paramsToReturn);
 
         if (serviceResultEither.isRight()) {
             if(serviceResultEither.right().value().equals(StorageOperationStatus.NOT_FOUND)) {
-                log.debug("Failed to found service with id {} ", serviceId);
-                Either.right(componentsUtils.getResponseFormat(ActionStatus.SERVICE_NOT_FOUND, serviceId));
+                log.debug("#getUiComponentDataTransferByComponentId - Failed to find service with id {} ", serviceId);
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.SERVICE_NOT_FOUND, serviceId));
             }
 
-            log.debug("failed to get service by id {} with filters {}", serviceId, dataParamsToReturn.toString());
+            log.debug("#getUiComponentDataTransferByComponentId - failed to get service by id {} with filters {}", serviceId, dataParamsToReturn);
             return Either.right(componentsUtils.getResponseFormatByResource(componentsUtils.convertFromStorageResponse(serviceResultEither.right().value()), ""));
         }
 
         Service service = serviceResultEither.left().value();
-        UiComponentDataTransfer dataTransfer = UiComponentDataConverter.getUiDataTransferFromServiceByParams(service, dataParamsToReturn);
+        UiComponentDataTransfer dataTransfer = uiComponentDataConverter.getUiDataTransferFromServiceByParams(service, dataParamsToReturn);
         return Either.left(dataTransfer);
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/ComponentException.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/ComponentException.java
index 6347bc2eaf..69ac1b892a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/ComponentException.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/ComponentException.java
@@ -10,12 +10,11 @@ public class ComponentException extends RuntimeException {
      */
 
     private final transient ResponseFormat responseFormat;
-
     private final ActionStatus actionStatus;
     private final String[] params;
 
     public ComponentException(ResponseFormat responseFormat) {
-        this(responseFormat, ActionStatus.OK, null);
+        this(responseFormat, ActionStatus.OK);
     }
 
     public ComponentException(ActionStatus actionStatus, String... params) {
@@ -24,7 +23,7 @@ public class ComponentException extends RuntimeException {
 
     private ComponentException(ResponseFormat responseFormat, ActionStatus actionStatus, String... params) {
         this.actionStatus = actionStatus;
-        this.params = params;
+        this.params = params.clone();
         this.responseFormat = responseFormat;
     }
 
@@ -37,7 +36,7 @@ public class ComponentException extends RuntimeException {
     }
 
     public String[] getParams() {
-        return params;
+        return params.clone();
     }
 
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/SdcResourceNotFoundException.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/SdcResourceNotFoundException.java
new file mode 100644
index 0000000000..227ce20a1a
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/exceptions/SdcResourceNotFoundException.java
@@ -0,0 +1,12 @@
+package org.openecomp.sdc.be.components.impl.exceptions;
+
+public class SdcResourceNotFoundException extends RuntimeException {
+
+	private static final long serialVersionUID = 4431147390120646573L;
+
+	public SdcResourceNotFoundException(){}
+
+	public SdcResourceNotFoundException(String message){
+		super(message);
+	}
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/generic/GenericTypeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/generic/GenericTypeBusinessLogic.java
index 94d4373795..93d79a361e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/generic/GenericTypeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/generic/GenericTypeBusinessLogic.java
@@ -1,9 +1,6 @@
 package org.openecomp.sdc.be.components.impl.generic;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -15,17 +12,18 @@ import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @org.springframework.stereotype.Component
 public class GenericTypeBusinessLogic {
 
-    private final static Logger log = LoggerFactory.getLogger(GenericTypeBusinessLogic.class);
+    private final static Logger log = Logger.getLogger(GenericTypeBusinessLogic.class);
 
     @Autowired
     private ComponentsUtils componentsUtils;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/group/GroupMembersUpdater.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/group/GroupMembersUpdater.java
new file mode 100644
index 0000000000..609a705639
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/group/GroupMembersUpdater.java
@@ -0,0 +1,56 @@
+package org.openecomp.sdc.be.components.impl.group;
+
+import org.apache.commons.collections.MapUtils;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.commons.collections.MapUtils.isEmpty;
+
+/**
+ * A Helper class which handles altering the members state of a group
+ */
+@Component
+public class GroupMembersUpdater {
+
+    public void removeMember(List<GroupDefinition> groups, String memberId) {
+        groups.forEach(group -> removeGroupMember(group, memberId));
+    }
+
+    public void replaceMember(List<GroupDefinition> groups, String oldMemberId, String newMemberId) {
+        groups.forEach(grp -> replaceMember(grp, oldMemberId, newMemberId));
+    }
+
+    private void removeGroupMember(GroupDefinition group, String memberId) {
+        Map<String, String> membersNameToId = group.getMembers();
+        String groupMemberKey = findGroupMemberKey(membersNameToId, memberId);
+        if (groupMemberKey != null) {
+            membersNameToId.remove(groupMemberKey);
+        }
+    }
+
+    private void replaceMember(GroupDefinition group, String oldMemberId, String newMemberId) {
+        Map<String, String> membersNameToId = group.getMembers();
+        String groupMemberKey = findGroupMemberKey(membersNameToId, oldMemberId);
+        if (groupMemberKey != null) {
+            membersNameToId.replace(groupMemberKey, newMemberId);
+        }
+    }
+
+    private String findGroupMemberKey(Map<String, String> members, String memberToFind) {
+        if (isEmpty(members)) {
+            return null;
+        }
+        Map invertedMap = MapUtils.invertMap(members);
+        if (!invertedMap.containsKey(memberToFind)) {
+            return null;
+        }
+        return invertedMap.get(memberToFind).toString();
+    }
+
+
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/ComponentInstanceChangeOperationOrchestrator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/ComponentInstanceChangeOperationOrchestrator.java
new file mode 100644
index 0000000000..e922daf837
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/ComponentInstanceChangeOperationOrchestrator.java
@@ -0,0 +1,43 @@
+package org.openecomp.sdc.be.components.impl.instance;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+
+@org.springframework.stereotype.Component
+public class ComponentInstanceChangeOperationOrchestrator {
+
+    private static final Logger log = Logger.getLogger(ComponentInstanceChangeOperationOrchestrator.class);
+    private final List<OnComponentInstanceChangeOperation> onInstanceChangeOperations;
+
+    public ComponentInstanceChangeOperationOrchestrator(List<OnComponentInstanceChangeOperation> onInstanceChangeOperations) {
+        this.onInstanceChangeOperations = onInstanceChangeOperations;
+    }
+
+    public ActionStatus doPostChangeVersionOperations(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
+        log.debug("#doPostChangeVersionOperations - starting post change version operations for component {}. from instance {} to instance {}", container.getUniqueId(), prevVersion.getUniqueId(), newVersion.getUniqueId());
+        Function<OnComponentInstanceChangeOperation, ActionStatus> instanceChangeTaskRunner = operation -> operation.onChangeVersion(container, prevVersion, newVersion);
+        return doOnChangeInstanceOperations(instanceChangeTaskRunner);
+    }
+
+    public ActionStatus doOnDeleteInstanceOperations(Component container, String deletedInstanceId) {
+        log.debug("#doPostChangeVersionOperations - starting on delete instance operations for component {} and instance {}.", container.getUniqueId(), deletedInstanceId);
+        Function<OnComponentInstanceChangeOperation, ActionStatus> instanceChangeTaskRunner = operation -> operation.onDelete(container, deletedInstanceId);
+        return doOnChangeInstanceOperations(instanceChangeTaskRunner);
+    }
+
+    private ActionStatus doOnChangeInstanceOperations(Function<OnComponentInstanceChangeOperation, ActionStatus> instanceChangeTaskRunner) {
+        ActionStatus onDeleteInstanceResult = ActionStatus.OK;
+        Iterator<OnComponentInstanceChangeOperation> onDeleteInstIter = onInstanceChangeOperations.iterator();
+        while(onDeleteInstIter.hasNext() && onDeleteInstanceResult == ActionStatus.OK) {
+            onDeleteInstanceResult = instanceChangeTaskRunner.apply(onDeleteInstIter.next());
+        }
+        return onDeleteInstanceResult;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/GroupMembersUpdateOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/GroupMembersUpdateOperation.java
new file mode 100644
index 0000000000..cc6e9e9cd3
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/GroupMembersUpdateOperation.java
@@ -0,0 +1,62 @@
+package org.openecomp.sdc.be.components.impl.instance;
+
+import org.openecomp.sdc.be.components.impl.group.GroupMembersUpdater;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+@org.springframework.stereotype.Component
+public class GroupMembersUpdateOperation implements OnComponentInstanceChangeOperation {
+
+    private static final Logger log = Logger.getLogger(GroupMembersUpdateOperation.class);
+    private final GroupsOperation groupsOperation;
+    private final ComponentsUtils componentsUtils;
+    private final GroupMembersUpdater groupMembersUpdater;
+
+    public GroupMembersUpdateOperation(GroupsOperation groupsOperation, ComponentsUtils componentsUtils, GroupMembersUpdater groupMembersUpdater) {
+        this.groupsOperation = groupsOperation;
+        this.componentsUtils = componentsUtils;
+        this.groupMembersUpdater = groupMembersUpdater;
+    }
+
+    @Override
+    public ActionStatus onChangeVersion(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
+        log.debug("#onChangeVersion - replacing all group members for component instance {} with new component instance on component", prevVersion.getUniqueId(), newVersion.getUniqueId(), container.getUniqueId());
+        Consumer<List<GroupDefinition>> replaceGroupMemberTask = (groups) -> groupMembersUpdater.replaceMember(groups, prevVersion.getUniqueId(), newVersion.getUniqueId());
+        return doUpdateGroupMembers(container, prevVersion.getUniqueId(), replaceGroupMemberTask);
+    }
+
+    @Override
+    public ActionStatus onDelete(Component container, String deletedEntityId) {
+        log.debug("#onDelete - deleting group member referencing component instance {} on component {}.", deletedEntityId, container.getUniqueId());
+        Consumer<List<GroupDefinition>> deleteGroupMemberTask = (groups) -> groupMembersUpdater.removeMember(groups, deletedEntityId);
+        return doUpdateGroupMembers(container, deletedEntityId, deleteGroupMemberTask);
+    }
+
+    private ActionStatus doUpdateGroupMembers(Component container, String memberId, Consumer<List<GroupDefinition>> updateGroupMemberTask) {
+        List<GroupDefinition> groupsWithPrevInstAsMember = container.resolveGroupsByMember(memberId);
+        if (isEmpty(groupsWithPrevInstAsMember)) {
+            log.debug("#doUpdateGroupMembers - container {} has no groups with component instance {} as member.", container.getUniqueId(), memberId);
+            return ActionStatus.OK;
+        }
+        updateGroupMemberTask.accept(groupsWithPrevInstAsMember);
+        return updateGroups(container, groupsWithPrevInstAsMember);
+    }
+
+    private ActionStatus updateGroups(Component container, List<GroupDefinition> groupsToUpdate) {
+        log.debug("#updateGroups - updating {} groups for container {}", groupsToUpdate.size(), container.getUniqueId());
+        return groupsOperation.updateGroups(container, groupsToUpdate, false)
+                .either(groupsUpdated -> ActionStatus.OK,
+                        err -> componentsUtils.convertFromStorageResponse(err, container.getComponentType()));
+    }
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/OnChangeVersionOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/OnChangeVersionOperation.java
new file mode 100644
index 0000000000..90d006b733
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/OnChangeVersionOperation.java
@@ -0,0 +1,18 @@
+package org.openecomp.sdc.be.components.impl.instance;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+@FunctionalInterface
+public interface OnChangeVersionOperation {
+
+    /**
+     * A side effect operation to execute when a component instance version was changed from {@code prevVersion} to {@code newVersion}
+     * @param container the container which contains the instance which is version was changed
+     * @param prevVersion the previous version of the component instance.
+     * @param newVersion the new version of the component instance.
+     * @return the status of the operation
+     */
+    ActionStatus onChangeVersion(Component container, ComponentInstance prevVersion, ComponentInstance newVersion);
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/OnComponentInstanceChangeOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/OnComponentInstanceChangeOperation.java
new file mode 100644
index 0000000000..f5c21af4a6
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/OnComponentInstanceChangeOperation.java
@@ -0,0 +1,9 @@
+package org.openecomp.sdc.be.components.impl.instance;
+
+import org.openecomp.sdc.be.components.impl.OnDeleteEntityOperation;
+
+/**
+ * An interface which groups all operations to be executed when an action on a component instance has occurred
+ */
+public interface OnComponentInstanceChangeOperation extends OnChangeVersionOperation, OnDeleteEntityOperation {
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/PolicyTargetsUpdateOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/PolicyTargetsUpdateOperation.java
new file mode 100644
index 0000000000..f7bfc6d65a
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/instance/PolicyTargetsUpdateOperation.java
@@ -0,0 +1,33 @@
+package org.openecomp.sdc.be.components.impl.instance;
+
+import org.openecomp.sdc.be.components.impl.policy.PolicyTargetsUpdateHandler;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+@org.springframework.stereotype.Component
+public class PolicyTargetsUpdateOperation implements OnComponentInstanceChangeOperation {
+
+    private static final Logger log = Logger.getLogger(PolicyTargetsUpdateOperation.class);
+    private final PolicyTargetsUpdateHandler policyTargetsUpdateHandler;
+
+    public PolicyTargetsUpdateOperation(PolicyTargetsUpdateHandler policyTargetsUpdateHandler) {
+        this.policyTargetsUpdateHandler = policyTargetsUpdateHandler;
+    }
+
+    @Override
+    public ActionStatus onChangeVersion(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
+        log.debug("#onChangeVersion - replacing all policy targets referencing component instance {} with component instance {}", prevVersion.getUniqueId(), newVersion.getUniqueId());
+        return policyTargetsUpdateHandler.replacePoliciesTargets(container, prevVersion.getUniqueId(), newVersion.getUniqueId(), PolicyTargetType.COMPONENT_INSTANCES);
+    }
+
+    @Override
+    public ActionStatus onDelete(Component container, String deletedEntityId) {
+        log.debug("#onDelete - removing all component {} policy targets referencing component instance {}", container.getUniqueId(), deletedEntityId);
+        return policyTargetsUpdateHandler.removePoliciesTargets(container, deletedEntityId, PolicyTargetType.COMPONENT_INSTANCES);
+    }
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/lock/ComponentLockAspect.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/lock/ComponentLockAspect.java
new file mode 100644
index 0000000000..9304caa607
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/lock/ComponentLockAspect.java
@@ -0,0 +1,38 @@
+package org.openecomp.sdc.be.components.impl.lock;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.openecomp.sdc.be.components.impl.ComponentLocker;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+public class ComponentLockAspect {
+
+    private static final Logger log = Logger.getLogger(ComponentLockAspect.class);
+    private final ComponentLocker componentLocker;
+
+    public ComponentLockAspect(ComponentLocker componentLocker) {
+        this.componentLocker = componentLocker;
+    }
+
+    public Object lock(ProceedingJoinPoint proceedingJoinPoint, String componentId, ComponentTypeEnum componentType) throws Throwable {
+        return surroundWithLockUnlock(proceedingJoinPoint, componentId, componentType.getNodeType());
+    }
+
+    private Object surroundWithLockUnlock(ProceedingJoinPoint proceedingJoinPoint, String componentId, NodeTypeEnum componentType) throws Throwable {
+        String methodName = proceedingJoinPoint.getSignature().toShortString();
+        try {
+            log.trace("#{} - before locking component {} of type {}", methodName, componentId, componentType);
+            componentLocker.lock(componentId, componentType);
+            log.trace("#{} - after locking component {} of type {}", methodName, componentId, componentType);
+            return proceedingJoinPoint.proceed();
+        }
+        finally {
+            log.trace("#{} - before unlocking component {} of type {}", methodName, componentId, componentType);
+            componentLocker.unlock(componentId, componentType);
+            log.trace("#{} - after unlocking component {} of type {}", methodName, componentId, componentType);
+        }
+    }
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/lock/LockingTransactional.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/lock/LockingTransactional.java
new file mode 100644
index 0000000000..366969f284
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/lock/LockingTransactional.java
@@ -0,0 +1,13 @@
+package org.openecomp.sdc.be.components.impl.lock;
+
+import org.springframework.transaction.annotation.Transactional;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Transactional
+@Inherited
+public @interface LockingTransactional {
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/model/ToscaTypeImportData.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/model/ToscaTypeImportData.java
new file mode 100644
index 0000000000..5568842798
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/model/ToscaTypeImportData.java
@@ -0,0 +1,24 @@
+package org.openecomp.sdc.be.components.impl.model;
+
+import org.openecomp.sdc.be.model.normatives.ToscaTypeMetadata;
+
+import java.util.Map;
+
+public class ToscaTypeImportData {
+
+    private String toscaTypesYml;
+    private Map<String, ToscaTypeMetadata> toscaTypeMetadata;
+
+    public ToscaTypeImportData(String toscaTypesYml, Map<String, ToscaTypeMetadata> toscaTypeMetadata) {
+        this.toscaTypesYml = toscaTypesYml;
+        this.toscaTypeMetadata = toscaTypeMetadata;
+    }
+
+    public String getToscaTypesYml() {
+        return toscaTypesYml;
+    }
+
+    public Map<String, ToscaTypeMetadata> getToscaTypeMetadata() {
+        return toscaTypeMetadata;
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdateHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdateHandler.java
new file mode 100644
index 0000000000..10a35d0128
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdateHandler.java
@@ -0,0 +1,58 @@
+package org.openecomp.sdc.be.components.impl.policy;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.PolicyDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+
+@org.springframework.stereotype.Component
+public class PolicyTargetsUpdateHandler {
+
+    private static final Logger log = Logger.getLogger(PolicyTargetsUpdateHandler.class);
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final PolicyTargetsUpdater policyTargetsUpdater;
+
+    public PolicyTargetsUpdateHandler(ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, PolicyTargetsUpdater policyTargetsUpdater) {
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+        this.policyTargetsUpdater = policyTargetsUpdater;
+    }
+
+    public ActionStatus removePoliciesTargets(Component container, String targetId, PolicyTargetType targetType) {
+        log.debug("#removePoliciesTargets - removing all component {} policy targets referencing target {}", container.getUniqueId(), targetId);
+        Consumer<List<PolicyDefinition>> removeTarget = policies -> policyTargetsUpdater.removeTarget(policies, targetId, targetType);
+        return updatePolicyTargets(container, targetId, targetType, removeTarget);
+    }
+
+    public ActionStatus replacePoliciesTargets(Component container, String prevTargetId, String newTargetId, PolicyTargetType targetType) {
+        log.debug("#replacePoliciesTargets - replacing all policy targets referencing target {} with target {}", prevTargetId, newTargetId);
+        Consumer<List<PolicyDefinition>> replaceTarget = policies -> policyTargetsUpdater.replaceTarget(policies, prevTargetId, newTargetId, targetType);
+        return updatePolicyTargets(container, prevTargetId, targetType, replaceTarget);
+    }
+
+    private ActionStatus updatePolicyTargets(Component container, String targetId, PolicyTargetType targetType, Consumer<List<PolicyDefinition>> updatePolicyTargetTaskRunner) {
+        List<PolicyDefinition> policiesWithPrevInstanceAsTarget = container.resolvePoliciesContainingTarget(targetId, targetType);
+        if (isEmpty(policiesWithPrevInstanceAsTarget)) {
+            return ActionStatus.OK;
+        }
+        updatePolicyTargetTaskRunner.accept(policiesWithPrevInstanceAsTarget);
+        return updatePolicies(container, policiesWithPrevInstanceAsTarget);
+    }
+
+    private ActionStatus updatePolicies(Component policiesContainer, List<PolicyDefinition> policiesToUpdate) {
+        log.debug("#updatePolicies - updating {} policies for container {}", policiesToUpdate.size(), policiesContainer.getUniqueId());
+        StorageOperationStatus updatePolicyResult = toscaOperationFacade.updatePoliciesOfComponent(policiesContainer.getUniqueId(), policiesToUpdate);
+        return componentsUtils.convertFromStorageResponse(updatePolicyResult, policiesContainer.getComponentType());
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java
new file mode 100644
index 0000000000..1f094f5a60
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/policy/PolicyTargetsUpdater.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.components.impl.policy;
+
+import org.apache.commons.collections.MapUtils;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
+import org.openecomp.sdc.be.model.PolicyDefinition;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+
+import static java.util.Collections.emptyList;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+
+/**
+ * A Helper class which handles altering the targets state of a policy
+ */
+@Component
+public class PolicyTargetsUpdater {
+
+    public void removeTarget(List<PolicyDefinition> policies, String targetId, PolicyTargetType targetType) {
+        policies.forEach(policy -> removePolicyTarget(policy, targetId, targetType));
+    }
+
+    public void replaceTarget(List<PolicyDefinition> policies, String oldTargetId, String newTargetId, PolicyTargetType targetType) {
+        policies.forEach(policy -> replacePolicyTarget(policy, targetType, oldTargetId, newTargetId));
+    }
+
+    private void replacePolicyTarget(PolicyDefinition policyDefinition, PolicyTargetType targetType, String oldTargetId, String newTargetId) {
+        List<String> policyTargets = getTargetsList(policyDefinition, targetType);
+        if (isEmpty(policyTargets)) {
+            return;
+        }
+        policyTargets.replaceAll(prevInstanceIdByNewInstanceId(oldTargetId, newTargetId));
+    }
+
+    private void removePolicyTarget(PolicyDefinition policy, String targetId, PolicyTargetType targetType) {
+        List<String> policyTargets = getTargetsList(policy, targetType);
+        if (isEmpty(policyTargets)) {
+            return;
+        }
+        policyTargets.remove(targetId);
+    }
+
+    private List<String> getTargetsList(PolicyDefinition policyDefinition, PolicyTargetType targetType) {
+        Map<PolicyTargetType, List<String>> targets = policyDefinition.getTargets();
+        if(MapUtils.isEmpty(targets) || isEmpty(targets.get(targetType))) {
+            return emptyList();
+        }
+        return targets.get(targetType);
+    }
+
+    private UnaryOperator<String> prevInstanceIdByNewInstanceId(String prevInstanceId, String newInstanceId) {
+        return instId -> instId.equals(prevInstanceId) ? newInstanceId: instId;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/CapabilityTypeImportUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/CapabilityTypeImportUtils.java
new file mode 100644
index 0000000000..d506a85996
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/CapabilityTypeImportUtils.java
@@ -0,0 +1,28 @@
+package org.openecomp.sdc.be.components.impl.utils;
+
+import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
+
+import java.util.Objects;
+
+public class CapabilityTypeImportUtils {
+
+    private CapabilityTypeImportUtils() {
+    }
+
+    public static boolean isCapabilityTypesEquals(CapabilityTypeDefinition capabilityType1, CapabilityTypeDefinition capabilityType2) {
+        if (capabilityType1 == capabilityType2) {
+            return true;
+        }
+        
+        if (capabilityType1 == null || capabilityType2 == null) {
+            return false;
+        }
+        
+        return Objects.equals(capabilityType1.getType(), capabilityType2.getType()) &&
+                Objects.equals(capabilityType1.getVersion(), capabilityType2.getVersion()) &&
+                Objects.equals(capabilityType1.getDerivedFrom(), capabilityType2.getDerivedFrom()) &&
+                Objects.equals(capabilityType1.getValidSourceTypes(), capabilityType2.getValidSourceTypes()) &&
+                Objects.equals(capabilityType1.getDescription(), capabilityType2.getDescription()) &&
+                Objects.equals(capabilityType1.getProperties(), capabilityType2.getProperties());
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/ExceptionUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/ExceptionUtils.java
new file mode 100644
index 0000000000..e48d21cb77
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/ExceptionUtils.java
@@ -0,0 +1,44 @@
+package org.openecomp.sdc.be.components.impl.utils;
+
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExceptionUtils {
+
+    private final TitanDao titanDao;
+
+    public ExceptionUtils(TitanDao titanDao) {
+        this.titanDao = titanDao;
+    }
+
+    public <T> T rollBackAndThrow(ActionStatus actionStatus, String ... params) {
+         titanDao.rollback();
+         throw new ComponentException(actionStatus, params);
+     }
+
+    public <T> T rollBackAndThrow(ResponseFormat responseFormat) {
+        titanDao.rollback();
+        throw new ComponentException(responseFormat);
+    }
+
+    public <T> T rollBackAndThrow(StorageOperationStatus status, String ... params) {
+        titanDao.rollback();
+        throw new StorageException(status, params);
+    }
+
+    public <T> T rollBackAndThrow(TitanOperationStatus status, String ... params) {
+        titanDao.rollback();
+        throw new StorageException(status, params);
+    }
+
+
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/PolicyTypeImportUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/PolicyTypeImportUtils.java
index 50f64e2f3f..04260df7eb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/PolicyTypeImportUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/utils/PolicyTypeImportUtils.java
@@ -1,13 +1,15 @@
 package org.openecomp.sdc.be.components.impl.utils;
 
+import org.openecomp.sdc.be.dao.utils.MapUtil;
+import org.openecomp.sdc.be.model.PolicyTypeDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.openecomp.sdc.be.dao.utils.MapUtil;
-import org.openecomp.sdc.be.model.PolicyTypeDefinition;
-import org.openecomp.sdc.be.model.PropertyDefinition;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.springframework.util.CollectionUtils.isEmpty;
 
 public class PolicyTypeImportUtils {
 
@@ -22,6 +24,8 @@ public class PolicyTypeImportUtils {
             return false;
         }
         return Objects.equals(pt1.getType(), pt2.getType()) &&
+                Objects.equals(pt1.getName(), pt2.getName()) &&
+                Objects.equals(pt1.getIcon(), pt2.getIcon()) &&
                 Objects.equals(pt1.getVersion(), pt2.getVersion()) &&
                 Objects.equals(pt1.getDerivedFrom(), pt2.getDerivedFrom()) &&
                 Objects.equals(pt1.getTargets(), pt2.getTargets()) &&
@@ -34,8 +38,8 @@ public class PolicyTypeImportUtils {
         if (pt1Props == pt2Props) {
             return true;
         }
-        if (pt1Props == null || pt2Props == null) {
-            return false;
+        if (pt1Props == null && isEmpty(pt2Props) || pt2Props == null && isEmpty(pt1Props)) {
+            return true;
         }
         if (isPropertiesListSizesNotEquals(pt1Props, pt2Props)) {
             return false;
@@ -62,9 +66,9 @@ public class PolicyTypeImportUtils {
     }
 
     private static boolean isPropertiesListSizesNotEquals(List<PropertyDefinition> pt1Props, List<PropertyDefinition> pt2Props) {
-        return CollectionUtils.isEmpty(pt1Props) && CollectionUtils.isNotEmpty(pt2Props) ||
-                CollectionUtils.isEmpty(pt2Props) && CollectionUtils.isNotEmpty(pt1Props) ||
-                pt1Props.size() != pt2Props.size();
+        return isEmpty(pt1Props) && isNotEmpty(pt2Props) ||
+               isEmpty(pt2Props) && isNotEmpty(pt1Props) ||
+               pt1Props.size() != pt2Props.size();
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/GroupMembersUpdateOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/GroupMembersUpdateOperation.java
deleted file mode 100644
index 1b6f49df8b..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/GroupMembersUpdateOperation.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.openecomp.sdc.be.components.impl.version;
-
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.collections.MapUtils;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.GroupDefinition;
-import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-@org.springframework.stereotype.Component
-public class GroupMembersUpdateOperation implements PostChangeVersionOperation {
-
-    private static final Logger log = LoggerFactory.getLogger(GroupMembersUpdateOperation.class);
-    private final GroupsOperation groupsOperation;
-    private final ComponentsUtils componentsUtils;
-
-    public GroupMembersUpdateOperation(GroupsOperation groupsOperation, ComponentsUtils componentsUtils) {
-        this.groupsOperation = groupsOperation;
-        this.componentsUtils = componentsUtils;
-    }
-
-    @Override
-    public ActionStatus onChangeVersion(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
-        return updateGroupMembersOnChangeVersion(container, prevVersion, newVersion);
-    }
-
-    private ActionStatus updateGroupMembersOnChangeVersion(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
-        log.debug("#updateGroupMembersOnChangeVersion - replacing all group members for component instance {} with new component instance.", prevVersion.getUniqueId(), newVersion.getUniqueId());
-        if (isEmpty(container.getGroups())) {
-            log.debug("#updateGroupMembersOnChangeVersion - container {} has no groups.", container.getUniqueId());
-            return ActionStatus.OK;
-        }
-        List<GroupDefinition> groupsWithPrevInstAsMember = container.resolveGroupsByMember(prevVersion.getUniqueId());
-        if (isEmpty(groupsWithPrevInstAsMember)) {
-            log.debug("#updateGroupMembersOnChangeVersion - container {} has no groups with component instance {} as member.", container.getUniqueId(), prevVersion.getUniqueId());
-            return ActionStatus.OK;
-        }
-        replacePrevInstanceMemberWithNewInstance(prevVersion, newVersion, groupsWithPrevInstAsMember);
-        return updateGroups(container, groupsWithPrevInstAsMember);
-    }
-
-    private ActionStatus updateGroups(Component container, List<GroupDefinition> groupsToUpdate) {
-        log.debug("#updateGroups - updating {} groups for container {}", groupsToUpdate.size(), container.getUniqueId());
-        return groupsOperation.updateGroups(container, groupsToUpdate)
-                .either(groupsUpdated -> ActionStatus.OK,
-                        err -> componentsUtils.convertFromStorageResponse(err, container.getComponentType()));
-    }
-
-    private void replacePrevInstanceMemberWithNewInstance(ComponentInstance prevVersion, ComponentInstance newVersion, List<GroupDefinition> groupsWithPrevInstAsMember) {
-        groupsWithPrevInstAsMember.forEach(grp -> replacePrevInstanceMemberWithNewInstance(grp, prevVersion.getUniqueId(), newVersion.getUniqueId()));
-    }
-
-    private void replacePrevInstanceMemberWithNewInstance(GroupDefinition groupDefinition, String prevInstanceId, String newInstanceId) {
-        Map<String, String> membersNameToId = groupDefinition.getMembers();
-        String prevInstanceMemberName = MapUtils.invertMap(membersNameToId).get(prevInstanceId).toString();
-        membersNameToId.replace(prevInstanceMemberName, newInstanceId);
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PolicyTargetsUpdateOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PolicyTargetsUpdateOperation.java
deleted file mode 100644
index 1d27228c50..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PolicyTargetsUpdateOperation.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.openecomp.sdc.be.components.impl.version;
-
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
-
-import java.util.List;
-import java.util.function.UnaryOperator;
-
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.PolicyDefinition;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@org.springframework.stereotype.Component
-public class PolicyTargetsUpdateOperation implements PostChangeVersionOperation {
-
-    private static final Logger log = LoggerFactory.getLogger(PolicyTargetsUpdateOperation.class);
-    private final ToscaOperationFacade toscaOperationFacade;
-    private final ComponentsUtils componentsUtils;
-
-    public PolicyTargetsUpdateOperation(ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils) {
-        this.toscaOperationFacade = toscaOperationFacade;
-        this.componentsUtils = componentsUtils;
-    }
-
-    @Override
-    public ActionStatus onChangeVersion(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
-        return replacePolicyTargetsInstanceId(container, prevVersion, newVersion);
-    }
-
-    private ActionStatus replacePolicyTargetsInstanceId(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
-        log.debug("#replacePolicyTargetsInstanceId - replacing all policy targets for component instance {} with component instance {}", prevVersion.getUniqueId(), newVersion.getUniqueId());
-        List<PolicyDefinition> policiesWithPrevInstanceAsTarget = container.resolvePoliciesByComponentInstanceTarget(prevVersion.getUniqueId());
-        if (isEmpty(policiesWithPrevInstanceAsTarget)) {
-            return ActionStatus.OK;
-        }
-        replaceTargetsPrevInstanceIdWithNewInstanceId(prevVersion, newVersion, policiesWithPrevInstanceAsTarget);
-        return updatePolicies(container, policiesWithPrevInstanceAsTarget);
-    }
-
-    private ActionStatus updatePolicies(Component policiesContainer, List<PolicyDefinition> policiesToUpdate) {
-        log.debug("#updatePolicies - updating {} policies for container {}", policiesToUpdate.size(), policiesContainer.getUniqueId());
-        StorageOperationStatus updatePolicyResult = toscaOperationFacade.updatePoliciesOfComponent(policiesContainer.getUniqueId(), policiesToUpdate);
-        return componentsUtils.convertFromStorageResponse(updatePolicyResult, policiesContainer.getComponentType());
-    }
-
-    private void replaceTargetsPrevInstanceIdWithNewInstanceId(ComponentInstance prevVersion, ComponentInstance newVersion, List<PolicyDefinition> policiesWithPrevInstanceAsTarget) {
-        policiesWithPrevInstanceAsTarget.forEach(policy -> updatePolicyTargetWithNewInstanceVersion(policy, prevVersion.getUniqueId(), newVersion.getUniqueId()));
-    }
-
-    private void updatePolicyTargetWithNewInstanceVersion(PolicyDefinition policyDefinition, String prevInstanceId, String newInstanceId) {
-        List<String> policyInstanceTargets = policyDefinition.resolveComponentInstanceTargets();
-        if (isEmpty(policyInstanceTargets)) {
-            return;
-        }
-        policyInstanceTargets.replaceAll(prevInstanceIdByNewInstanceId(prevInstanceId, newInstanceId));
-    }
-
-    private UnaryOperator<String> prevInstanceIdByNewInstanceId(String prevInstanceId, String newInstanceId) {
-        return instId -> instId.equals(prevInstanceId) ? newInstanceId: instId;
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PostChangeVersionOperation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PostChangeVersionOperation.java
deleted file mode 100644
index ee16c203bf..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PostChangeVersionOperation.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.openecomp.sdc.be.components.impl.version;
-
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-@FunctionalInterface
-public interface PostChangeVersionOperation {
-
-    ActionStatus onChangeVersion(Component container, ComponentInstance prevVersion, ComponentInstance newVersion);
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PostChangeVersionOperationOrchestrator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PostChangeVersionOperationOrchestrator.java
deleted file mode 100644
index 375d8e6e12..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/version/PostChangeVersionOperationOrchestrator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.openecomp.sdc.be.components.impl.version;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@org.springframework.stereotype.Component
-public class PostChangeVersionOperationOrchestrator {
-
-    private static final Logger log = LoggerFactory.getLogger(PostChangeVersionOperationOrchestrator.class);
-    private final List<PostChangeVersionOperation> postChangeVersionOperations;
-
-    public PostChangeVersionOperationOrchestrator(List<PostChangeVersionOperation> postChangeVersionOperations) {
-        this.postChangeVersionOperations = postChangeVersionOperations;
-    }
-
-    public ActionStatus doPostChangeVersionOperations(Component container, ComponentInstance prevVersion, ComponentInstance newVersion) {
-        log.debug("#doPostChangeVersionOperations - starting post change version operations for component {}. from instance {} to instance {}", container.getUniqueId(), prevVersion.getUniqueId(), newVersion.getUniqueId());
-        ActionStatus postOperationsResult = ActionStatus.OK;
-        Iterator<PostChangeVersionOperation> postChangeVersionIter = postChangeVersionOperations.iterator();
-        while(postChangeVersionIter.hasNext() && postOperationsResult == ActionStatus.OK) {
-            postOperationsResult = postChangeVersionIter.next().onChangeVersion(container, prevVersion, newVersion);
-        }
-        return postOperationsResult;
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransition.java
index 42fe6baab8..3f3f2ae3fa 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationChangeTransition.java
@@ -20,41 +20,47 @@
 
 package org.openecomp.sdc.be.components.lifecycle;
 
-import java.util.Arrays;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsontitan.operations.NodeTemplateOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.tosca.ToscaUtils;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 public class CertificationChangeTransition extends LifeCycleTransition {
+    private static final  String ALLOTTED_CATEGORY = "Allotted Resource";
+    private static final  String DEPENDING_SRV_NAME = "depending_service_name";
+    private static final  String PROVIDING_SRV_NAME = "providing_service_name";
+    private static final  String PROVIDING_SRV_UUID = "providing_service_uuid";
+    private static final  String DEPENDING_SRV_UUID = "depending_service_uuid";
 
-    private static final Logger log = LoggerFactory.getLogger(CertificationChangeTransition.class);
+    private static final Logger log = Logger.getLogger(CertificationChangeTransition.class);
 
     private LifecycleStateEnum nextState;
     private LifeCycleTransitionEnum name;
     private AuditingActionEnum auditingAction;
     private ArtifactsBusinessLogic artifactsManager;
+    private NodeTemplateOperation nodeTemplateOperation;
 
     public CertificationChangeTransition(LifeCycleTransitionEnum name, ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
         super(componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
@@ -63,14 +69,11 @@ public class CertificationChangeTransition extends LifeCycleTransition {
 
         // authorized roles
         Role[] certificationChangeRoles = { Role.ADMIN, Role.TESTER };
-        addAuthorizedRoles(ComponentTypeEnum.RESOURCE, Arrays.asList(certificationChangeRoles));
+        Role[] resourceRoles = { Role.ADMIN, Role.TESTER, Role.DESIGNER};
+        addAuthorizedRoles(ComponentTypeEnum.RESOURCE, Arrays.asList(resourceRoles));
         addAuthorizedRoles(ComponentTypeEnum.SERVICE, Arrays.asList(certificationChangeRoles));
-        // TODO to be later defined for product
 
         //additional authorized roles for resource type
-        Role[] resourceRoles = { Role.DESIGNER};
-        addResouceAuthorizedRoles(ResourceTypeEnum.VFCMT, Arrays.asList(resourceRoles));
-
         switch (this.name) {
         case CERTIFY:
             this.auditingAction = AuditingActionEnum.CERTIFICATION_SUCCESS_RESOURCE;
@@ -108,13 +111,19 @@ public class CertificationChangeTransition extends LifeCycleTransition {
         this.artifactsManager = artifactsManager;
     }
 
+    public NodeTemplateOperation getNodeTemplateOperation() {
+        return nodeTemplateOperation;
+    }
+
+    public void setNodeTemplateOperation(NodeTemplateOperation nodeTemplateOperation) {
+        this.nodeTemplateOperation = nodeTemplateOperation;
+    }
+
     private ResponseFormat formatCertificationError(Component component, StorageOperationStatus response, ComponentTypeEnum componentType) {
         BeEcompErrorManager.getInstance().logBeDaoSystemError("Change LifecycleState - Certify failed on graph");
         log.debug("certification change failed on graph");
 
-        ActionStatus actionStatus = componentUtils.convertFromStorageResponse(response);
-        ResponseFormat responseFormat = componentUtils.getResponseFormatByComponent(actionStatus, component, componentType);
-        return responseFormat;
+        return componentUtils.getResponseFormatByComponent(componentUtils.convertFromStorageResponse(response), component, componentType);
     }
 
     @Override
@@ -125,23 +134,24 @@ public class CertificationChangeTransition extends LifeCycleTransition {
         // validate user
         Either<Boolean, ResponseFormat> userValidationResponse = userRoleValidation(modifier,component, componentType, lifecycleChangeInfo);
         if (userValidationResponse.isRight()) {
-            log.error("userRoleValidation failed");
+            log.debug("userRoleValidation failed");
             return userValidationResponse;
         }
 
-        if (!oldState.equals(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS)) {
-            log.error("oldState={} should be={}",oldState,ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION);
-            ResponseFormat error = componentUtils.getResponseFormat(ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, componentName, componentType.name().toLowerCase());
-            return Either.right(error);
-        }
-
-        if (oldState.equals(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS) && !modifier.equals(owner) && !modifier.getRole().equals(Role.ADMIN.name())) {
-            log.error("oldState={} should not be={}",oldState,ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE);
-            log.error("&& modifier({})!={}  && modifier.role({})!={}",modifier,owner);
-            ResponseFormat error = componentUtils.getResponseFormat(ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE, componentName, componentType.name().toLowerCase(), owner.getFirstName(), owner.getLastName(), owner.getUserId());
-            return Either.right(error);
+        if ( componentType != ComponentTypeEnum.RESOURCE ){
+            if (!oldState.equals(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS)  ) {
+                log.debug("oldState={} should be={}",oldState,ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION);
+                ResponseFormat error = componentUtils.getResponseFormat(ActionStatus.COMPONENT_NOT_READY_FOR_CERTIFICATION, componentName, componentType.name().toLowerCase());
+                return Either.right(error);
+            }
+    
+            if (oldState.equals(LifecycleStateEnum.CERTIFICATION_IN_PROGRESS) && !modifier.getUserId().equals(owner.getUserId()) && !modifier.getRole().equals(Role.ADMIN.name())) {
+                log.debug("oldState={} should not be={}",oldState,ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE);
+                log.debug("&& modifier({})!={}  && modifier.role({})!={}", modifier, owner, modifier.getRole(), owner.getRole());
+                ResponseFormat error = componentUtils.getResponseFormat(ActionStatus.COMPONENT_IN_CERT_IN_PROGRESS_STATE, componentName, componentType.name().toLowerCase(), owner.getFirstName(), owner.getLastName(), owner.getUserId());
+                return Either.right(error);
+            }
         }
-
         return Either.left(true);
     }
 
@@ -173,18 +183,28 @@ public class CertificationChangeTransition extends LifeCycleTransition {
                     result = Either.right(responseFormat);
                 }
             }
-
-            result = Either.left(ModelConverter.convertFromToscaElement(certificationChangeResult.left().value()));
+            ToscaElement certificationResult = certificationChangeResult.left().value();
+            Component componentAfterCertification = ModelConverter.convertFromToscaElement(certificationResult);
+            if ( result == null || result.isLeft() ){
+                //update edges for allotted resource 
+                StorageOperationStatus status = handleConnectionsForAllotted(componentAfterCertification);
+                if ( status != StorageOperationStatus.OK){
+                    ResponseFormat responseFormat = formatCertificationError(componentAfterCertification, status, componentType);
+                    result = Either.right(responseFormat);
+                }
+            }
+            updateCalculatedCapabilitiesRequirements(componentAfterCertification);
+            result = Either.left(componentAfterCertification);
             return result;
         } finally {
             if (result == null || result.isRight()) {
                 BeEcompErrorManager.getInstance().logBeDaoSystemError("Change LifecycleState");
-                if (inTransaction == false) {
+                if ( !inTransaction ) {
                     log.debug("operation failed. do rollback");
                     titanDao.rollback();
                 }
             } else {
-                if (inTransaction == false) {
+                if ( !inTransaction ) {
                     log.debug("operation success. do commit");
                     titanDao.commit();
                 }
@@ -192,4 +212,53 @@ public class CertificationChangeTransition extends LifeCycleTransition {
         }
 
     }
+
+    private void updateCalculatedCapabilitiesRequirements(Component certifiedComponent) {
+        if(certifiedComponent.getComponentType() == ComponentTypeEnum.SERVICE){
+            toscaOperationFacade.updateNamesOfCalculatedCapabilitiesRequirements(certifiedComponent.getUniqueId());
+        }
+    }
+
+    private StorageOperationStatus handleConnectionsForAllotted(Component component){
+        StorageOperationStatus status = StorageOperationStatus.OK;
+        if (component.getComponentType() == ComponentTypeEnum.RESOURCE && component.isTopologyTemplate()  ){
+            List<CategoryDefinition> categories = component.getCategories();
+            Optional<CategoryDefinition> findFirst = categories.stream().filter(c->c.getName().equals(ALLOTTED_CATEGORY)).findFirst();
+            if ( findFirst.isPresent() ){
+                findInstanceByAllottedProperties(component);
+            }else{
+                log.debug("Component isn't from allotted category.");
+            }
+        }
+        return status;
+    }
+
+    private void findInstanceByAllottedProperties(Component component) {
+        log.debug("Component is from alloted category. Remove all previous ALLOTTED_OF connections for all instances");
+        nodeTemplateOperation.removeAllAllotedEdges(component.getUniqueId());
+        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = component.getComponentInstancesProperties();
+        if ( componentInstancesProperties != null ){
+            componentInstancesProperties.entrySet().forEach(e->{
+                List<ComponentInstanceProperty> props = e.getValue();
+                Optional<ComponentInstanceProperty> findProp = props.stream().filter(p -> p.getName().equals(DEPENDING_SRV_NAME) ||  p.getName().equals(PROVIDING_SRV_NAME)).findFirst();
+                if ( findProp.isPresent() ){
+                    log.debug("Find specific properties [{} or {}]on instance {} ", DEPENDING_SRV_NAME,PROVIDING_SRV_NAME, e.getKey()  );
+                    handleAllotedInstance(component.getUniqueId(), e.getKey(), e.getValue() );
+                }else{
+                    log.debug("Not defined specific properties [{} or {}]on instance {} ", DEPENDING_SRV_NAME,PROVIDING_SRV_NAME, e.getKey()  );
+                }
+            });
+        }
+    }
+
+    private StorageOperationStatus handleAllotedInstance(String componentId, String instanceId, List<ComponentInstanceProperty> props) {
+        ComponentInstanceProperty serviceUUIDProp = props.stream().filter(p -> p.getName().equals(PROVIDING_SRV_UUID) ||  p.getName().equals(DEPENDING_SRV_UUID)).findFirst().get();
+        if ( serviceUUIDProp.getValue() != null && !serviceUUIDProp.getValue().contains("get_input")){
+            log.debug("Handle Allotted edge on instance {} for service UUID {} ", instanceId,  serviceUUIDProp.getValue() );
+            return  nodeTemplateOperation.createAllottedOfEdge(componentId, instanceId, serviceUUIDProp.getValue());
+        }else{
+            log.debug("An incorrectly defined service UUID for Allotted instance {} . Skip instance", instanceId,  serviceUUIDProp.getValue() );
+            return StorageOperationStatus.OK;
+        }
+    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTransition.java
index 4a8bbb5790..7456a58994 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CertificationRequestTransition.java
@@ -20,72 +20,49 @@
 
 package org.openecomp.sdc.be.components.lifecycle;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.openecomp.sdc.be.components.distribution.engine.ServiceDistributionArtifactsBuilder;
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.datatypes.elements.ComponentInstanceDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.model.operations.impl.CapabilityOperation;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.tosca.ToscaExportHandler;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.*;
 
 public class CertificationRequestTransition extends LifeCycleTransition {
 
-    private static final Logger log = LoggerFactory.getLogger(CertificationRequestTransition.class);
+    private static final Logger log = Logger.getLogger(CertificationRequestTransition.class);
 
-    private CapabilityOperation capabilityOperation;
     private ServiceBusinessLogic serviceBusinessLogic;
-    public CertificationRequestTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ServiceDistributionArtifactsBuilder serviceDistributionArtifactsBuilder, ServiceBusinessLogic serviceBusinessLogic,
-            CapabilityOperation capabilityOperation, ToscaExportHandler toscaExportUtils, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
+
+    public CertificationRequestTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ServiceBusinessLogic serviceBusinessLogic,
+                                          ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
         super(componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
 
         // authorized roles
         Role[] resourceServiceCheckoutRoles = { Role.ADMIN, Role.DESIGNER };
         addAuthorizedRoles(ComponentTypeEnum.RESOURCE, Arrays.asList(resourceServiceCheckoutRoles));
         addAuthorizedRoles(ComponentTypeEnum.SERVICE, Arrays.asList(resourceServiceCheckoutRoles));
-        // TODO to be later defined for product
-        // addAuthorizedRoles(ComponentTypeEnum.PRODUCT,
-        // Arrays.asList(productCheckoutRoles));
-
-        //additional authorized roles for resource type
         Role[] resourceRoles = { Role.TESTER};
         addResouceAuthorizedRoles(ResourceTypeEnum.VFCMT, Arrays.asList(resourceRoles));
 
         this.serviceBusinessLogic = serviceBusinessLogic;
-        this.capabilityOperation = capabilityOperation;
     }
 
     @Override
@@ -98,11 +75,25 @@ public class CertificationRequestTransition extends LifeCycleTransition {
         return AuditingActionEnum.CERTIFICATION_REQUEST_RESOURCE;
     }
 
-    protected Either<Boolean, ResponseFormat> validateAllResourceInstanceCertified(Component component) {
+    Either<Boolean, ResponseFormat> validateAllResourceInstanceCertified(Component component) {
         Either<Boolean, ResponseFormat> eitherResult = Either.left(true);
 
+        if (component.isVspArchived()){
+            return Either.right(componentUtils.getResponseFormat(ActionStatus.ARCHIVED_ORIGINS_FOUND, component.getComponentType().name(), component.getName()));
+        }
+
         List<ComponentInstance> resourceInstance = component.getComponentInstances();
         if (resourceInstance != null) {
+
+            //Filter components instances with archived origins
+            Optional<ComponentInstance> archivedRIOptional = resourceInstance.stream().filter(ComponentInstanceDataDefinition::isOriginArchived).findAny();
+
+            //RIs with archived origins found, return relevant error
+            if (archivedRIOptional.isPresent()){
+                return Either.right(componentUtils.getResponseFormat(ActionStatus.ARCHIVED_ORIGINS_FOUND, component.getComponentType().name(), component.getName()));
+            }
+
+            //Continue with searching for non certified RIs
             Optional<ComponentInstance> nonCertifiedRIOptional = resourceInstance.stream().filter(p -> !ValidationUtils.validateCertifiedVersion(p.getComponentVersion())).findAny();
             // Uncertified Resource Found
             if (nonCertifiedRIOptional.isPresent()) {
@@ -110,41 +101,35 @@ public class CertificationRequestTransition extends LifeCycleTransition {
                 ResponseFormat resFormat = getRelevantResponseFormatUncertifiedRI(nonCertifiedRI, component.getComponentType());
                 eitherResult = Either.right(resFormat);
             }
+
         }
         return eitherResult;
     }
 
     private ResponseFormat getRelevantResponseFormatUncertifiedRI(ComponentInstance nonCertifiedRI, ComponentTypeEnum componentType) {
 
-        ResponseFormat responseFormat;
         Either<Resource, StorageOperationStatus> eitherResource = toscaOperationFacade.getToscaElement(nonCertifiedRI.getComponentUid());
         if (eitherResource.isRight()) {
+            return componentUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
+        }
+        ActionStatus actionStatus;
+        Resource resource = eitherResource.left().value();
+        Either<Resource, StorageOperationStatus> status = toscaOperationFacade.findLastCertifiedToscaElementByUUID(resource);
 
-            responseFormat = componentUtils.getResponseFormat(ActionStatus.GENERAL_ERROR);
-
+        if (ValidationUtils.validateMinorVersion(nonCertifiedRI.getComponentVersion())) {
+            if (status.isRight() || status.left().value() == null) {
+                actionStatus = ActionStatus.VALIDATED_RESOURCE_NOT_FOUND;
+            } else {
+                actionStatus = ActionStatus.FOUND_ALREADY_VALIDATED_RESOURCE;
+            }
         } else {
-            ActionStatus actionStatus;
-            Resource resource = eitherResource.left().value();
-            Either<Resource, StorageOperationStatus> status = toscaOperationFacade.findLastCertifiedToscaElementByUUID(resource);
-
-            if (ValidationUtils.validateMinorVersion(nonCertifiedRI.getComponentVersion())) {
-                if (status.isRight() || status.left().value() == null) {
-                    actionStatus = ActionStatus.VALIDATED_RESOURCE_NOT_FOUND;
-                } else {
-                    actionStatus = ActionStatus.FOUND_ALREADY_VALIDATED_RESOURCE;
-                }
+            if (status.isRight() || status.left().value() == null) {
+                actionStatus = ActionStatus.FOUND_LIST_VALIDATED_RESOURCES;
             } else {
-                if (status.isRight() || status.left().value() == null)
-                    actionStatus = ActionStatus.FOUND_LIST_VALIDATED_RESOURCES;
-                else {
-                    actionStatus = ActionStatus.FOUND_ALREADY_VALIDATED_RESOURCE;
-                }
-
+                actionStatus = ActionStatus.FOUND_ALREADY_VALIDATED_RESOURCE;
             }
-            String compType = (componentType == ComponentTypeEnum.RESOURCE) ? "VF" : "service";
-            responseFormat = componentUtils.getResponseFormat(actionStatus, compType, resource.getName());
         }
-        return responseFormat;
+        return componentUtils.getResponseFormat(actionStatus, componentType == ComponentTypeEnum.RESOURCE ? "VF" : "service", resource.getName());
     }
 
     @Override
@@ -235,7 +220,7 @@ public class CertificationRequestTransition extends LifeCycleTransition {
                 String compInstId = compInst.getUniqueId();
                 OriginTypeEnum originType = compInst.getOriginType();
                 if (originType == null) {
-                    log.error("Origin type is not set for component instance {} - it shouldn't happen. Skipping this component instance...", compInst.getUniqueId());
+                    log.debug("Origin type is not set for component instance {} - it shouldn't happen. Skipping this component instance...", compInst.getUniqueId());
                     continue;
                 }
                 String compInstType = originType.getValue();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckinTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckinTransition.java
index 9015ca0367..0ea9662e10 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckinTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckinTransition.java
@@ -20,34 +20,35 @@
 
 package org.openecomp.sdc.be.components.lifecycle;
 
-import java.util.Arrays;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.tosca.ToscaUtils;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.Arrays;
 
 public class CheckinTransition extends LifeCycleTransition {
 
-    private static final Logger log = LoggerFactory.getLogger(CheckinTransition.class);
+    private static final Logger log = Logger.getLogger(CheckinTransition.class);
 
     public CheckinTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
         super(componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
@@ -92,17 +93,18 @@ public class CheckinTransition extends LifeCycleTransition {
                 result =  Either.right(responseFormat);
             }
             else {
+                updateCalculatedCapabilitiesRequirements(checkinResourceResult.left().value());
                 result =  Either.left(ModelConverter.convertFromToscaElement(checkinResourceResult.left().value()));
             }
         } finally {
             if (result == null || result.isRight()) {
                 BeEcompErrorManager.getInstance().logBeDaoSystemError("Change LifecycleState");
-                if (inTransaction == false) {
+                if (!inTransaction) {
                     log.debug("operation failed. do rollback");
                     titanDao.rollback();
                 }
             } else {
-                if (inTransaction == false) {
+                if (!inTransaction) {
                     log.debug("operation success. do commit");
                     titanDao.commit();
                 }
@@ -133,7 +135,7 @@ public class CheckinTransition extends LifeCycleTransition {
             return Either.right(error);
         }
 
-        if (oldState.equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) && !modifier.equals(owner) && !modifier.getRole().equals(Role.ADMIN.name())) {
+        if (oldState.equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) && !modifier.getUserId().equals(owner.getUserId()) && !modifier.getRole().equals(Role.ADMIN.name())) {
             ResponseFormat error = componentUtils.getResponseFormat(ActionStatus.COMPONENT_CHECKOUT_BY_ANOTHER_USER, componentName, componentType.name().toLowerCase(), owner.getFirstName(), owner.getLastName(), owner.getUserId());
             return Either.right(error);
         }
@@ -145,4 +147,10 @@ public class CheckinTransition extends LifeCycleTransition {
 
         return Either.left(true);
     }
+
+    private void updateCalculatedCapabilitiesRequirements(ToscaElement toscaElement) {
+        if(toscaElement.getToscaType() == ToscaElementTypeEnum.TOPOLOGY_TEMPLATE && toscaElement.getResourceType() != ResourceTypeEnum.CVFC){
+            toscaOperationFacade.updateNamesOfCalculatedCapabilitiesRequirements(toscaElement.getUniqueId());
+        }
+    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTransition.java
index 5d7470e79b..525df14ef8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/CheckoutTransition.java
@@ -30,11 +30,7 @@ import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
 import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
@@ -42,19 +38,19 @@ import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.tosca.ToscaUtils;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
 import java.util.List;
 
 public class CheckoutTransition extends LifeCycleTransition {
 
-    private static final Logger log = LoggerFactory.getLogger(CheckoutTransition.class);
+    private static final Logger log = Logger.getLogger(CheckoutTransition.class);
 
-    public CheckoutTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
+    CheckoutTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
         super(componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
 
         // authorized roles
@@ -99,7 +95,11 @@ public class CheckoutTransition extends LifeCycleTransition {
             } else {
 
                 Component clonedComponent = ModelConverter.convertFromToscaElement(checkoutResourceResult.left().value());
-                if ( checkoutResourceResult.left().value().getToscaType() == ToscaElementTypeEnum.NodeType ){
+                if(componentType == ComponentTypeEnum.SERVICE) {
+                    Service service = (Service)clonedComponent;
+                    service.validateAndSetInstantiationType();
+                }
+                if ( checkoutResourceResult.left().value().getToscaType() == ToscaElementTypeEnum.NODE_TYPE ){
                     Either<Component, ActionStatus> upgradeToLatestDerived = componentBl.shouldUpgradeToLatestDerived(clonedComponent);
                     if (upgradeToLatestDerived.isRight() && ActionStatus.OK != upgradeToLatestDerived.right().value()){
                         result = Either.right(componentUtils.getResponseFormat(upgradeToLatestDerived.right().value()));
@@ -112,9 +112,9 @@ public class CheckoutTransition extends LifeCycleTransition {
                 }
                 result = Either.left(clonedComponent);
                 Either<Boolean, ResponseFormat> upgradeToLatestGeneric = componentBl.shouldUpgradeToLatestGeneric(clonedComponent);
-                if (upgradeToLatestGeneric.isRight())
+                if (upgradeToLatestGeneric.isRight()) {
                     result = Either.right(upgradeToLatestGeneric.right().value());
-                else if (upgradeToLatestGeneric.left().value()  ) {
+                } else if (upgradeToLatestGeneric.left().value()  ) {
                     StorageOperationStatus response = upgradeToLatestGenericData(clonedComponent);
                     if (StorageOperationStatus.OK != response) {
                         ActionStatus actionStatus = componentUtils.convertFromStorageResponse(response);
@@ -122,18 +122,18 @@ public class CheckoutTransition extends LifeCycleTransition {
                         result = Either.right(responseFormat);
                     }
                 }
-
+                handleCalculatedCapabilitiesRequirements(clonedComponent);
             }
 
         } finally {
             if (result == null || result.isRight()) {
                 BeEcompErrorManager.getInstance().logBeDaoSystemError("Change LifecycleState");
-                if (inTransaction == false) {
+                if (!inTransaction) {
                     log.debug("operation failed. do rollback");
                     titanDao.rollback();
                 }
             } else {
-                if (inTransaction == false) {
+                if (!inTransaction) {
                     log.debug("operation success. do commit");
                     titanDao.commit();
                 }
@@ -142,13 +142,19 @@ public class CheckoutTransition extends LifeCycleTransition {
         return result;
     }
 
+    private void handleCalculatedCapabilitiesRequirements(Component clonedComponent) {
+        if(clonedComponent.isTopologyTemplate() && ToscaUtils.isNotComplexVfc(clonedComponent)){
+            toscaOperationFacade.revertNamesOfCalculatedCapabilitiesRequirements(clonedComponent.getUniqueId());
+        }
+    }
+
     private StorageOperationStatus upgradeToLatestGenericData(Component clonedComponent) {
 
         StorageOperationStatus updateStatus = StorageOperationStatus.OK;
         Either<Component, StorageOperationStatus> updateEither = toscaOperationFacade.updateToscaElement(clonedComponent);
-        if (updateEither.isRight())
+        if (updateEither.isRight()) {
             updateStatus = updateEither.right().value();
-        else if (clonedComponent.shouldGenerateInputs()) {
+        } else if (clonedComponent.shouldGenerateInputs()) {
             List<InputDefinition> newInputs = clonedComponent.getInputs();
             updateStatus = lifeCycleOperation.updateToscaDataOfToscaElement(clonedComponent.getUniqueId(), EdgeLabelEnum.INPUTS, VertexTypeEnum.INPUTS, newInputs, JsonPresentationFields.NAME);
         }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifeCycleTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifeCycleTransition.java
index dc25243883..0057f615bf 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifeCycleTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifeCycleTransition.java
@@ -20,10 +20,7 @@
 
 package org.openecomp.sdc.be.components.lifecycle;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction.LifecycleChanceActionEnum;
 import org.openecomp.sdc.be.config.ConfigurationManager;
@@ -45,7 +42,9 @@ import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public abstract class LifeCycleTransition {
 
@@ -117,19 +116,8 @@ public abstract class LifeCycleTransition {
         return this.validateBeforeTransition(component, componentType, modifier, owner, oldState, null);
     }
 
-    /**
-     * getComponentOwner
-     *
-     * @param resource
-     * @return
-     */
     protected Either<User, ResponseFormat> getComponentOwner(Component component, ComponentTypeEnum componentType) {
 
-        return getComponentOwner(component, componentType, false);
-    }
-
-    protected Either<User, ResponseFormat> getComponentOwner(Component component, ComponentTypeEnum componentType, boolean inTransaction) {
-
         Either<User, StorageOperationStatus> resourceOwnerResult = getLifeCycleOperation().getToscaElementOwner(component.getUniqueId());
         if (resourceOwnerResult.isRight()) {
             ResponseFormat responseFormat = componentUtils.getResponseFormatByComponent(componentUtils.convertFromStorageResponse(resourceOwnerResult.right().value()), component, componentType);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
index 703e0f9aa5..b0247a26e2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/LifecycleBusinessLogic.java
@@ -20,17 +20,11 @@
 
 package org.openecomp.sdc.be.components.lifecycle;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-
+import fj.data.Either;
+import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.components.distribution.engine.ServiceDistributionArtifactsBuilder;
-import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ProductBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.*;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction.LifecycleChanceActionEnum;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
@@ -39,13 +33,9 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsontitan.operations.NodeTemplateOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
@@ -54,16 +44,18 @@ import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.CapabilityOperation;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceVersionInfo;
 import org.openecomp.sdc.be.tosca.ToscaExportHandler;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
 
 @org.springframework.stereotype.Component("lifecycleBusinessLogic")
 public class LifecycleBusinessLogic {
@@ -82,7 +74,7 @@ public class LifecycleBusinessLogic {
     @Autowired
     private CapabilityOperation capabilityOperation;
 
-    private static final Logger log = LoggerFactory.getLogger(LifecycleBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(LifecycleBusinessLogic.class);
 
     @javax.annotation.Resource
     private ComponentsUtils componentUtils;
@@ -112,6 +104,9 @@ public class LifecycleBusinessLogic {
 
     @Autowired
     ToscaOperationFacade toscaOperationFacade;
+    
+    @Autowired
+    NodeTemplateOperation nodeTemplateOperation;
 
     private Map<String, LifeCycleTransition> stateTransitions;
     private static volatile boolean isInitialized = false;
@@ -130,7 +125,7 @@ public class LifecycleBusinessLogic {
     }
 
     private void initStateOperations() {
-        stateTransitions = new HashMap<String, LifeCycleTransition>();
+        stateTransitions = new HashMap<>();
 
         LifeCycleTransition checkoutOp = new CheckoutTransition(componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
         stateTransitions.put(checkoutOp.getName().name(), checkoutOp);
@@ -142,7 +137,8 @@ public class LifecycleBusinessLogic {
         LifeCycleTransition checkinOp = new CheckinTransition(componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
         stateTransitions.put(checkinOp.getName().name(), checkinOp);
 
-        LifeCycleTransition certificationRequest = new CertificationRequestTransition(componentUtils, lifecycleOperation, serviceDistributionArtifactsBuilder, serviceBusinessLogic, capabilityOperation, toscaExportUtils, toscaOperationFacade, titanDao);
+        LifeCycleTransition certificationRequest = new CertificationRequestTransition(componentUtils, lifecycleOperation, serviceBusinessLogic, toscaOperationFacade,
+                titanDao);
         stateTransitions.put(certificationRequest.getName().name(), certificationRequest);
 
         LifeCycleTransition startCertification = new StartCertificationTransition(componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
@@ -156,6 +152,7 @@ public class LifecycleBusinessLogic {
 
         CertificationChangeTransition successCertification = new CertificationChangeTransition(LifeCycleTransitionEnum.CERTIFY, componentUtils, lifecycleOperation, toscaOperationFacade, titanDao);
         successCertification.setArtifactsManager(artifactsBusinessLogic);
+        successCertification.setNodeTemplateOperation(nodeTemplateOperation);
         stateTransitions.put(successCertification.getName().name(), successCertification);
     }
 
@@ -172,10 +169,10 @@ public class LifecycleBusinessLogic {
         return (Either<Resource, ResponseFormat>) changeComponentState(ComponentTypeEnum.RESOURCE, resourceId, modifier, transitionEnum, changeInfo, inTransaction, needLock);
     }
 
-    private boolean isComponentVFCMT(Component component, ComponentTypeEnum componentType){
-        if (componentType.equals(ComponentTypeEnum.RESOURCE)){
-            ResourceTypeEnum resourceType = ((ResourceMetadataDataDefinition)component.getComponentMetadataDefinition().getMetadataDataDefinition()).getResourceType();
-            if (resourceType.equals(ResourceTypeEnum.VFCMT)){
+    private boolean isComponentVFCMT(Component component, ComponentTypeEnum componentType) {
+        if (componentType.equals(ComponentTypeEnum.RESOURCE)) {
+            ResourceTypeEnum resourceType = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition().getMetadataDataDefinition()).getResourceType();
+            if (resourceType.equals(ResourceTypeEnum.VFCMT)) {
                 return true;
             }
         }
@@ -188,11 +185,11 @@ public class LifecycleBusinessLogic {
         LifeCycleTransition lifeCycleTransition = stateTransitions.get(transitionEnum.name());
         if (lifeCycleTransition == null) {
             log.debug("state operation is not valid. operations allowed are: {}", LifeCycleTransitionEnum.valuesAsString());
-            ResponseFormat error = componentUtils.getInvalidContentErrorAndAudit(modifier,componentId, AuditingActionEnum.CHECKOUT_RESOURCE);
+            ResponseFormat error = componentUtils.getInvalidContentErrorAndAudit(modifier, componentId, AuditingActionEnum.CHECKOUT_RESOURCE);
             return Either.right(error);
         }
         Component component = null;
-        log.info("get resource from graph");
+        log.debug("get resource from graph");
         ResponseFormat errorResponse;
 
         Either<? extends Component, ResponseFormat> eitherResourceResponse = getComponentForChange(componentType, componentId, modifier, lifeCycleTransition, changeInfo);
@@ -205,12 +202,17 @@ public class LifecycleBusinessLogic {
 
         // lock resource
         if (!inTransaction && needLock) {
-            log.info("lock component {}", componentId);
+            log.debug("lock component {}", componentId);
             Either<Boolean, ResponseFormat> eitherLockResource = lockComponent(componentType, component);
             if (eitherLockResource.isRight()) {
                 errorResponse = eitherLockResource.right().value();
-                componentUtils.auditComponent(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(), componentType,
-                        ResourceAuditData.newBuilder().state(resourceCurrState.name()).version(resourceCurrVersion).build());
+                componentUtils.auditComponent(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(),
+                        new ResourceCommonInfo(componentType.getValue()),
+                        ResourceVersionInfo.newBuilder()
+                                .state(resourceCurrState.name())
+                                .version(resourceCurrVersion)
+                                .build());
+
 
                 log.error("lock component {} failed", componentId);
                 return Either.right(errorResponse);
@@ -221,9 +223,13 @@ public class LifecycleBusinessLogic {
             Either<String, ResponseFormat> commentValidationResult = validateComment(changeInfo, transitionEnum);
             if (commentValidationResult.isRight()) {
                 errorResponse = commentValidationResult.right().value();
-                componentUtils.auditComponent(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(), componentType,
-                        ResourceAuditData.newBuilder()
-                                .state(resourceCurrState.name()).version(resourceCurrVersion).build(), changeInfo.getUserRemarks());
+                componentUtils.auditComponent(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(),
+                        new ResourceCommonInfo(componentType.getValue()),
+                        ResourceVersionInfo.newBuilder()
+                                .state(resourceCurrState.name())
+                                .version(resourceCurrVersion)
+                                .build(),
+                        changeInfo.getUserRemarks());
                 return Either.right(errorResponse);
             }
             changeInfo.setUserRemarks(commentValidationResult.left().value());
@@ -233,12 +239,12 @@ public class LifecycleBusinessLogic {
                 return Either.right(validateHighestVersion.right().value());
             }
             log.debug("after validate Highest Version");
-            if (isComponentVFCMT(component,componentType)){
-                Either<? extends Component, ResponseFormat> changeVFCMTStateResponse = changeVFCMTState(componentType, modifier, transitionEnum, changeInfo, true, component);
-                if (changeVFCMTStateResponse.isRight()){
-                    return changeVFCMTStateResponse;
+            if (componentType == ComponentTypeEnum.RESOURCE) {
+                Either<? extends Component, ResponseFormat> changeResourceResponse = changeResourceState(componentType, modifier, transitionEnum, changeInfo, true, component);
+                if (changeResourceResponse.isRight()) {
+                    return changeResourceResponse;
                 }
-                component = changeVFCMTStateResponse.left().value();
+                component = changeResourceResponse.left().value();
             }
             return changeState(component, lifeCycleTransition, componentType, modifier, changeInfo, inTransaction);
         } finally {
@@ -255,49 +261,75 @@ public class LifecycleBusinessLogic {
     }
 
     /*
-     * special case for certification of VFCMT - VFCMT can be certified by Designer or Tester right after checkin
-     * in case the operation "submit for test" / "start testing" is done to "VFCMT" - please return error 400
+     * special case for certification of VFCMT - VFCMT can be certified by Designer or Tester right after checkin in case the operation "submit for test" / "start testing" is done to "VFCMT" - please return error 400
      */
-    private Either<? extends Component, ResponseFormat> changeVFCMTState(ComponentTypeEnum componentType, User modifier,
-            LifeCycleTransitionEnum transitionEnum, LifecycleChangeInfoWithAction changeInfo, boolean inTransaction,
+    private Either<? extends Component, ResponseFormat> changeResourceState(ComponentTypeEnum componentType, User modifier, LifeCycleTransitionEnum transitionEnum, LifecycleChangeInfoWithAction changeInfo, boolean inTransaction,
             Component component) {
         LifecycleStateEnum oldState = component.getLifecycleState();
         Component updatedComponent = component;
-        if (transitionEnum.equals(LifeCycleTransitionEnum.START_CERTIFICATION) ||
-                transitionEnum.equals(LifeCycleTransitionEnum.CERTIFICATION_REQUEST)){
-            return Either.right(componentUtils.getResponseFormat(
-                    ActionStatus.RESOURCE_VFCMT_LIFECYCLE_STATE_NOT_VALID, transitionEnum.getDisplayName()));
-        }    //certify is done directly from checkin
-        else if (transitionEnum.equals(LifeCycleTransitionEnum.CERTIFY) && oldState.equals(LifecycleStateEnum.NOT_CERTIFIED_CHECKIN)){
-            //we will call for submit for testing first and then for certify
-            Either<? extends Component, ResponseFormat> actionResponse = changeState(component,
-                    stateTransitions.get(LifeCycleTransitionEnum.CERTIFICATION_REQUEST.name()),
-                    componentType, modifier, changeInfo, inTransaction);
-            if (actionResponse.isRight()) {
-                return actionResponse;
+        if (transitionEnum == LifeCycleTransitionEnum.START_CERTIFICATION || transitionEnum == LifeCycleTransitionEnum.CERTIFICATION_REQUEST) {
+            //for VFCMT use old error for backward comp. 
+            ActionStatus status = isComponentVFCMT(component, componentType) ? ActionStatus.RESOURCE_VFCMT_LIFECYCLE_STATE_NOT_VALID : ActionStatus.RESOURCE_LIFECYCLE_STATE_NOT_VALID;
+            return Either.right(componentUtils.getResponseFormat(status, transitionEnum.getDisplayName()));
+        } // certify is done directly from checkin
+        else if (transitionEnum == LifeCycleTransitionEnum.CERTIFY) {
+            log.debug("Certification request for resource {} ", component.getUniqueId());
+            if (oldState == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
+                log.debug("Resource {} is in Checkout state perform checkin", component.getUniqueId());
+                Either<? extends Component, ResponseFormat> actionResponse = changeState(component, stateTransitions.get(LifeCycleTransitionEnum.CHECKIN.name()), componentType, modifier, changeInfo, inTransaction);
+                if (actionResponse.isRight()) {
+                    log.debug("Failed to check in Resource {} error {}", component.getUniqueId(), actionResponse.right().value());
+                    return actionResponse;
+                }
+                updatedComponent = actionResponse.left().value();
+                oldState = updatedComponent.getLifecycleState();
             }
-            updatedComponent = actionResponse.left().value();
-            actionResponse = changeState(updatedComponent,
-                    stateTransitions.get(LifeCycleTransitionEnum.START_CERTIFICATION.name()),
-                    componentType, modifier, changeInfo, inTransaction);
-            if (actionResponse.isRight()) {
-                return actionResponse;
+            if (oldState == LifecycleStateEnum.NOT_CERTIFIED_CHECKIN) {
+                // we will call for submit for testing first and then for certify
+                Either<? extends Component, ResponseFormat> actionResponse = changeState(updatedComponent, stateTransitions.get(LifeCycleTransitionEnum.CERTIFICATION_REQUEST.name()), componentType, modifier, changeInfo, inTransaction);
+                if (actionResponse.isRight()) {
+                    return actionResponse;
+                }
+                updatedComponent = actionResponse.left().value();
+                actionResponse = changeState(updatedComponent, stateTransitions.get(LifeCycleTransitionEnum.START_CERTIFICATION.name()), componentType, modifier, changeInfo, inTransaction);
+                if (actionResponse.isRight()) {
+                    return actionResponse;
+                }
+                updatedComponent = actionResponse.left().value();
+            }
+            if(oldState == LifecycleStateEnum.CERTIFIED){
+                failOnAlreadyCertifiedResource(component);
             }
-            updatedComponent = actionResponse.left().value();
-             
         }
         return Either.left(updatedComponent);
     }
 
-    private Either<? extends Component, ResponseFormat> changeState(Component component, LifeCycleTransition lifeCycleTransition,
-            ComponentTypeEnum componentType, User modifier,    LifecycleChangeInfoWithAction changeInfo,boolean inTransaction){
+    private void failOnAlreadyCertifiedResource(Component component) {
+        String firstName = null;
+        String lastName = null;
+        if(StringUtils.isNotEmpty(component.getLastUpdaterFullName())){
+            String[] fullName = component.getLastUpdaterFullName().split(" ");
+            if(fullName.length == 2){
+                firstName = fullName[0];
+                lastName = fullName[1];
+            }
+        }
+        throw new ComponentException(ActionStatus.COMPONENT_ALREADY_CERTIFIED,
+                component.getName(),
+                component.getComponentType().name().toLowerCase(),
+                firstName,
+                lastName,
+                component.getLastUpdaterUserId());
+    }
+
+    private Either<? extends Component, ResponseFormat> changeState(Component component, LifeCycleTransition lifeCycleTransition, ComponentTypeEnum componentType, User modifier, LifecycleChangeInfoWithAction changeInfo, boolean inTransaction) {
         ResponseFormat errorResponse;
 
         LifecycleStateEnum oldState = component.getLifecycleState();
         String resourceCurrVersion = component.getVersion();
         ComponentBusinessLogic bl = getComponentBL(componentType);
 
-        Either<User, ResponseFormat> ownerResult = lifeCycleTransition.getComponentOwner(component, componentType, inTransaction);
+        Either<User, ResponseFormat> ownerResult = lifeCycleTransition.getComponentOwner(component, componentType);
         if (ownerResult.isRight()) {
             return Either.right(ownerResult.right().value());
         }
@@ -308,29 +340,43 @@ public class LifecycleBusinessLogic {
         if (stateValidationResult.isRight()) {
             log.error("Failed to validateBeforeTransition");
             errorResponse = stateValidationResult.right().value();
-            componentUtils.auditComponent(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(), componentType,
-                    ResourceAuditData.newBuilder().version(resourceCurrVersion).state(oldState.name()).build(), changeInfo.getUserRemarks());
+            componentUtils.auditComponent(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(),
+                    new ResourceCommonInfo(componentType.getValue()),
+                    ResourceVersionInfo.newBuilder()
+                            .version(resourceCurrVersion)
+                            .state(oldState.name())
+                            .build(),
+                    changeInfo.getUserRemarks());
             return Either.right(errorResponse);
         }
-
+        
         Either<? extends Component, ResponseFormat> operationResult = lifeCycleTransition.changeState(componentType, component, bl, modifier, owner, false, inTransaction);
 
         if (operationResult.isRight()) {
             errorResponse = operationResult.right().value();
             log.info("audit before sending error response");
             componentUtils.auditComponentAdmin(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(), componentType,
-                     ResourceAuditData.newBuilder().state(oldState.name()).version(resourceCurrVersion).build());
+                     ResourceVersionInfo.newBuilder()
+                             .state(oldState.name())
+                             .version(resourceCurrVersion)
+                             .build());
 
             return Either.right(errorResponse);
         }
         Component resourceAfterOperation = operationResult.left().value();
-        componentUtils.auditComponent(componentUtils.getResponseFormat(ActionStatus.OK), modifier, resourceAfterOperation, lifeCycleTransition.getAuditingAction(), componentType,
-                ResourceAuditData.newBuilder().state(oldState.name()).version(resourceCurrVersion).build(), changeInfo.getUserRemarks());
+        componentUtils.auditComponent(componentUtils.getResponseFormat(ActionStatus.OK), modifier, resourceAfterOperation,
+                lifeCycleTransition.getAuditingAction(), new ResourceCommonInfo(componentType.getValue()),
+                ResourceVersionInfo.newBuilder()
+                        .state(oldState.name())
+                        .version(resourceCurrVersion)
+                        .build(),
+                changeInfo.getUserRemarks());
         return operationResult;
 
     }
 
-    private Either<? extends Component, ResponseFormat> getComponentForChange(ComponentTypeEnum componentType, String componentId, User modifier, LifeCycleTransition lifeCycleTransition, LifecycleChangeInfoWithAction changeInfo) {
+
+	private Either<? extends Component, ResponseFormat> getComponentForChange(ComponentTypeEnum componentType, String componentId, User modifier, LifeCycleTransition lifeCycleTransition, LifecycleChangeInfoWithAction changeInfo) {
 
         Either<? extends Component, StorageOperationStatus> eitherResourceResponse = toscaOperationFacade.getToscaElement(componentId);
 
@@ -339,7 +385,8 @@ public class LifecycleBusinessLogic {
             ActionStatus actionStatus = componentUtils.convertFromStorageResponse(eitherResourceResponse.right().value(), componentType);
             errorResponse = componentUtils.getResponseFormat(actionStatus, Constants.EMPTY_STRING);
             log.debug("audit before sending response");
-            componentUtils.auditComponent(errorResponse, modifier, lifeCycleTransition.getAuditingAction(), componentId, componentType, changeInfo.getUserRemarks());
+            componentUtils.auditComponent(errorResponse, modifier, lifeCycleTransition.getAuditingAction(),
+                    new ResourceCommonInfo(componentId, componentType.getValue()), changeInfo.getUserRemarks());
 
             return Either.right(errorResponse);
         }
@@ -352,8 +399,11 @@ public class LifecycleBusinessLogic {
             log.debug("Component version {} is not the last version of component {}", component.getComponentMetadataDefinition().getMetadataDataDefinition().getVersion(),
                     component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
             errorResponse = componentUtils.getResponseFormat(ActionStatus.COMPONENT_HAS_NEWER_VERSION, component.getComponentMetadataDefinition().getMetadataDataDefinition().getName(), componentType.getValue().toLowerCase());
-            componentUtils.auditComponentAdmin(errorResponse, modifier, component,lifeCycleTransition.getAuditingAction(), componentType,
-                    ResourceAuditData.newBuilder().state(component.getLifecycleState().name()).version(resourceCurrVersion).build());
+            componentUtils.auditComponentAdmin(errorResponse, modifier, component, lifeCycleTransition.getAuditingAction(), componentType,
+                    ResourceVersionInfo.newBuilder()
+                            .state(component.getLifecycleState().name())
+                            .version(resourceCurrVersion)
+                            .build());
             return Either.right(errorResponse);
         }
         return Either.left(true);
@@ -405,17 +455,17 @@ public class LifecycleBusinessLogic {
     private ComponentBusinessLogic getComponentBL(ComponentTypeEnum componentTypeEnum) {
         ComponentBusinessLogic businessLogic;
         switch (componentTypeEnum) {
-            case RESOURCE:
-                businessLogic = this.resourceBusinessLogic;
-                break;
-            case SERVICE:
-                businessLogic = this.serviceBusinessLogic;
-                break;
-            case PRODUCT:
-                businessLogic = this.productBusinessLogic;
-                break;
-            default:
-                throw new IllegalArgumentException("Illegal component type:" + componentTypeEnum.getValue());
+        case RESOURCE:
+            businessLogic = this.resourceBusinessLogic;
+            break;
+        case SERVICE:
+            businessLogic = this.serviceBusinessLogic;
+            break;
+        case PRODUCT:
+            businessLogic = this.productBusinessLogic;
+            break;
+        default:
+            throw new IllegalArgumentException("Illegal component type:" + componentTypeEnum.getValue());
         }
         return businessLogic;
     }
@@ -433,41 +483,41 @@ public class LifecycleBusinessLogic {
 
         return Either.left(latestComponent);
     }
-/**
- * Performs Force certification.
- * Note that a Force certification is allowed for the first certification only,
- * as only a state and a version is promoted due a Force certification,
- * skipping other actions required if a previous certified version exists.
- * @param resource
- * @param user
- * @param lifecycleChangeInfo
- * @param inTransaction
- * @param needLock
- * @return
- */
+
+    /**
+     * Performs Force certification. Note that a Force certification is allowed for the first certification only, as only a state and a version is promoted due a Force certification, skipping other actions required if a previous certified version
+     * exists.
+     * 
+     * @param resource
+     * @param user
+     * @param lifecycleChangeInfo
+     * @param inTransaction
+     * @param needLock
+     * @return
+     */
     public Either<Resource, ResponseFormat> forceResourceCertification(Resource resource, User user, LifecycleChangeInfoWithAction lifecycleChangeInfo, boolean inTransaction, boolean needLock) {
         Either<Resource, ResponseFormat> result = null;
         Either<ToscaElement, StorageOperationStatus> certifyResourceRes = null;
-        if(lifecycleChangeInfo.getAction() != LifecycleChanceActionEnum.CREATE_FROM_CSAR){
+        if (lifecycleChangeInfo.getAction() != LifecycleChanceActionEnum.CREATE_FROM_CSAR) {
             log.debug("Force certification is not allowed for the action {}. ", lifecycleChangeInfo.getAction());
             result = Either.right(componentUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
         }
-        if(!isFirstCertification(resource.getVersion())){
+        if (!isFirstCertification(resource.getVersion())) {
             log.debug("Failed to perform a force certification of resource{}. Force certification is allowed for the first certification only. ", resource.getName());
             result = Either.right(componentUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
         }
         // lock resource
-        if(result == null && !inTransaction && needLock){
+        if (result == null && !inTransaction && needLock) {
             log.info("lock component {}", resource.getUniqueId());
             Either<Boolean, ResponseFormat> eitherLockResource = lockComponent(resource.getComponentType(), resource);
             if (eitherLockResource.isRight()) {
                 log.error("lock component {} failed", resource.getUniqueId());
-                result =  Either.right(eitherLockResource.right().value());
+                result = Either.right(eitherLockResource.right().value());
             }
             log.info("after lock component {}", resource.getUniqueId());
         }
-        try{
-            if(result == null){
+        try {
+            if (result == null) {
                 certifyResourceRes = lifecycleOperation.forceCerificationOfToscaElement(resource.getUniqueId(), user.getUserId(), user.getUserId(), resource.getVersion());
                 if (certifyResourceRes.isRight()) {
                     StorageOperationStatus status = certifyResourceRes.right().value();
@@ -475,18 +525,18 @@ public class LifecycleBusinessLogic {
                     result = Either.right(componentUtils.getResponseFormatByResource(componentUtils.convertFromStorageResponse(status), resource));
                 }
             }
-            if(result == null){
+            if (result == null) {
                 result = Either.left(ModelConverter.convertFromToscaElement(certifyResourceRes.left().value()));
             }
         } finally {
             log.info("unlock component {}", resource.getUniqueId());
             if (!inTransaction) {
-                if(result.isLeft()){
+                if (result.isLeft()) {
                     titanDao.commit();
-                } else{
+                } else {
                     titanDao.rollback();
                 }
-                if(needLock){
+                if (needLock) {
                     NodeTypeEnum nodeType = resource.getComponentType().getNodeType();
                     log.info("During change state, another component {} has been created/updated", resource.getUniqueId());
                     graphLockOperation.unlockComponent(resource.getUniqueId(), nodeType);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java
index 4dddc044f2..fd3e24f2fb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/StartCertificationTransition.java
@@ -20,14 +20,12 @@
 
 package org.openecomp.sdc.be.components.lifecycle;
 
-import java.util.Arrays;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
@@ -40,28 +38,27 @@ import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.Arrays;
 
 public class StartCertificationTransition extends LifeCycleTransition {
 
-    private static final Logger log = LoggerFactory.getLogger(StartCertificationTransition.class);
+    private static final Logger log = Logger.getLogger(StartCertificationTransition.class);
 
     public StartCertificationTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
         super(componentUtils, lifecycleOperation, toscaOperationFacade,  titanDao);
 
         // authorized roles
         Role[] rsrcServiceStartCertificationRoles = { Role.ADMIN, Role.TESTER };
-        addAuthorizedRoles(ComponentTypeEnum.RESOURCE, Arrays.asList(rsrcServiceStartCertificationRoles));
+        Role[] resourceRoles = { Role.ADMIN, Role.TESTER, Role.DESIGNER};
+        addAuthorizedRoles(ComponentTypeEnum.RESOURCE, Arrays.asList(resourceRoles));
         addAuthorizedRoles(ComponentTypeEnum.SERVICE, Arrays.asList(rsrcServiceStartCertificationRoles));
         // TODO to be later defined for product
 
         //additional authorized roles for resource type
-        Role[] resourceRoles = { Role.DESIGNER};
-        addResouceAuthorizedRoles(ResourceTypeEnum.VFCMT, Arrays.asList(resourceRoles));
+//        addResouceAuthorizedRoles(ResourceTypeEnum.VFCMT, Arrays.asList(resourceRoles));
     }
 
     @Override
@@ -98,12 +95,12 @@ public class StartCertificationTransition extends LifeCycleTransition {
         } finally {
             if (result == null || result.isRight()) {
                 BeEcompErrorManager.getInstance().logBeDaoSystemError("Change LifecycleState");
-                if (inTransaction == false) {
+                if (!inTransaction) {
                     log.debug("operation failed. do rollback");
                     titanDao.rollback();
                 }
             } else {
-                if (inTransaction == false) {
+                if (!inTransaction) {
                     log.debug("operation success. do commit");
                     titanDao.commit();
                 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTransition.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTransition.java
index 07b5dc0e40..c6429c70bb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTransition.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/lifecycle/UndoCheckoutTransition.java
@@ -20,8 +20,7 @@
 
 package org.openecomp.sdc.be.components.lifecycle;
 
-import java.util.Arrays;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
@@ -40,14 +39,13 @@ import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.Arrays;
 
 public class UndoCheckoutTransition extends LifeCycleTransition {
-    private static final Logger log = LoggerFactory.getLogger(CheckoutTransition.class);
+    private static final Logger log = Logger.getLogger(CheckoutTransition.class);
     private ArtifactsBusinessLogic artifactsManager;
 
     public UndoCheckoutTransition(ComponentsUtils componentUtils, ToscaElementLifecycleOperation lifecycleOperation, ToscaOperationFacade toscaOperationFacade, TitanDao titanDao) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/ComponentsGlobalMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/ComponentsGlobalMergeCommand.java
new file mode 100644
index 0000000000..1636a9b4f1
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/ComponentsGlobalMergeCommand.java
@@ -0,0 +1,7 @@
+package org.openecomp.sdc.be.components.merge;
+
+/**
+ * A command to be executed upon csar update in case new csar topology was changed with respect to previous csar
+ */
+public interface ComponentsGlobalMergeCommand extends ComponentsMergeCommand {
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentsMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/ComponentsMergeCommand.java
index 5dcb1dda79..5acebd9f0e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentsMergeCommand.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/ComponentsMergeCommand.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.components.merge.instance;
+package org.openecomp.sdc.be.components.merge;
 
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.Component;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogic.java
index 9c140b36c7..00e49dcbc0 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/GlobalInputsFilteringBusinessLogic.java
@@ -1,32 +1,39 @@
 package org.openecomp.sdc.be.components.merge;
 
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.openecomp.sdc.be.components.impl.BaseBusinessLogic;
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.generic.GenericTypeBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-@Component
-public class GlobalInputsFilteringBusinessLogic extends BaseBusinessLogic {
+@org.springframework.stereotype.Component
+public class GlobalInputsFilteringBusinessLogic {
 
-    @javax.annotation.Resource
     private GenericTypeBusinessLogic genericTypeBusinessLogic;
+    private ToscaOperationFacade toscaOperationFacade;
+    private ComponentsUtils componentsUtils;
+
+    public GlobalInputsFilteringBusinessLogic(GenericTypeBusinessLogic genericTypeBusinessLogic, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils) {
+        this.genericTypeBusinessLogic = genericTypeBusinessLogic;
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+    }
 
-    Either<List<InputDefinition>, ActionStatus> filterGlobalInputs(Resource newResource) {
+    public Either<List<InputDefinition>, ActionStatus> filterGlobalInputs(Component newResource) {
             Either<Resource, StorageOperationStatus> genericComp = toscaOperationFacade.getLatestCertifiedNodeTypeByToscaResourceName(newResource.fetchGenericTypeToscaNameFromConfig());
             return genericComp.bimap(genericResource -> findCommonInputs(genericResource, newResource),
                                      storageOperationStatus -> componentsUtils.convertFromStorageResponse(storageOperationStatus));
     }
 
-    private List<InputDefinition> findCommonInputs(Resource genericResource, Resource resource) {
+    private List<InputDefinition> findCommonInputs(Resource genericResource, Component resource) {
         List<InputDefinition> resourceInputs = resource.getInputs();
         List<InputDefinition> genericInputs = genericTypeBusinessLogic.generateInputsFromGenericTypeProperties(genericResource);
         Set<String> genericInputsNames = genericInputs.stream().map(InputDefinition::getName).collect(Collectors.toSet());
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/GlobalTypesMergeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/GlobalTypesMergeBusinessLogic.java
deleted file mode 100644
index eb359e949e..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/GlobalTypesMergeBusinessLogic.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.openecomp.sdc.be.components.merge;
-
-import java.util.List;
-
-import org.openecomp.sdc.be.components.merge.input.ComponentInputsMergeBL;
-import org.openecomp.sdc.be.components.merge.resource.MergeResourceBusinessLogic;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import fj.data.Either;
-
-@Component
-public class GlobalTypesMergeBusinessLogic implements MergeResourceBusinessLogic {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(GlobalTypesMergeBusinessLogic.class);
-
-    @javax.annotation.Resource
-    private GlobalInputsFilteringBusinessLogic globalInputsFilteringBusinessLogic;
-
-    @javax.annotation.Resource
-    private ComponentInputsMergeBL inputsValuesMergeBL;
-
-    @Override
-    public ActionStatus mergeResourceEntities(Resource oldResource, Resource newResource) {
-        if (oldResource == null) {
-            return ActionStatus.OK;
-        }
-        Either<List<InputDefinition>, ActionStatus> globalInputsEither = globalInputsFilteringBusinessLogic.filterGlobalInputs(newResource);
-        if (globalInputsEither.isRight()) {
-            LOGGER.error("failed to get global inputs of resource {} status is {}", newResource.getUniqueId(), globalInputsEither.right().value());
-            return globalInputsEither.right().value();
-        }
-        List<InputDefinition> globalInputs = globalInputsEither.left().value();
-        return inputsValuesMergeBL.mergeComponentInputs(oldResource, newResource, globalInputs);
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java
index ab47837a2a..058d4c2555 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/RelationsComparator.java
@@ -1,15 +1,15 @@
 package org.openecomp.sdc.be.components.merge;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.RelationshipInfo;
 import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
 import org.openecomp.sdc.be.model.Resource;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
 @Component
 public class RelationsComparator {
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.java
index 8b48b0897a..1220ec4d97 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.java
@@ -1,8 +1,6 @@
 package org.openecomp.sdc.be.components.merge;
 
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.exception.SdcActionException;
@@ -12,15 +10,15 @@ import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Map;
 
 @org.springframework.stereotype.Component
 public class TopologyComparator {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(TopologyComparator.class);
+    public static final Logger log = Logger.getLogger(TopologyComparator.class);
 
     @javax.annotation.Resource
     private RelationsComparator relationsComparator;
@@ -59,7 +57,7 @@ public class TopologyComparator {
                                         relationsComparator.isRelationsChanged(oldResource, newResource);
             return Either.left(isTopologyChanged);
         } catch (SdcActionException e) {
-            LOGGER.error("failed to merge entities of previous resource %s to current resource %s. reason: %s", oldResource.getUniqueId(), newResource.getUniqueId(), e.getActionStatus(), e);
+            log.error("failed to merge entities of previous resource %s to current resource %s. reason: %s", oldResource.getUniqueId(), newResource.getUniqueId(), e.getActionStatus(), e);
             return Either.right(e.getActionStatus());
         }
     }
@@ -97,7 +95,7 @@ public class TopologyComparator {
     }
 
     private Component throwSdcActionException(StorageOperationStatus storageOperationStatus, ComponentInstance cmptInstance) {
-        LOGGER.error("failed to fetch origin node type %s for instance %s", cmptInstance.getUniqueId(), cmptInstance.getComponentUid());
+        log.error("failed to fetch origin node type %s for instance %s", cmptInstance.getUniqueId(), cmptInstance.getComponentUid());
         throw new SdcActionException(componentsUtils.convertFromStorageResponse(storageOperationStatus));
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/VspComponentsMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/VspComponentsMergeCommand.java
new file mode 100644
index 0000000000..c8365467fb
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/VspComponentsMergeCommand.java
@@ -0,0 +1,9 @@
+package org.openecomp.sdc.be.components.merge;
+
+/**
+ * A command to be executed upon csar update in case new csar topology was not change from previous csar
+ */
+public interface VspComponentsMergeCommand extends ComponentsMergeCommand {
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/CapabilityResolver.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/CapabilityResolver.java
index 5d616c10f9..0a467ef876 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/CapabilityResolver.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/CapabilityResolver.java
@@ -1,12 +1,12 @@
 package org.openecomp.sdc.be.components.merge.capability;
 
-import java.util.List;
-import java.util.Map;
-
 import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
 
+import java.util.List;
+import java.util.Map;
+
 public interface CapabilityResolver {
 
     /**
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/SimpleCapabilityResolver.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/SimpleCapabilityResolver.java
index d09a00c112..1696da1b01 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/SimpleCapabilityResolver.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/capability/SimpleCapabilityResolver.java
@@ -1,20 +1,15 @@
 package org.openecomp.sdc.be.components.merge.capability;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
 import org.openecomp.sdc.be.components.merge.utils.MergeInstanceUtils;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
 
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+import static org.openecomp.sdc.be.dao.utils.MapUtil.flattenMapValues;
 @org.springframework.stereotype.Component
 public class SimpleCapabilityResolver implements CapabilityResolver {
 
@@ -26,35 +21,47 @@ public class SimpleCapabilityResolver implements CapabilityResolver {
 
     @Override
     public Map<CapabilityDefinition, CapabilityDefinition> resolvePrevCapToNewCapability(Component container, Component prevInstanceOrigNode, String cmptInstanceId, List<CapabilityDefinition> prevCapabilities) {
-        Map<String, List<CapabilityDefinition>> newCapabilitiesByType = resolveInstanceCapabilities(container, cmptInstanceId).getCapabilities();
+        List<CapabilityDefinition> newCapabilities = resolveInstanceCapabilities(container, cmptInstanceId);
         Map<String, String> oldCapOwnerToNewOwner = mapOldToNewCapabilitiesOwnerIds(container, prevInstanceOrigNode, cmptInstanceId, prevCapabilities);
-        return mapOldToNewCapabilities(prevCapabilities, newCapabilitiesByType, oldCapOwnerToNewOwner);
+        return mapOldToNewCapabilities(prevCapabilities, newCapabilities, oldCapOwnerToNewOwner);
     }
 
     @Override
     public Map<CapabilityDefinition, CapabilityDefinition> resolvePrevCapIdToNewCapability(ComponentInstance oldInstance, ComponentInstance currInstance) {
-        Map<String, List<CapabilityDefinition>> newCapabilitiesByType = currInstance.getCapabilities();
+        List<CapabilityDefinition> newCapabilities = flattenMapValues(currInstance.getCapabilities());
+        List<CapabilityDefinition> prevCapabilities = flattenMapValues(oldInstance.getCapabilities());
         Map<String, String> oldCapOwnerToNewOwner = mergeInstanceUtils.mapOldToNewCapabilitiesOwnerIds(oldInstance, currInstance);
-        List<CapabilityDefinition> prevCapabilities = oldInstance.getCapabilities().values().stream().flatMap(Collection::stream).collect(Collectors.toList());
-        return mapOldToNewCapabilities(prevCapabilities, newCapabilitiesByType, oldCapOwnerToNewOwner);
+        return mapOldToNewCapabilities(prevCapabilities, newCapabilities, oldCapOwnerToNewOwner);
     }
 
-    private Map<CapabilityDefinition, CapabilityDefinition> mapOldToNewCapabilities(List<CapabilityDefinition> prevCapabilities, Map<String, List<CapabilityDefinition>> newCapabilitiesByType, Map<String, String> oldCapOwnerToNewOwner) {
-        Map<CapabilityDefinition, CapabilityDefinition> oldToNewCapability = prevCapabilities
-                .stream()
-                .collect(HashMap::new,
-                        (resultMap, prevCap) -> mapOldToNewCapability(newCapabilitiesByType, oldCapOwnerToNewOwner, resultMap, prevCap),
-                        HashMap::putAll);
+    private Map<CapabilityDefinition, CapabilityDefinition> mapOldToNewCapabilities(List<CapabilityDefinition> prevCapabilities, List<CapabilityDefinition> newCapabilities, Map<String, String> oldCapOwnerToNewOwner) {
+        Map<CapabilityDefinition, CapabilityDefinition> oldToNewCapability = findNewCapByPrevCapabilityNameTypeAndOwner(prevCapabilities, newCapabilities, oldCapOwnerToNewOwner);
         removeNotFoundNewCapabilities(oldToNewCapability);
         return oldToNewCapability;
     }
 
-    private CapabilityDefinition mapOldToNewCapability(Map<String, List<CapabilityDefinition>> newCapabilitiesByType, Map<String, String> oldCapOwnerToNewOwner, Map<CapabilityDefinition, CapabilityDefinition> resultMap, CapabilityDefinition prevCap) {
-        return resultMap.put(prevCap, findCurrCapability(newCapabilitiesByType, prevCap, oldCapOwnerToNewOwner.get(prevCap.getOwnerId())));
+    private Map<CapabilityDefinition, CapabilityDefinition> findNewCapByPrevCapabilityNameTypeAndOwner(List<CapabilityDefinition> prevCapabilities, List<CapabilityDefinition> newCapabilities, Map<String, String> oldCapOwnerToNewOwner) {
+        Map<CapabilityDefinition, CapabilityDefinition> prevToNewCapabilityMapping = new HashMap<>();
+        prevCapabilities.forEach(prevCap -> {
+            CapabilityDefinition newCapability = mapOldToNewCapability(prevCap, newCapabilities, oldCapOwnerToNewOwner);
+            prevToNewCapabilityMapping.put(prevCap, newCapability);
+        });
+        return prevToNewCapabilityMapping;
+    }
+
+    private CapabilityDefinition mapOldToNewCapability(CapabilityDefinition prevCap, List<CapabilityDefinition> newCapabilities, Map<String, String> oldCapOwnerToNewOwner) {
+        String newOwnerId = oldCapOwnerToNewOwner.get(prevCap.getOwnerId());
+        return newCapabilities.stream()
+                       .filter(newCap -> newCap.getName().equals(prevCap.getName()))
+                       .filter(newCap -> newCap.getType().equals(prevCap.getType()))
+                       .filter(newCap -> newCap.getOwnerId().equals(newOwnerId))
+                       .findFirst()
+                       .orElse(null);
     }
 
+
     private Map<String, String> mapOldToNewCapabilitiesOwnerIds(Component container, Component origInstanceNode, String cmptInstanceId, List<CapabilityDefinition> prevCapabilities) {
-        List<String> prevCapOwnerIds = prevCapabilities.stream().map(CapabilityDefinition::getOwnerId).distinct().collect(Collectors.toList());
+        List<String> prevCapOwnerIds = prevCapabilities.stream().map(CapabilityDefinition::getOwnerId).distinct().collect(toList());
         return mergeInstanceUtils.mapOldToNewCapabilitiesOwnerIds(container, origInstanceNode, cmptInstanceId, prevCapOwnerIds);
     }
 
@@ -62,24 +69,14 @@ public class SimpleCapabilityResolver implements CapabilityResolver {
         oldToNewCapMap.values().removeIf(Objects::isNull);
     }
 
-    private ComponentInstance resolveInstanceCapabilities(Component capabilityOwnerContainer, String cmptInstanceId) {
-        return MapUtil.toMap(capabilityOwnerContainer.getComponentInstances(), ComponentInstance::getUniqueId).get(cmptInstanceId);
+    private List<CapabilityDefinition> resolveInstanceCapabilities(Component capabilityOwnerContainer, String cmptInstanceId) {
+        return capabilityOwnerContainer.getComponentInstanceById(cmptInstanceId)
+                .map(ComponentInstance::getCapabilities)
+                .map(MapUtil::flattenMapValues)
+                .orElse(new ArrayList<>());
     }
 
 
-    private CapabilityDefinition findCurrCapability(Map<String, List<CapabilityDefinition>> capabilitiesByType, CapabilityDefinition oldCap, String newCapOwnerId) {
-        List<CapabilityDefinition> newCapOfType = capabilitiesByType.get(oldCap.getType());
-        if (newCapOwnerId == null || CollectionUtils.isEmpty(newCapOfType)) {
-            return null;
-        }
-        return newCapOfType.stream().filter(sameNameAndOwner(oldCap.getName(), newCapOwnerId))
-                                             .findFirst().orElse(null);
-
-    }
-
-    private Predicate<CapabilityDefinition> sameNameAndOwner(String capName, String newCapOwnerId) {
-        return newCap -> newCap.getName().equals(capName) && newCap.getOwnerId().equals(newCapOwnerId);
-    }
 
 
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/group/ComponentGroupMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/group/ComponentGroupMergeCommand.java
new file mode 100644
index 0000000000..1638aea737
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/group/ComponentGroupMergeCommand.java
@@ -0,0 +1,101 @@
+package org.openecomp.sdc.be.components.merge.group;
+
+import org.openecomp.sdc.be.components.merge.ComponentsGlobalMergeCommand;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.core.annotation.Order;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections.MapUtils.isEmpty;
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.FIRST_COMMAND;
+
+@org.springframework.stereotype.Component
+@Order(FIRST_COMMAND)//must run before policies merge command
+public class ComponentGroupMergeCommand implements VspComponentsMergeCommand, ComponentsGlobalMergeCommand {
+
+    private static final Logger log = Logger.getLogger(ComponentGroupMergeCommand.class);
+    private final GroupsOperation groupsOperation;
+    private final ComponentsUtils componentsUtils;
+
+    public ComponentGroupMergeCommand(GroupsOperation groupsOperation, ComponentsUtils componentsUtils) {
+        this.groupsOperation = groupsOperation;
+        this.componentsUtils = componentsUtils;
+    }
+
+    @Override
+    public String description() {
+        return "merge group from old component to new component";
+    }
+
+    @Override
+    public ActionStatus mergeComponents(Component prevComponent, Component currentComponent) {
+        log.debug("#mergeComponents - merging user defined groups to component {}", currentComponent.getUniqueId());
+        if (isEmpty(prevComponent.getGroups())) {
+            return ActionStatus.OK;
+        }
+        List<GroupDefinition> prevUserDefinedGroups = getAllPreviouslyUserDefinedGroups(prevComponent, currentComponent);
+        if (isEmpty(prevUserDefinedGroups)) {
+            return ActionStatus.OK;
+        }
+        updateGroupsMembers(prevUserDefinedGroups, prevComponent, currentComponent);
+        return associateGroupsToComponent(currentComponent, prevUserDefinedGroups);
+
+    }
+
+    private List<GroupDefinition> getAllPreviouslyUserDefinedGroups(Component prevComponent, Component currCmpt) {
+        return prevComponent.getGroups()
+                .stream()
+                .filter(GroupDefinition::isUserDefined)
+                .filter(group -> !currCmpt.containsGroupWithInvariantName(group.getInvariantName()))
+                .collect(toList());
+    }
+
+    private void updateGroupsMembers(List<GroupDefinition> prevUserDefinedGroups, Component prevComponent, Component currentComponent) {
+        log.debug("#updateGroupsMembers - updating groups member with members taken from component {}", currentComponent.getUniqueId());
+        prevUserDefinedGroups.forEach(grp -> grp.setMembers(resolveNewGroupMembers(grp, prevComponent, currentComponent)));
+    }
+
+    private Map<String, String> resolveNewGroupMembers(GroupDefinition grp, Component prevComponent, Component currentComponent) {
+        log.debug("#resolveNewGroupMembers - updating group member for group {}", grp.getUniqueId());
+        Map<String, String> prevGroupMembers = grp.getMembers();
+        if (isEmpty(prevGroupMembers)) {
+            return null;
+        }
+        return findNewInstancesByPrevInstancesNames(prevComponent, currentComponent, prevGroupMembers);
+    }
+
+    private Map<String, String> findNewInstancesByPrevInstancesNames(Component prevComponent, Component currentComponent, Map<String, String> prevGroupMembers) {
+        return prevGroupMembers.values()
+                .stream()
+                .map(prevComponent::getComponentInstanceById)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(prevInstance -> currentComponent.getComponentInstanceByName(prevInstance.getName()))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(toMap(ComponentInstance::getName, ComponentInstance::getUniqueId));
+    }
+
+    private ActionStatus associateGroupsToComponent(Component currentComponent, List<GroupDefinition> prevUserDefinedGroups) {
+        currentComponent.addGroups(prevUserDefinedGroups);
+        return groupsOperation.addGroups(currentComponent, prevUserDefinedGroups)
+                .either(addedGroups -> ActionStatus.OK,
+                        componentsUtils::convertFromStorageResponse);
+    }
+
+
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/group/GroupPropertiesMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/group/GroupPropertiesMergeCommand.java
new file mode 100644
index 0000000000..a84360b69b
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/group/GroupPropertiesMergeCommand.java
@@ -0,0 +1,104 @@
+package org.openecomp.sdc.be.components.merge.group;
+
+import org.openecomp.sdc.be.components.merge.ComponentsGlobalMergeCommand;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
+import org.openecomp.sdc.be.components.merge.property.DataDefinitionsValuesMergingBusinessLogic;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.GroupsOperation;
+import org.springframework.core.annotation.Order;
+
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.ANY_ORDER_COMMAND;
+
+@org.springframework.stereotype.Component
+@Order(ANY_ORDER_COMMAND)
+public class GroupPropertiesMergeCommand implements VspComponentsMergeCommand, ComponentsGlobalMergeCommand {
+
+    private final GroupsOperation groupsOperation;
+    private final ComponentsUtils componentsUtils;
+    private final DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic;
+
+    public GroupPropertiesMergeCommand(GroupsOperation groupsOperation, ComponentsUtils componentsUtils, DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic) {
+        this.groupsOperation = groupsOperation;
+        this.componentsUtils = componentsUtils;
+        this.propertyValuesMergingBusinessLogic = propertyValuesMergingBusinessLogic;
+    }
+
+    @Override
+    public String description() {
+        return "merge groups user defined properties values";
+    }
+
+    /**
+     * merge user defined group properties values from previous version into vsp defined groups in new version
+     * @param prevComponent the old component, whose group properties need to be merged from
+     * @param currentComponent the new component, whose group properties need to be merged into
+     * old and new component inputs are needed in order to determine if a "get_input" property value should be merged
+     * @return the status of the merge operation
+     */
+    @Override
+    public ActionStatus mergeComponents(Component prevComponent, Component currentComponent) {
+        List<GroupDefinition> groupsToUpdate = updateOldGrpsPropertiesValuesIntoNewVspGroupsProps(prevComponent, currentComponent);
+        return updateGroups(currentComponent, groupsToUpdate);
+    }
+
+    private List<GroupDefinition> updateOldGrpsPropertiesValuesIntoNewVspGroupsProps(Component prevComponent, Component currentComponent) {
+        List<GroupDefinition> prevGroups = prevComponent.getGroups();
+        List<GroupDefinition> newGroups = currentComponent.getGroups();
+        if (isEmpty(prevGroups) || isEmpty(newGroups)) {
+            return emptyList();
+        }
+        return mergeGroupPropertiesValues(prevComponent, currentComponent, prevGroups, newGroups);
+    }
+
+    private List<GroupDefinition> mergeGroupPropertiesValues(Component prevComponent, Component currentComponent, List<GroupDefinition> prevGroups, List<GroupDefinition> newGroups) {
+        Map<String, GroupDefinition> prevGroupsByInvariantName = getVspGroupsMappedByInvariantName(prevGroups);
+        List<GroupDefinition> newGroupsExistInPrevVersion = getNewGroupsExistInPrevComponent(prevGroupsByInvariantName, newGroups);
+        newGroupsExistInPrevVersion.forEach(newGroup -> {
+            GroupDefinition prevGroup = prevGroupsByInvariantName.get(newGroup.getInvariantName());
+            mergeGroupProperties(prevGroup, prevComponent.safeGetInputs(), newGroup, currentComponent.safeGetInputs());
+        });
+        return newGroupsExistInPrevVersion;
+    }
+
+    private void mergeGroupProperties(GroupDefinition prevGroup, List<InputDefinition> prevInputs, GroupDefinition newGroup, List<InputDefinition> currInputs) {
+        propertyValuesMergingBusinessLogic.mergeInstanceDataDefinitions(prevGroup.getProperties(), prevInputs, newGroup.getProperties(), currInputs);
+    }
+
+    private List<GroupDefinition> getNewGroupsExistInPrevComponent(Map<String, GroupDefinition> prevGroupsByInvariantName, List<GroupDefinition> newGroups) {
+        return newGroups.stream()
+                .filter(newGroup -> prevGroupsByInvariantName.containsKey(newGroup.getInvariantName()))
+                .filter(newGroup -> isNotEmpty(newGroup.getProperties()))
+                .collect(toList());
+    }
+
+    private Map<String, GroupDefinition> getVspGroupsMappedByInvariantName(List<GroupDefinition> newGroups) {
+        return newGroups.stream()
+                .filter(GroupDataDefinition::isVspOriginated)
+                .filter(grp -> isNotEmpty(grp.getProperties()))
+                .collect(toMap(GroupDataDefinition::getInvariantName,
+                               group -> group));
+    }
+
+    private ActionStatus updateGroups(Component currentComponent, List<GroupDefinition> groupsToUpdate) {
+        if (isEmpty(groupsToUpdate)) {
+            return ActionStatus.OK;
+        }
+        return groupsOperation.updateGroups(currentComponent, groupsToUpdate, false)
+                .either(updatedGroups -> ActionStatus.OK,
+                        err -> componentsUtils.convertFromStorageResponse(err, currentComponent.getComponentType()));
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/heat/HeatEnvArtifactsMergeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/heat/HeatEnvArtifactsMergeBusinessLogic.java
index 1e1bc862cf..82deee598d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/heat/HeatEnvArtifactsMergeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/heat/HeatEnvArtifactsMergeBusinessLogic.java
@@ -1,15 +1,15 @@
 package org.openecomp.sdc.be.components.merge.heat;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.HeatParameterDefinition;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Created by chaya on 9/14/2017.
  */
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBL.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBL.java
index 96ad87c608..802dc2271f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBL.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBL.java
@@ -1,37 +1,34 @@
 package org.openecomp.sdc.be.components.merge.input;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.sdc.be.components.merge.instance.ComponentsMergeCommand;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.utils.MapUtil;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.springframework.core.annotation.Order;
 
-import fj.data.Either;
-
-@org.springframework.stereotype.Component
-public class ComponentInputsMergeBL implements ComponentsMergeCommand {
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Stream;
 
-    @javax.annotation.Resource
-    private InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic;
+import static java.util.stream.Collectors.toMap;
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.LAST_COMMAND;
+import static org.openecomp.sdc.be.utils.PropertyDefinitionUtils.convertListOfProperties;
 
-    @javax.annotation.Resource
-    private ToscaOperationFacade toscaOperationFacade;
+@org.springframework.stereotype.Component
+@Order(LAST_COMMAND)//must run after all properties values were merged
+public class ComponentInputsMergeBL extends InputsMergeCommand implements VspComponentsMergeCommand {
 
-    @javax.annotation.Resource
-    private ComponentsUtils componentsUtils;
+    public ComponentInputsMergeBL(InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic, DeclaredInputsResolver declaredInputsResolver, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils) {
+        super(inputsValuesMergingBusinessLogic, declaredInputsResolver, toscaOperationFacade, componentsUtils);
+    }
 
     @Override
     public ActionStatus mergeComponents(Component prevComponent, Component currentComponent) {
-        List<InputDefinition> inputsToMerge = currentComponent.getInputs() != null ? currentComponent.getInputs() : new ArrayList<>();
-        return this.mergeAndRedeclareComponentInputs(prevComponent, currentComponent, inputsToMerge);
+        return super.redeclareAndMergeInputsValues(prevComponent, currentComponent);
     }
 
     @Override
@@ -39,35 +36,19 @@ public class ComponentInputsMergeBL implements ComponentsMergeCommand {
         return "merge component inputs";
     }
 
-    public ActionStatus mergeAndRedeclareComponentInputs(Component prevComponent, Component newComponent, List<InputDefinition> inputsToMerge) {
-        mergeInputs(prevComponent, inputsToMerge);
-        List<InputDefinition> previouslyDeclaredInputs = inputsValuesMergingBusinessLogic.getPreviouslyDeclaredInputsToMerge(prevComponent, newComponent);
-        inputsToMerge.addAll(previouslyDeclaredInputs);
-        return updateInputs(newComponent.getUniqueId(), inputsToMerge);
-    }
-
-    public ActionStatus mergeComponentInputs(Component prevComponent, Component newComponent, List<InputDefinition> inputsToMerge) {
-        mergeInputs(prevComponent, inputsToMerge);
-        return updateInputs(newComponent.getUniqueId(), inputsToMerge);
-    }
-
-    public ActionStatus redeclareComponentInputsForInstance(List<InputDefinition> oldInputs, Component newComponent, String instanceId) {
-        List<InputDefinition> previouslyDeclaredInputs = inputsValuesMergingBusinessLogic.getPreviouslyDeclaredInputsToMerge(oldInputs, newComponent, instanceId);
-        return updateInputs(newComponent.getUniqueId(), previouslyDeclaredInputs);
-    }
-
-    private void mergeInputs(Component prevComponent, List<InputDefinition> inputsToMerge) {
-        Map<String, InputDefinition> oldInputsByName = prevComponent.getInputs() == null ? Collections.emptyMap() : MapUtil.toMap(prevComponent.getInputs(), InputDefinition::getName);
-        Map<String, InputDefinition> inputsToMergeByName = MapUtil.toMap(inputsToMerge, InputDefinition::getName);
-        inputsValuesMergingBusinessLogic.mergeComponentInputs(oldInputsByName, inputsToMergeByName);
+    @Override
+    List<InputDefinition> getInputsToMerge(Component component) {
+        return component.safeGetInputs();
     }
 
-    private ActionStatus updateInputs(String containerId, List<InputDefinition> inputsToUpdate) {
-        Either<List<InputDefinition>, StorageOperationStatus> updateInputsEither = toscaOperationFacade.updateInputsToComponent(inputsToUpdate, containerId);
-        if (updateInputsEither.isRight()) {
-            return componentsUtils.convertFromStorageResponse(updateInputsEither.right().value());
-        }
-        return ActionStatus.OK;
+    @Override
+    Map<String, List<PropertyDataDefinition>> getProperties(Component component) {
+        return Stream.of(component.safeGetComponentInstancesProperties(),
+                         component.safeGetComponentInstancesInputs(),
+                         component.safeGetGroupsProperties(),
+                         component.safeGetPolicyProperties())
+                .flatMap(map -> map.entrySet().stream())
+                .collect(toMap(Entry::getKey, entry -> convertListOfProperties(entry.getValue())));
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/DeclaredInputsResolver.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/DeclaredInputsResolver.java
new file mode 100644
index 0000000000..6f60776d2f
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/DeclaredInputsResolver.java
@@ -0,0 +1,111 @@
+package org.openecomp.sdc.be.components.merge.input;
+
+
+import org.openecomp.sdc.be.dao.utils.MapUtil;
+import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.InputDefinition;
+
+import com.google.common.base.Strings;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.openecomp.sdc.be.utils.PropertyDefinitionUtils.resolveGetInputProperties;
+
+@org.springframework.stereotype.Component
+public class DeclaredInputsResolver {
+    /**
+     * @param oldComponent the old state of {@link Component} that is being updated
+     * @param newComponent the new state of {@link Component} that is being updated
+     * @param properties a list of properties
+     * @return a list of all inputs that were previously declared and need to be merged to the updating component
+     * An input needs to merged if a property was declared as an input (by the user) in previous component version and the declared input not exist in new version
+     */
+    List<InputDefinition> getPreviouslyDeclaredInputsToMerge(Component oldComponent, Component newComponent, Map<String, List<PropertyDataDefinition>> properties) {
+        List<InputDefinition> oldInputs = oldComponent.safeGetInputs();
+        return getPreviouslyDeclaredInputsToMerge(oldInputs, newComponent, properties);
+    }
+
+    public List<InputDefinition> getPreviouslyDeclaredInputsToMerge(List<InputDefinition> oldInputs, Component newComponent, Map<String, List<PropertyDataDefinition>> properties) {
+        Map<String, List<PropertyDataDefinition>> getInputProperties = resolveGetInputProperties(properties);
+        List<RedeclareInputData> inputsToRedeclareData = buildRedeclareInputData(newComponent, getInputProperties);
+        return findPrevDeclaredInputs(oldInputs, inputsToRedeclareData);
+    }
+
+    private List<RedeclareInputData> buildRedeclareInputData(Component newComponent, Map<String, List<PropertyDataDefinition>> getInputProperties) {
+        Map<String, InputDefinition> inputsById = MapUtil.toMap(newComponent.getInputs(), InputDefinition::getUniqueId);
+        List<RedeclareInputData> redeclareInputData = new ArrayList<>();
+        getInputProperties.forEach((instanceId, getInputProps) -> redeclareInputData.addAll(findInputsToRedeclare(inputsById, instanceId, getInputProps)));
+        return redeclareInputData;
+
+    }
+
+    private List<InputDefinition> findPrevDeclaredInputs(List<InputDefinition> oldInputs, List<RedeclareInputData> inputsToRedeclareData) {
+        Map<String, InputDefinition> oldInputsById = MapUtil.toMap(oldInputs, InputDefinition::getUniqueId);
+        List<InputDefinition> inputsToRedeclare = new ArrayList<>();
+        inputsToRedeclareData.forEach(redeclareInputData -> {
+            List<InputDefinition> inputDefinitions = prepareInputsForRedeclaration(oldInputsById, redeclareInputData);
+            inputsToRedeclare.addAll(inputDefinitions);
+        });
+        return inputsToRedeclare;
+    }
+
+    private List<RedeclareInputData> findInputsToRedeclare(Map<String, InputDefinition> inputsById, String instanceId, List<PropertyDataDefinition> getInputProps) {
+        List<RedeclareInputData> redeclareInputDataList = new ArrayList<>();
+        getInputProps.forEach(property -> {
+            List<String> inputsToRedeclareIds = findInputsToRedeclareIds(inputsById, property);
+            RedeclareInputData redeclareInputData = new RedeclareInputData(property.getUniqueId(), inputsToRedeclareIds, instanceId, property.getDefaultValue());
+            redeclareInputDataList.add(redeclareInputData);
+        });
+        return redeclareInputDataList;
+    }
+
+    private List<InputDefinition> prepareInputsForRedeclaration(Map<String, InputDefinition> oldInputsById, RedeclareInputData redeclareInputData) {
+        List<InputDefinition> inputsForRedeclaration = redeclareInputData.declaredInputIds.stream()
+                                            .map(oldInputsById::get)
+                                            .map(InputDefinition::new)
+                                            .collect(Collectors.toList());
+        
+        inputsForRedeclaration.forEach(input -> {
+            input.setPropertyId(redeclareInputData.propertyId);
+            input.setInstanceUniqueId(redeclareInputData.propertyOwnerId);
+            
+            if(!Strings.isNullOrEmpty(redeclareInputData.value)) {
+                input.setValue(redeclareInputData.value);
+                input.setDefaultValue(redeclareInputData.value);
+            }
+        });
+        return inputsForRedeclaration;
+    }
+
+    private List<String> findInputsToRedeclareIds(Map<String, InputDefinition> inputsById, PropertyDataDefinition property) {
+        List<GetInputValueDataDefinition> getInputValues = property.getGetInputValues();
+        return getInputValues.stream()
+                .filter(getInputVal -> isGetInputValueHasNoCorrespondingInput(getInputVal, inputsById))
+                .map(GetInputValueDataDefinition::getInputId)
+                .collect(Collectors.toList());
+    }
+
+    private boolean isGetInputValueHasNoCorrespondingInput(GetInputValueDataDefinition getInputVal, Map<String, InputDefinition> inputsById) {
+        return !inputsById.containsKey(getInputVal.getInputId());
+    }
+
+    private class RedeclareInputData {
+        private String propertyId;
+        private List<String> declaredInputIds;
+        private String propertyOwnerId;
+        private String value;
+
+        RedeclareInputData(String propertyId, List<String> declaredInputIds, String propertyOwnerId, String value) {
+            this.propertyId = propertyId;
+            this.declaredInputIds = declaredInputIds;
+            this.propertyOwnerId = propertyOwnerId;
+            this.value = value;
+        }
+
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/GlobalInputsMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/GlobalInputsMergeCommand.java
new file mode 100644
index 0000000000..66e8dc4ee0
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/GlobalInputsMergeCommand.java
@@ -0,0 +1,57 @@
+package org.openecomp.sdc.be.components.merge.input;
+
+import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
+import org.openecomp.sdc.be.components.merge.ComponentsGlobalMergeCommand;
+import org.openecomp.sdc.be.components.merge.GlobalInputsFilteringBusinessLogic;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.springframework.core.annotation.Order;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static java.util.stream.Collectors.toMap;
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.LAST_COMMAND;
+import static org.openecomp.sdc.be.utils.PropertyDefinitionUtils.convertListOfProperties;
+
+@org.springframework.stereotype.Component
+@Order(LAST_COMMAND)
+public class GlobalInputsMergeCommand extends InputsMergeCommand implements ComponentsGlobalMergeCommand {
+
+    private GlobalInputsFilteringBusinessLogic globalInputsFilteringBusinessLogic;
+    private ExceptionUtils exceptionUtils;
+
+    public GlobalInputsMergeCommand(InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic, DeclaredInputsResolver declaredInputsResolver, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, GlobalInputsFilteringBusinessLogic globalInputsFilteringBusinessLogic, ExceptionUtils exceptionUtils) {
+        super(inputsValuesMergingBusinessLogic, declaredInputsResolver, toscaOperationFacade, componentsUtils);
+        this.globalInputsFilteringBusinessLogic = globalInputsFilteringBusinessLogic;
+        this.exceptionUtils = exceptionUtils;
+    }
+
+    @Override
+    public ActionStatus mergeComponents(Component prevComponent, Component currentComponent) {
+        return super.redeclareAndMergeInputsValues(prevComponent, currentComponent);
+    }
+
+    @Override
+    public String description() {
+        return "merge global (non vsp) inputs";
+    }
+
+    @Override
+    List<InputDefinition> getInputsToMerge(Component component) {
+        return globalInputsFilteringBusinessLogic.filterGlobalInputs(component).left().on(err -> exceptionUtils.rollBackAndThrow(err));
+    }
+
+    @Override
+    Map<String, List<PropertyDataDefinition>> getProperties(Component component) {
+        return Stream.of(component.safeGetGroupsProperties(), component.safeGetPolicyProperties())
+                .flatMap(map -> map.entrySet().stream())
+                .collect(toMap(Map.Entry::getKey, entry -> convertListOfProperties(entry.getValue())));
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/InputsMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/InputsMergeCommand.java
new file mode 100644
index 0000000000..3cf4c0df65
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/InputsMergeCommand.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.components.merge.input;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.emptyList;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+
+public abstract class InputsMergeCommand {
+
+    private static final Logger log = Logger.getLogger(InputsMergeCommand.class);
+
+    private InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic;
+    private DeclaredInputsResolver declaredInputsResolver;
+    private ToscaOperationFacade toscaOperationFacade;
+    private ComponentsUtils componentsUtils;
+
+    public InputsMergeCommand(InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic, DeclaredInputsResolver declaredInputsResolver, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils) {
+        this.inputsValuesMergingBusinessLogic = inputsValuesMergingBusinessLogic;
+        this.declaredInputsResolver = declaredInputsResolver;
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+    }
+
+    abstract List<InputDefinition> getInputsToMerge(Component component);
+
+    abstract Map<String, List<PropertyDataDefinition>> getProperties(Component component);
+
+    ActionStatus redeclareAndMergeInputsValues(Component prevComponent, Component currComponent) {
+        if (prevComponent == null || isEmpty(prevComponent.getInputs())) {
+            return ActionStatus.OK;
+        }
+        List<InputDefinition> mergedInputs = mergeInputsValues(prevComponent, currComponent);
+        List<InputDefinition> previouslyDeclaredInputsToMerge = getPreviouslyDeclaredInputsToMerge(prevComponent, currComponent);
+        mergedInputs.addAll(previouslyDeclaredInputsToMerge);
+        return updateInputs(currComponent.getUniqueId(), mergedInputs);
+    }
+
+    private List<InputDefinition> mergeInputsValues(Component prevComponent, Component currComponent) {
+        log.debug("#mergeInputsValues - merge inputs values from previous component {} to current component {}", prevComponent.getUniqueId(), currComponent.getUniqueId());
+        List<InputDefinition> inputsToMerge = getInputsToMerge(currComponent);
+        List<InputDefinition> prevInputs = prevComponent.safeGetInputs();
+        inputsValuesMergingBusinessLogic.mergeComponentInputs(prevInputs, inputsToMerge);
+        return inputsToMerge;
+    }
+
+    private List<InputDefinition> getPreviouslyDeclaredInputsToMerge(Component prevComponent, Component currComponent) {
+        log.debug("#getPreviouslyDeclaredInputsToMerge - getting inputs that were previously declared from previous component {} and setting on current component {}", prevComponent.getUniqueId(), currComponent.getUniqueId());
+        if (isEmpty(prevComponent.getInputs())) {
+            return emptyList();
+        }
+        Map<String, List<PropertyDataDefinition>> props = getProperties(currComponent);
+        return declaredInputsResolver.getPreviouslyDeclaredInputsToMerge(prevComponent, currComponent, props);
+    }
+
+    private ActionStatus updateInputs(String containerId, List<InputDefinition> inputsToUpdate) {
+        log.debug("#updateInputs - updating inputs for container {}", containerId);
+        return toscaOperationFacade.updateInputsToComponent(inputsToUpdate, containerId)
+                .either(updatedInputs -> ActionStatus.OK,
+                        componentsUtils::convertFromStorageResponse);
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/InputsValuesMergingBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/InputsValuesMergingBusinessLogic.java
index e49d2b2c87..6565e96c9a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/InputsValuesMergingBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/InputsValuesMergingBusinessLogic.java
@@ -1,24 +1,27 @@
 package org.openecomp.sdc.be.components.merge.input;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
-import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.InputDefinition;
 
+import java.util.List;
 @org.springframework.stereotype.Component
 public class InputsValuesMergingBusinessLogic {
 
     /**
      * Merge old inputs values into the updated inputs
+     */
+    public void mergeComponentInputs(List<InputDefinition> oldInputs, List<InputDefinition> inputsToMerge) {
+        Map<String, InputDefinition> oldInputsByName =  MapUtil.toMap(oldInputs, InputDefinition::getName);
+        Map<String, InputDefinition> inputsToMergeByName = MapUtil.toMap(inputsToMerge, InputDefinition::getName);
+        mergeComponentInputs(oldInputsByName, inputsToMergeByName);
+    }
+    
+    /**
+     * Merge old inputs values into the updated inputs
      * An input value is merged if the input previous version had a user defined value and its value is empty in current version
      * @param oldInputs the currently persisted inputs mapped by their names
      * @param updatedInputs the currently being update inputs mapped by their names
@@ -27,74 +30,6 @@ public class InputsValuesMergingBusinessLogic {
         updatedInputs.forEach((inputName, input) -> mergeInputsValues(oldInputs.get(inputName), input));
     }
 
-    /**
-     * @param oldComponent the old state of {@link Component} that is being updated
-     * @param newComponent the new state of {@link Component} that is being updated
-     * @return a list of all inputs that were previously declared and need to be merged to the updating component
-     * An input needs to merged if a property was declared as an input (by the user) in previous component version and the declared input not exist in new version
-     */
-    public List<InputDefinition> getPreviouslyDeclaredInputsToMerge(Component oldComponent, Component newComponent) {
-        if (oldComponent == null || oldComponent.getInputs() == null || newComponent == null ) {
-            return Collections.emptyList();
-        }
-        Map<String, List<PropertyDataDefinition>> getInputProperties = getAllGetInputPropertyData(newComponent);
-        List<RedeclareInputData> inputsToRedeclareData = buildRedeclareInputData(newComponent, getInputProperties);
-        return findPrevDeclaredInputs(oldComponent.getInputs(), inputsToRedeclareData);
-    }
-
-    /**
-     * @param oldInputs list of previous inputs to find inputs to redeclare from
-     * @param newComponent the new state of {@link Component} that is being updated
-     * @param instanceId instance id
-     * @return a list of all inputs that were previously declared and need to be merged to the updating component
-     * An input needs to merged if an instance property was declared as an input (by the user) in previous component version and the declared input not exist in new version
-     */
-    public List<InputDefinition> getPreviouslyDeclaredInputsToMerge(List<InputDefinition> oldInputs, Component newComponent, String instanceId) {
-        if (oldInputs == null || newComponent == null ) {
-            return Collections.emptyList();
-        }
-        Map<String, List<PropertyDataDefinition>> getInputProperties = getAllGetInputPropertyData(newComponent, instanceId);
-        List<RedeclareInputData> inputsToRedeclareData = buildRedeclareInputData(newComponent, getInputProperties);
-        return findPrevDeclaredInputs(oldInputs, inputsToRedeclareData);
-    }
-
-    private List<InputDefinition> findPrevDeclaredInputs(List<InputDefinition> oldInputs, List<RedeclareInputData> inputsToRedeclareData) {
-        Map<String, InputDefinition> oldInputsById = MapUtil.toMap(oldInputs, InputDefinition::getUniqueId);
-        List<InputDefinition> inputsToRedeclare = new ArrayList<>();
-        inputsToRedeclareData.forEach(redeclareInputData -> {
-            List<InputDefinition> inputDefinitions = prepareInputsForRedeclaration(oldInputsById, redeclareInputData);
-            inputsToRedeclare.addAll(inputDefinitions);
-        });
-        return inputsToRedeclare;
-    }
-
-    private List<InputDefinition> prepareInputsForRedeclaration(Map<String, InputDefinition> oldInputsById, RedeclareInputData redeclareInputData) {
-        List<InputDefinition> inputsForRedeclaration = redeclareInputData.declaredInputIds.stream().map(oldInputsById::get).collect(Collectors.toList());
-        inputsForRedeclaration.forEach(input -> {
-            input.setPropertyId(redeclareInputData.propertyId);
-            input.setInstanceUniqueId(redeclareInputData.instanceId);
-        });
-        return inputsForRedeclaration;
-    }
-
-    private <T extends PropertyDataDefinition> Map<String, List<PropertyDataDefinition>> findGetInputPropsDefinitions(Map<String, List<T>> instancesPropDefinitions) {
-        Map<String, List<PropertyDataDefinition>> getInputProps = new HashMap<>();
-        if (instancesPropDefinitions == null) {
-            return getInputProps;
-        }
-        return instancesPropDefinitions.entrySet()
-                .stream()
-                .collect(Collectors.toMap(Map.Entry::getKey,
-                        entry -> this.filterGetInputProps(entry.getValue())));
-    }
-
-    private <T extends PropertyDataDefinition> List<PropertyDataDefinition> filterGetInputProps(List<T> propDefinitions) {
-        return propDefinitions
-                .stream()
-                .filter(PropertyDataDefinition::isGetInputProperty)
-                .collect(Collectors.toList());
-    }
-
     private void mergeInputsValues(InputDefinition oldInput, InputDefinition updatedInput) {
         if (shouldMergeOldValue(oldInput, updatedInput)) {
             updatedInput.setDefaultValue(oldInput.getDefaultValue());
@@ -117,64 +52,5 @@ public class InputsValuesMergingBusinessLogic {
         return input != null && !isEmptyDefaultValue(input);
     }
 
-    private List<RedeclareInputData> buildRedeclareInputData(Component newComponent, Map<String, List<PropertyDataDefinition>> getInputProperties) {
-        Map<String, InputDefinition> inputsById = MapUtil.toMap(newComponent.getInputs(), InputDefinition::getUniqueId);
-        List<RedeclareInputData> redeclareInputData = new ArrayList<>();
-        getInputProperties.forEach((instanceId, getInputProps) ->  {
-            redeclareInputData.addAll(findInputsToRedeclare(inputsById, instanceId, getInputProps));
-        });
-        return redeclareInputData;
-
-    }
-
-    private Map<String, List<PropertyDataDefinition>> getAllGetInputPropertyData(Component newComponent) {
-        Map<String, List<PropertyDataDefinition>> getInputInstanceProps = findGetInputPropsDefinitions(newComponent.getComponentInstancesProperties());
-        Map<String, List<PropertyDataDefinition>> getInputInstanceInputs = findGetInputPropsDefinitions(newComponent.getComponentInstancesInputs());
-        getInputInstanceInputs.putAll(getInputInstanceProps);
-        return getInputInstanceInputs;
-    }
-
-    private Map<String, List<PropertyDataDefinition>> getAllGetInputPropertyData(Component newComponent, String instanceId) {
-        List<PropertyDataDefinition> getInputInstanceProps = this.filterGetInputProps(newComponent.safeGetComponentInstanceProperties(instanceId));
-        List<PropertyDataDefinition> getInputInstanceInputs = this.filterGetInputProps(newComponent.safeGetComponentInstanceInput(instanceId));
-        getInputInstanceInputs.addAll(getInputInstanceProps);
-        return Collections.singletonMap(instanceId, getInputInstanceInputs);
-    }
-
-    private List<RedeclareInputData> findInputsToRedeclare(Map<String, InputDefinition> inputsById, String instanceId, List<PropertyDataDefinition> getInputProps) {
-        List<RedeclareInputData> redeclareInputDataList = new ArrayList<>();
-        getInputProps.forEach(property -> {
-            List<String> inputsToRedeclareIds = findInputsToRedeclareIds(inputsById, property);
-            RedeclareInputData redeclareInputData = new RedeclareInputData(property.getUniqueId(), inputsToRedeclareIds, instanceId);
-            redeclareInputDataList.add(redeclareInputData);
-        });
-        return redeclareInputDataList;
-    }
-
-    private List<String> findInputsToRedeclareIds(Map<String, InputDefinition> inputsById, PropertyDataDefinition property) {
-        List<GetInputValueDataDefinition> getInputValues = property.getGetInputValues();
-        return getInputValues.stream()
-                .filter(getInputVal -> getInputValueWithNoCorrespondingInput(getInputVal, inputsById))
-                .map(GetInputValueDataDefinition::getInputId)
-                .collect(Collectors.toList());
-    }
-
-    private boolean getInputValueWithNoCorrespondingInput(GetInputValueDataDefinition getInputVal, Map<String, InputDefinition> inputsById) {
-        return !inputsById.containsKey(getInputVal.getInputId());
-    }
-
-    private class RedeclareInputData {
-        private String propertyId;
-        private List<String> declaredInputIds;
-        private String instanceId;
-
-        public RedeclareInputData(String propertyId, List<String> declaredInputIds, String instanceId) {
-            this.propertyId = propertyId;
-            this.declaredInputIds = declaredInputIds;
-            this.instanceId = instanceId;
-        }
-
-    }
-
 
 }
\ No newline at end of file
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBL.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBL.java
index caf73187e1..7863243765 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBL.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentCapabilitiesPropertiesMergeBL.java
@@ -1,9 +1,8 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
 import org.openecomp.sdc.be.components.merge.capability.CapabilityResolver;
 import org.openecomp.sdc.be.components.merge.property.DataDefinitionsValuesMergingBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -15,20 +14,24 @@ import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.core.annotation.Order;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Map;
+
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.ANY_ORDER_COMMAND;
 
 @org.springframework.stereotype.Component
-public class ComponentCapabilitiesPropertiesMergeBL implements ComponentsMergeCommand {
+@Order(ANY_ORDER_COMMAND)
+public class ComponentCapabilitiesPropertiesMergeBL implements VspComponentsMergeCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ComponentCapabilitiesPropertiesMergeBL.class);
+    private static final Logger log = Logger.getLogger(ComponentCapabilitiesPropertiesMergeBL.class);
 
-    private DataDefinitionsValuesMergingBusinessLogic dataDefinitionsValuesMergingBusinessLogic;
-    private ToscaOperationFacade toscaOperationFacade;
-    private ComponentsUtils componentsUtils;
-    private CapabilityResolver capabilityResolver;
+    private final DataDefinitionsValuesMergingBusinessLogic dataDefinitionsValuesMergingBusinessLogic;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final CapabilityResolver capabilityResolver;
 
     public ComponentCapabilitiesPropertiesMergeBL(DataDefinitionsValuesMergingBusinessLogic dataDefinitionsValuesMergingBusinessLogic, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, CapabilityResolver capabilityResolver) {
         this.dataDefinitionsValuesMergingBusinessLogic = dataDefinitionsValuesMergingBusinessLogic;
@@ -95,7 +98,7 @@ public class ComponentCapabilitiesPropertiesMergeBL implements ComponentsMergeCo
         return toscaOperationFacade.getToscaElement(cmptId, propertiesCapabilitiesFilter)
                 .right()
                 .map(err -> {
-                   LOGGER.debug("failed to fetch cmpt {} with properties capabilities. status: {}", cmptId, err);
+                   log.debug("failed to fetch cmpt {} with properties capabilities. status: {}", cmptId, err);
                    return err;
                 });
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMerge.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMerge.java
index 83f36adf62..f6de767ed4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMerge.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceArtifactsMerge.java
@@ -1,22 +1,17 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * Created by chaya on 9/20/2017.
@@ -37,7 +32,7 @@ public class ComponentInstanceArtifactsMerge implements ComponentInstanceMergeIn
         Map<String, ArtifactDefinition> deploymentArtifactsCreatedOnTheInstance = componentInstancesDeploymentArtifacts.entrySet()
                 .stream()
                 .filter(i -> !originalComponentDeploymentArtifacts.containsKey(i.getKey()))
-                .collect(Collectors.toMap(p -> p.getKey(), p -> p.getValue()));
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 
         dataHolder.setOrigComponentDeploymentArtifactsCreatedOnTheInstance(deploymentArtifactsCreatedOnTheInstance);
 
@@ -46,7 +41,7 @@ public class ComponentInstanceArtifactsMerge implements ComponentInstanceMergeIn
         Map<String, ArtifactDefinition> informationalArtifactsCreatedOnTheInstance = componentInstancesInformationalArtifacts.entrySet()
                 .stream()
                 .filter(i -> !originalComponentInformationalArtifacts.containsKey(i.getKey()))
-                .collect(Collectors.toMap(p -> p.getKey(), p -> p.getValue()));
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         dataHolder.setOrigComponentInformationalArtifactsCreatedOnTheInstance(informationalArtifactsCreatedOnTheInstance);
     }
 
@@ -60,12 +55,12 @@ public class ComponentInstanceArtifactsMerge implements ComponentInstanceMergeIn
         Map<String, ArtifactDefinition> currentInstanceDeploymentArtifacts = updatedContainerComponent.safeGetComponentInstanceDeploymentArtifacts(newInstanceId);
         Map<String, ArtifactDefinition> filteredDeploymentArtifactsToAdd = Optional.ofNullable(origInstanceDeploymentArtifactsCreatedOnTheInstance).orElse(new HashMap<>()).entrySet().stream()
                 .filter(artifact -> noArtifactWithTheSameLabel(artifact.getValue().getArtifactLabel(), currentInstanceDeploymentArtifacts))
-                .collect(Collectors.toMap(p -> p.getKey(), q -> q.getValue()));
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         Map<String, ArtifactDefinition> origInstanceInformationalArtifactsCreatedOnTheInstance = dataHolder.getOrigComponentInformationalArtifactsCreatedOnTheInstance();
         Map<String, ArtifactDefinition> currentInstanceInformationalArtifacts = updatedContainerComponent.safeGetComponentInstanceInformationalArtifacts(newInstanceId);
         Map<String, ArtifactDefinition> filteredInformationalArtifactsToAdd = Optional.ofNullable(origInstanceInformationalArtifactsCreatedOnTheInstance).orElse(new HashMap<>()).entrySet().stream()
                 .filter(artifact -> noArtifactWithTheSameLabel(artifact.getValue().getArtifactLabel(), currentInstanceInformationalArtifacts))
-                .collect(Collectors.toMap(p -> p.getKey(), q -> q.getValue()));
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         Map<String, ArtifactDefinition> allFilteredArtifactsToAdd = new HashMap<>();
         allFilteredArtifactsToAdd.putAll(filteredDeploymentArtifactsToAdd);
         allFilteredArtifactsToAdd.putAll(filteredInformationalArtifactsToAdd);
@@ -89,7 +84,6 @@ public class ComponentInstanceArtifactsMerge implements ComponentInstanceMergeIn
             if (uploadArtifactToService.isRight()) {
                 return Either.right(uploadArtifactToService.right().value());
             }
-            toscaOperationFacade.commit();
         }
         return Either.left(updatedContainerComponent);
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabiliteisPropertiesMerge.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabilitiesPropertiesMerge.java
index b43e263580..e528147fbb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabiliteisPropertiesMerge.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceCapabilitiesPropertiesMerge.java
@@ -1,12 +1,6 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import static org.apache.commons.collections.MapUtils.isNotEmpty;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
@@ -15,15 +9,20 @@ import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.exception.ResponseFormat;
 
-import fj.data.Either;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
 
 @org.springframework.stereotype.Component
-public class ComponentInstanceCapabiliteisPropertiesMerge implements ComponentInstanceMergeInterface {
+public class ComponentInstanceCapabilitiesPropertiesMerge implements ComponentInstanceMergeInterface {
 
     private ComponentCapabilitiesPropertiesMergeBL capabilitiesPropertiesMergeBL;
     private ComponentsUtils componentsUtils;
 
-    public ComponentInstanceCapabiliteisPropertiesMerge(ComponentCapabilitiesPropertiesMergeBL capabilitiesPropertiesMergeBL, ComponentsUtils componentsUtils) {
+    public ComponentInstanceCapabilitiesPropertiesMerge(ComponentCapabilitiesPropertiesMergeBL capabilitiesPropertiesMergeBL, ComponentsUtils componentsUtils) {
         this.capabilitiesPropertiesMergeBL = capabilitiesPropertiesMergeBL;
         this.componentsUtils = componentsUtils;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceForwardingPathMerge.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceForwardingPathMerge.java
index 5824b43bf7..13e85085d6 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceForwardingPathMerge.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceForwardingPathMerge.java
@@ -1,36 +1,26 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.ForwardingPathUtils;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @org.springframework.stereotype.Component
 public class ComponentInstanceForwardingPathMerge implements ComponentInstanceMergeInterface {
 
-    private static Logger log = LoggerFactory.getLogger(ComponentInstanceForwardingPathMerge.class);
+    private static Logger log = Logger.getLogger(ComponentInstanceForwardingPathMerge.class);
 
     @Autowired
     private ServiceBusinessLogic serviceBusinessLogic;
@@ -46,7 +36,7 @@ public class ComponentInstanceForwardingPathMerge implements ComponentInstanceMe
         ComponentInstance currentResourceInstance, Component originComponent) {
         dataHolder.setOrigInstanceCapabilities(getAllInstanceCapabilities(currentResourceInstance));
         dataHolder.setOrigInstanceNode(originComponent);
-        dataHolder.setOrigComponentInstId(currentResourceInstance.getUniqueId());
+        dataHolder.setOrigComponentInstId(currentResourceInstance.getName());
     }
 
     @Override
@@ -108,6 +98,9 @@ public class ComponentInstanceForwardingPathMerge implements ComponentInstanceMe
 
 
     private List<CapabilityDefinition> getAllInstanceCapabilities(ComponentInstance currentResourceInstance) {
+        if(currentResourceInstance.getCapabilities() == null || currentResourceInstance.getCapabilities().isEmpty()){
+            return Collections.EMPTY_LIST;
+        }
         return currentResourceInstance.getCapabilities().values().stream().flatMap(Collection::stream)
             .collect(Collectors.toList());
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceHeatEnvMerge.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceHeatEnvMerge.java
index f66eaa8061..32919d9602 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceHeatEnvMerge.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceHeatEnvMerge.java
@@ -1,23 +1,17 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
 import org.openecomp.sdc.be.components.merge.heat.HeatEnvArtifactsMergeBusinessLogic;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by chaya on 9/20/2017.
@@ -25,7 +19,7 @@ import fj.data.Either;
 @org.springframework.stereotype.Component("ComponentInstanceHeatEnvMerge")
 public class ComponentInstanceHeatEnvMerge implements ComponentInstanceMergeInterface {
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentInstanceHeatEnvMerge.class);
+    private static final Logger log = Logger.getLogger(ComponentInstanceHeatEnvMerge.class);
 
     @Autowired
     private ArtifactsBusinessLogic artifactsBusinessLogic;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInputsMergeBL.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInputsMergeBL.java
index c2332055ab..037ab86368 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInputsMergeBL.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInputsMergeBL.java
@@ -1,9 +1,7 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
 import org.openecomp.sdc.be.components.merge.property.DataDefinitionsValuesMergingBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
@@ -13,20 +11,28 @@ import org.openecomp.sdc.be.model.ComponentInstanceInput;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.springframework.core.annotation.Order;
 
-import fj.data.Either;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
-@org.springframework.stereotype.Component
-public class ComponentInstanceInputsMergeBL implements ComponentsMergeCommand {
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.ANY_ORDER_COMMAND;
 
-    @javax.annotation.Resource
-    private ToscaOperationFacade toscaOperationFacade;
+@org.springframework.stereotype.Component
+@Order(ANY_ORDER_COMMAND)
+public class ComponentInstanceInputsMergeBL implements VspComponentsMergeCommand {
 
-    @javax.annotation.Resource
-    private ComponentsUtils componentsUtils;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic;
 
-    @javax.annotation.Resource
-    private DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic;
+    public ComponentInstanceInputsMergeBL(ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic) {
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+        this.propertyValuesMergingBusinessLogic = propertyValuesMergingBusinessLogic;
+    }
 
     @Override
     public ActionStatus mergeComponents(Component prevComponent, Component currentComponent) {
@@ -44,12 +50,30 @@ public class ComponentInstanceInputsMergeBL implements ComponentsMergeCommand {
     }
 
     public ActionStatus mergeComponentInstanceInputs(List<ComponentInstanceInput> oldInstProps, List<InputDefinition> oldInputs, Component newComponent, String instanceId) {
-        List<ComponentInstanceInput> newInstInput = newComponent.safeGetComponentInstanceInput(instanceId);
-        if (newInstInput == null) {
+        List<ComponentInstanceInput> newInstInputs = newComponent.safeGetComponentInstanceInput(instanceId);
+        if (newInstInputs == null) {
             return ActionStatus.OK;
         }
-        propertyValuesMergingBusinessLogic.mergeInstanceDataDefinitions(oldInstProps, oldInputs, newInstInput, newComponent.getInputs());
-        return updateComponentInstanceInputs(newComponent, instanceId, newInstInput);
+        
+        List<ComponentInstanceInput> oldRedeclaredInputs = findComponentInputs(oldInstProps);
+        oldRedeclaredInputs.forEach(oldInput -> newInstInputs.stream()
+                                                              .filter(newInstInput -> oldInput.getName().equals(newInstInput.getName()))
+                                                              .forEach(this::switchValues));
+        
+        propertyValuesMergingBusinessLogic.mergeInstanceDataDefinitions(oldInstProps, oldInputs, newInstInputs, newComponent.getInputs());
+        return updateComponentInstanceInputs(newComponent, instanceId, newInstInputs);
+    }
+    
+    private void switchValues(ComponentInstanceInput input) {
+        String tempDefaultValue = input.getDefaultValue();
+        input.setDefaultValue(input.getValue());
+        input.setValue(tempDefaultValue);
+    }
+    
+    private List<ComponentInstanceInput> findComponentInputs(List<ComponentInstanceInput> oldInstProps) {
+        return oldInstProps.stream()
+                           .filter(ComponentInstanceInput::isGetInputProperty)
+                           .collect(Collectors.toList());
     }
 
     private ActionStatus updateComponentInstanceInputs(Component newComponent, String instanceId, List<ComponentInstanceInput> newInstInput) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInputsRedeclareHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInputsRedeclareHandler.java
new file mode 100644
index 0000000000..f3312398e1
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceInputsRedeclareHandler.java
@@ -0,0 +1,84 @@
+package org.openecomp.sdc.be.components.merge.instance;
+
+import org.openecomp.sdc.be.components.merge.input.DeclaredInputsResolver;
+import org.openecomp.sdc.be.components.merge.input.InputsValuesMergingBusinessLogic;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.utils.MapUtil;
+import org.openecomp.sdc.be.datatypes.elements.Annotation;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.utils.ComponentUtilities;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static java.util.Collections.singletonMap;
+import static java.util.stream.Collectors.toList;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.openecomp.sdc.be.dao.utils.MapUtil.toMap;
+
+@org.springframework.stereotype.Component
+public class ComponentInstanceInputsRedeclareHandler {
+
+    private static final Logger log = Logger.getLogger(ComponentInstanceInputsRedeclareHandler.class);
+    private final DeclaredInputsResolver declaredInputsResolver;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic;
+    
+    public ComponentInstanceInputsRedeclareHandler(DeclaredInputsResolver declaredInputsResolver, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic) {
+        this.declaredInputsResolver = declaredInputsResolver;
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+        this.inputsValuesMergingBusinessLogic = inputsValuesMergingBusinessLogic;
+    }
+
+    ActionStatus redeclareComponentInputsForInstance(Component container, String newInstanceId, Component newInstanceOriginType, List<InputDefinition> oldInputs) {
+        log.debug("#redeclareComponentInputsForInstance - getting inputs that were previously declared from instance {} and setting on current component {}", newInstanceId, container.getUniqueId());
+        Map<String, List<PropertyDataDefinition>> allPropertiesForInstance = getAllGetPropertiesForInstance(container, newInstanceId);
+        List<InputDefinition> previouslyDeclaredInputs = declaredInputsResolver.getPreviouslyDeclaredInputsToMerge(oldInputs, container, allPropertiesForInstance);
+        inputsValuesMergingBusinessLogic.mergeComponentInputs(oldInputs, previouslyDeclaredInputs);
+        updateInputsAnnotations(allPropertiesForInstance.get(newInstanceId), newInstanceOriginType, previouslyDeclaredInputs);
+
+        return updateInputs(container.getUniqueId(), previouslyDeclaredInputs);
+    }
+
+    private void updateInputsAnnotations(List<PropertyDataDefinition> instanceProps, Component newInstanceOriginType, List<InputDefinition> previouslyDeclaredInputs) {
+        Map<String, PropertyDataDefinition> instancePropsById = toMap(instanceProps, PropertyDataDefinition::getUniqueId);
+        for (InputDefinition input : previouslyDeclaredInputs) {
+            List<Annotation> originPropInputAnnotations = getAnnotationsFromOriginType(newInstanceOriginType, input.getPropertyId(), instancePropsById);
+            if(!isEmpty(originPropInputAnnotations)){
+                input.setAnnotations(originPropInputAnnotations);
+            }
+        }
+    }
+
+    private List<Annotation> getAnnotationsFromOriginType(Component originType, String propertyId, Map<String, PropertyDataDefinition> instancePropsById) {
+        PropertyDataDefinition instanceProp = instancePropsById.get(propertyId);
+        String originPropInputName = instanceProp.getName();
+        return ComponentUtilities.getInputAnnotations(originType, originPropInputName);
+    }
+
+    private Map<String, List<PropertyDataDefinition>> getAllGetPropertiesForInstance(Component newComponent, String instanceId) {
+        List<PropertyDataDefinition> allInstanceProps = Stream.of(newComponent.safeGetComponentInstanceProperties(instanceId),
+                newComponent.safeGetComponentInstanceInput(instanceId))
+                .flatMap(Collection::stream)
+                .map(PropertyDataDefinition::new)
+                .collect(toList());
+        return singletonMap(instanceId, allInstanceProps);
+    }
+
+    private ActionStatus updateInputs(String containerId, List<InputDefinition> inputsToUpdate) {
+        log.debug("#updateInputs - updating inputs for container {}", containerId);
+        return toscaOperationFacade.updateInputsToComponent(inputsToUpdate, containerId)
+                .either(updatedInputs -> ActionStatus.OK,
+                        componentsUtils::convertFromStorageResponse);
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeDataBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeDataBusinessLogic.java
index 111b1b3738..81e2f4ce7b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeDataBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeDataBusinessLogic.java
@@ -1,7 +1,7 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.List;
-
+import fj.data.Either;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Component;
@@ -10,19 +10,18 @@ import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.List;
 /**
  * Created by chaya on 9/12/2017.
  */
 @org.springframework.stereotype.Component("componentInstanceMergeDataBusinessLogic")
 public class ComponentInstanceMergeDataBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentInstanceMergeDataBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ComponentInstanceMergeDataBusinessLogic.class);
 
     @Autowired
     private List<ComponentInstanceMergeInterface> componentInstancesMergeBLs;
@@ -70,9 +69,13 @@ public class ComponentInstanceMergeDataBusinessLogic {
         Component updatedContainerComponent = componentWithInstancesInputsAndProperties.left().value();
 
         for (ComponentInstanceMergeInterface compInstMergeBL: componentInstancesMergeBLs) {
-            Either<Component, ResponseFormat> compInstanceMergeEither = compInstMergeBL.mergeDataAfterCreate(user, dataHolder, updatedContainerComponent, newInstanceId);
-            if (compInstanceMergeEither.isRight()) {
-                return Either.right(compInstanceMergeEither.right().value());
+            try {
+                Either<Component, ResponseFormat> compInstanceMergeEither = compInstMergeBL.mergeDataAfterCreate(user, dataHolder, updatedContainerComponent, newInstanceId);
+                if (compInstanceMergeEither.isRight()) {
+                    return Either.right(compInstanceMergeEither.right().value());
+                }
+            } catch (ComponentException e) {
+                return Either.right(componentsUtils.getResponseFormat(e));
             }
         }
 
@@ -83,6 +86,7 @@ public class ComponentInstanceMergeDataBusinessLogic {
         ComponentParametersView filter = new ComponentParametersView(true);
         filter.setIgnoreComponentInstances(false);
         filter.setIgnoreComponentInstancesInputs(false);
+        filter.setIgnoreInputs(false);//dr
         filter.setIgnoreComponentInstancesProperties(false);
         filter.setIgnoreCapabilities(false);
         filter.setIgnoreCapabiltyProperties(false);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeInterface.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeInterface.java
index 1d2849b94c..f4bcfdab5c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeInterface.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceMergeInterface.java
@@ -1,12 +1,11 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
+import fj.data.Either;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.exception.ResponseFormat;
 
-import fj.data.Either;
-
 /**
  * Created by chaya on 9/20/2017.
  */
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropertiesMergeBL.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropertiesMergeBL.java
index fe2de7882e..04c43b4c65 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropertiesMergeBL.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropertiesMergeBL.java
@@ -1,31 +1,39 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
 import org.openecomp.sdc.be.components.merge.property.DataDefinitionsValuesMergingBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.springframework.core.annotation.Order;
 
-import fj.data.Either;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
-@org.springframework.stereotype.Component
-public class ComponentInstancePropertiesMergeBL implements ComponentsMergeCommand {
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.ANY_ORDER_COMMAND;
 
-    @javax.annotation.Resource
-    private ToscaOperationFacade toscaOperationFacade;
+@org.springframework.stereotype.Component
+@Order(ANY_ORDER_COMMAND)
+public class ComponentInstancePropertiesMergeBL implements VspComponentsMergeCommand {
 
-    @javax.annotation.Resource(name = "componentUtils")
-    private ComponentsUtils componentsUtils;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic;
 
-    @javax.annotation.Resource
-    private DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic;
+    public ComponentInstancePropertiesMergeBL(ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, DataDefinitionsValuesMergingBusinessLogic propertyValuesMergingBusinessLogic) {
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+        this.propertyValuesMergingBusinessLogic = propertyValuesMergingBusinessLogic;
+    }
 
     @Override
     public ActionStatus mergeComponents(Component prevComponent, Component currentComponent) {
@@ -33,7 +41,15 @@ public class ComponentInstancePropertiesMergeBL implements ComponentsMergeComman
         if (newInstProps == null) {
             return ActionStatus.OK;
         }
-        newInstProps.forEach((instanceId, newProps) -> mergeOldInstancePropertiesValues(prevComponent, currentComponent, instanceId, newProps) );
+        Map<String, String> currComponentNames = getComponentNameByUniqueId(currentComponent);
+        Map<String, String> prevComponentUniqueIds = getComponentUniqueIdByName(prevComponent);
+        
+        newInstProps.forEach((instanceId, newProps) -> {
+            String instanceName = currComponentNames.get(instanceId);
+            String oldInstanceId = prevComponentUniqueIds.get(instanceName);
+            
+            mergeOldInstancePropertiesValues(prevComponent, currentComponent, oldInstanceId, newProps);
+        });
         return updateComponentInstancesProperties(currentComponent, newInstProps);
     }
 
@@ -51,6 +67,19 @@ public class ComponentInstancePropertiesMergeBL implements ComponentsMergeComman
         propertyValuesMergingBusinessLogic.mergeInstanceDataDefinitions(oldInstProps, oldInputs, newInstProps, newComponent.getInputs());
         return updateComponentInstanceProperties(newComponent, instanceId, newInstProps);
     }
+    
+    private static Map<String, String> getComponentNameByUniqueId(Component component) {
+        return asMap(component, ComponentInstance::getUniqueId, ComponentInstance::getName);
+    }
+    
+    private static Map<String, String> getComponentUniqueIdByName(Component component) {
+        return asMap(component, ComponentInstance::getName, ComponentInstance::getUniqueId);
+    }
+    
+    private static Map<String, String> asMap(Component component, Function<? super ComponentInstance, ? extends String> keyMapper, Function<? super ComponentInstance, ? extends String> valueMapper) {
+        return component.safeGetComponentInstances().stream().
+            collect(Collectors.toMap(keyMapper, valueMapper));
+    }
 
     private void mergeOldInstancePropertiesValues(Component oldComponent, Component newComponent, String instanceId, List<ComponentInstanceProperty> newProps) {
         List<ComponentInstanceProperty> oldInstProperties = oldComponent == null ? Collections.emptyList() : oldComponent.safeGetComponentInstanceProperties(instanceId);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMerge.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMerge.java
index 82e6b6368e..dc037abe80 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMerge.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstancePropsAndInputsMerge.java
@@ -1,26 +1,18 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.openecomp.sdc.be.components.merge.input.ComponentInputsMergeBL;
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
 
 /**
  * Created by chaya on 9/20/2017.
@@ -28,22 +20,21 @@ import fj.data.Either;
 @org.springframework.stereotype.Component("ComponentInstancePropsAndInputsMerge")
 public class ComponentInstancePropsAndInputsMerge implements ComponentInstanceMergeInterface {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ComponentInstancePropsAndInputsMerge.class);
-
-    @Autowired
-    private ToscaOperationFacade toscaOperationFacade;
-
-    @Autowired
-    private ComponentsUtils componentsUtils;
+    private static final Logger log = Logger.getLogger(ComponentInstancePropsAndInputsMerge.class);
 
-    @Autowired
-    private ComponentInstancePropertiesMergeBL componentInstancePropertiesMergeBL;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final ComponentInstancePropertiesMergeBL componentInstancePropertiesMergeBL;
+    private final ComponentInstanceInputsMergeBL resourceInstanceInputsMergeBL;
+    private final ComponentInstanceInputsRedeclareHandler instanceInputsRedeclareHandler;
 
-    @Autowired
-    private ComponentInstanceInputsMergeBL resourceInstanceInputsMergeBL;
-
-    @Autowired
-    private ComponentInputsMergeBL resourceInputsMergeBL;
+    public ComponentInstancePropsAndInputsMerge(ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, ComponentInstancePropertiesMergeBL componentInstancePropertiesMergeBL, ComponentInstanceInputsMergeBL resourceInstanceInputsMergeBL, ComponentInstanceInputsRedeclareHandler instanceInputsRedeclareHandler) {
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+        this.componentInstancePropertiesMergeBL = componentInstancePropertiesMergeBL;
+        this.resourceInstanceInputsMergeBL = resourceInstanceInputsMergeBL;
+        this.instanceInputsRedeclareHandler = instanceInputsRedeclareHandler;
+    }
 
     @Override
     public void saveDataBeforeMerge(DataForMergeHolder dataHolder, Component containerComponent, ComponentInstance currentResourceInstance, Component originComponent) {
@@ -79,7 +70,7 @@ public class ComponentInstancePropsAndInputsMerge implements ComponentInstanceMe
         ActionStatus actionStatus = componentInstancePropertiesMergeBL.mergeComponentInstanceProperties(originComponentInstanceProps, originComponentsInputs, updatedComponent, instanceId);
 
         if (actionStatus != ActionStatus.OK) {
-            LOGGER.error("Failed to update component {} with merged instance properties", updatedComponent.getUniqueId(), newComponentInstancesProps);
+            log.error("Failed to update component {} with merged instance properties", updatedComponent.getUniqueId(), newComponentInstancesProps);
             return Either.right(actionStatus);
         }
         return Either.left(newComponentInstancesProps);
@@ -91,7 +82,7 @@ public class ComponentInstancePropsAndInputsMerge implements ComponentInstanceMe
         List<ComponentInstanceInput> newComponentInstancesInputs = updatedComponent.safeGetComponentInstanceInput(instanceId);
         ActionStatus actionStatus = resourceInstanceInputsMergeBL.mergeComponentInstanceInputs(originComponentInstanceInputs, originComponentsInputs, updatedComponent, instanceId);
         if (actionStatus != ActionStatus.OK) {
-            LOGGER.error("Failed to update component {} with merged instance properties", updatedComponent.getUniqueId(), newComponentInstancesInputs);
+            log.error("Failed to update component {} with merged instance properties", updatedComponent.getUniqueId(), newComponentInstancesInputs);
             return Either.right(actionStatus);
         }
         return Either.left(newComponentInstancesInputs);
@@ -100,19 +91,19 @@ public class ComponentInstancePropsAndInputsMerge implements ComponentInstanceMe
     private Either<List<InputDefinition>, ActionStatus> mergeComponentInputsIntoContainer(DataForMergeHolder dataHolder, String newContainerComponentId, String newInstanceId) {
         List<InputDefinition> origComponentInputs = dataHolder.getOrigComponentInputs();
         List<InputDefinition> inputsToAddToContainer = new ArrayList<>();
-        if (origComponentInputs != null && !origComponentInputs.isEmpty()) {
+        if (isNotEmpty(origComponentInputs)) {
             // get  instance inputs and properties after merge
             Either<Component, StorageOperationStatus> componentWithInstancesInputsAndProperties = getComponentWithInstancesInputsAndProperties(newContainerComponentId);
             if (componentWithInstancesInputsAndProperties.isRight()) {
-                LOGGER.error("Component %s was not found", newContainerComponentId);
+                log.error("Component %s was not found", newContainerComponentId);
                 return Either.right(componentsUtils.convertFromStorageResponse(componentWithInstancesInputsAndProperties.right().value()));
             }
             Component updatedContainerComponent = componentWithInstancesInputsAndProperties.left().value();
-
-            ActionStatus redeclareStatus = resourceInputsMergeBL.redeclareComponentInputsForInstance(origComponentInputs, updatedContainerComponent, newInstanceId);
+            Component currInstanceOriginType = dataHolder.getCurrInstanceNode();
+            ActionStatus redeclareStatus = instanceInputsRedeclareHandler.redeclareComponentInputsForInstance(updatedContainerComponent, newInstanceId, currInstanceOriginType, origComponentInputs);
             if (redeclareStatus != ActionStatus.OK) {
-                LOGGER.error("Failed to update component {} with merged inputs {}", newContainerComponentId, inputsToAddToContainer);
-                Either.right(redeclareStatus);
+                log.error("Failed to update component {} with merged inputs {}", newContainerComponentId, inputsToAddToContainer);
+                return Either.right(redeclareStatus);
             }
         }
         return Either.left(inputsToAddToContainer);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceRelationMerge.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceRelationMerge.java
index 96f878abe0..995eae701c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceRelationMerge.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ComponentInstanceRelationMerge.java
@@ -1,49 +1,45 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
+import fj.data.Either;
 import org.apache.commons.lang3.StringUtils;
+import org.openecomp.sdc.be.components.merge.utils.CapabilityOwner;
+import org.openecomp.sdc.be.components.merge.utils.ComponentInstanceBuildingBlocks;
 import org.openecomp.sdc.be.components.merge.utils.MergeInstanceUtils;
+import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.RelationshipInfo;
 import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
-import org.openecomp.sdc.be.model.RequirementDefinition;
-import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import com.att.aft.dme2.internal.google.common.annotations.VisibleForTesting;
-
-import fj.data.Either;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 @org.springframework.stereotype.Component("ComponentInstanceRelashionMerge")
 public class ComponentInstanceRelationMerge implements ComponentInstanceMergeInterface {
-    private static Logger log = LoggerFactory.getLogger(ComponentInstanceRelationMerge.class);
-    
-    @Autowired
-    private ComponentsUtils componentsUtils;
+    private static final Logger log = Logger.getLogger(ComponentInstanceRelationMerge.class);
     
-    @Autowired
-    private MergeInstanceUtils mergeInstanceUtils;
-
-    @Autowired
-    private ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final MergeInstanceUtils mergeInstanceUtils;
+    private final ToscaOperationFacade toscaOperationFacade;
 
+    public ComponentInstanceRelationMerge(ComponentsUtils componentsUtils, MergeInstanceUtils mergeInstanceUtils, ToscaOperationFacade toscaOperationFacade) {
+        this.componentsUtils = componentsUtils;
+        this.mergeInstanceUtils = mergeInstanceUtils;
+        this.toscaOperationFacade = toscaOperationFacade;
+    }
+    
 
     @Override
     public void saveDataBeforeMerge(DataForMergeHolder dataHolder, Component containerComponent, ComponentInstance currentResourceInstance, Component originComponent) {
@@ -58,16 +54,16 @@ public class ComponentInstanceRelationMerge implements ComponentInstanceMergeInt
                                                                     currentResourceInstance);
 
         if (!relationsFrom.isEmpty() || !relationsTo.isEmpty()) {
-            List<ComponentInstance> vfcInstances = mergeInstanceUtils.getVfcInstances(currentResourceInstance, originComponent);
+            ComponentInstanceBuildingBlocks instBuildingBlocks = mergeInstanceUtils.getInstanceAtomicBuildingBlocks(currentResourceInstance, originComponent);
 
-            if  (vfcInstances != null) {
-                List<RelationMergeInfo> fromRelInfoList = convert(relationsFrom, rel -> mapRelationRequirement(rel, vfcInstances));
-                List<RelationMergeInfo> toRelInfoList = convert(relationsTo, rel -> mapRelationCapability(rel, vfcInstances));
+            if  (instBuildingBlocks != null) {
+                List<RelationMergeInfo> fromRelInfoList = convert(relationsFrom, rel -> mergeInstanceUtils.mapRelationRequirement(rel, instBuildingBlocks.getVfcInstances()));
+                List<RelationMergeInfo> toRelInfoList = convert(relationsTo, rel -> mergeInstanceUtils.mapRelationCapability(rel, instBuildingBlocks.getCapabilitiesOwners()));
 
                 // Encapsulate all needed info in one container
-                VfRelationsMergeInfo vfRelationsMergeInfo = new VfRelationsMergeInfo(fromRelInfoList, toRelInfoList);
+                ContainerRelationsMergeInfo containerRelationsMergeInfo = new ContainerRelationsMergeInfo(fromRelInfoList, toRelInfoList);
                 // Save it
-                dataHolder.setVfRelationsInfo(vfRelationsMergeInfo);
+                dataHolder.setVfRelationsInfo(containerRelationsMergeInfo);
             }
         }
         else {
@@ -81,7 +77,7 @@ public class ComponentInstanceRelationMerge implements ComponentInstanceMergeInt
     public Either<Component, ResponseFormat> mergeDataAfterCreate(User user, DataForMergeHolder dataHolder, Component updatedContainerComponent, String newInstanceId) {
         Wrapper<Either<Component, ResponseFormat>> resultWrapper = new Wrapper<>();
 
-        VfRelationsMergeInfo vfRelationsMergeInfo = getRelationsMergeInfo(dataHolder, updatedContainerComponent, resultWrapper);
+        ContainerRelationsMergeInfo containerRelationsMergeInfo = getRelationsMergeInfo(dataHolder, updatedContainerComponent, resultWrapper);
 
         ComponentInstance newComponentInstance = null;
         if(resultWrapper.isEmpty()) {
@@ -89,31 +85,13 @@ public class ComponentInstanceRelationMerge implements ComponentInstanceMergeInt
             newComponentInstance = loadComponentInstance(updatedContainerComponent, newInstanceId, resultWrapper);
         }
 
-        if(resultWrapper.isEmpty() && vfRelationsMergeInfo != null) {
+        if(resultWrapper.isEmpty() && containerRelationsMergeInfo != null) {
             // Load VFCI and filter them by name
-            List<ComponentInstance> vfcInstances = mergeInstanceUtils.getVfcInstances(newComponentInstance);
-            if(vfcInstances != null) {
-                Map<String, ComponentInstance> vfciMap = mergeInstanceUtils.convertToVfciNameMap(vfcInstances);
-
+            ComponentInstanceBuildingBlocks instanceBuildBlocks = mergeInstanceUtils.getInstanceAtomicBuildingBlocks(newComponentInstance);
+            if(instanceBuildBlocks != null) {
                 // Process Relationships
-                List<RelationMergeInfo> toRelationsInfo = vfRelationsMergeInfo.getToRelationsInfo();
-                Stream<RequirementCapabilityRelDef> toRelationsInfoStream = null;
-                if (toRelationsInfo != null) {
-                    toRelationsInfoStream = toRelationsInfo.stream()
-                                            .map(oldCapInfo -> restoreCapabilityRelation(oldCapInfo, newInstanceId, vfciMap, updatedContainerComponent))
-                                            .filter(Objects::nonNull);
-                }
-
-                List<RelationMergeInfo> fromRelationsInfo = vfRelationsMergeInfo.getFromRelationsInfo();
-                Stream<RequirementCapabilityRelDef> fromRelationsInfoStream = null;
-                if( fromRelationsInfo != null) {
-                    //For Each old requirement relation info
-                    fromRelationsInfoStream = fromRelationsInfo.stream()
-                                                .map(oldReqInfo -> restoreRequirementRelation(oldReqInfo, newInstanceId, vfciMap, updatedContainerComponent))
-                                                .filter(Objects::nonNull);
-                }
-
-                // Save relations in updated container (service)
+                Stream<RequirementCapabilityRelDef> toRelationsInfoStream = getCapabilitiesRelationInfoStream(updatedContainerComponent, newInstanceId, containerRelationsMergeInfo, instanceBuildBlocks);
+                Stream<RequirementCapabilityRelDef> fromRelationsInfoStream = getRequirementRelationsInfoStream(updatedContainerComponent, newInstanceId, containerRelationsMergeInfo, instanceBuildBlocks);
                 List<RequirementCapabilityRelDef> updatedRelations = getUpdatedRelations(toRelationsInfoStream, fromRelationsInfoStream);
                 StorageOperationStatus saveResult = toscaOperationFacade.associateResourceInstances(updatedContainerComponent.getUniqueId(), updatedRelations);
                 if (saveResult == StorageOperationStatus.OK) {
@@ -126,24 +104,31 @@ public class ComponentInstanceRelationMerge implements ComponentInstanceMergeInt
                 }
             }
         }
-
         return resultWrapper.getInnerElement();
     }
-    
-    @VisibleForTesting
-    public void setToscaOperationFacade(ToscaOperationFacade toscaOperationFacade) {
-        this.toscaOperationFacade = toscaOperationFacade;
-    }
-    
-    
-    @VisibleForTesting
-    public void setComponentsUtils(ComponentsUtils componentsUtils) {
-        this.componentsUtils = componentsUtils;
+
+    private Stream<RequirementCapabilityRelDef> getRequirementRelationsInfoStream(Component updatedContainerComponent, String newInstanceId, ContainerRelationsMergeInfo containerRelationsMergeInfo, ComponentInstanceBuildingBlocks instanceBuildBlocks) {
+        Map<String, ComponentInstance> vfciMap = MapUtil.toMap(instanceBuildBlocks.getVfcInstances(), ComponentInstance::getName, (p1, p2) -> p1);
+        List<RelationMergeInfo> fromRelationsInfo = containerRelationsMergeInfo.getFromRelationsInfo();
+        Stream<RequirementCapabilityRelDef> fromRelationsInfoStream = null;
+        if( fromRelationsInfo != null) {
+            fromRelationsInfoStream = fromRelationsInfo.stream()
+                                        .map(oldReqInfo -> mergeInstanceUtils.restoreRequirementRelation(oldReqInfo, newInstanceId, vfciMap, updatedContainerComponent))
+                                        .filter(Objects::nonNull);
+        }
+        return fromRelationsInfoStream;
     }
-    
-    @VisibleForTesting
-    public void setMergeInstanceUtils(MergeInstanceUtils mergeInstanceUtils) {
-        this.mergeInstanceUtils = mergeInstanceUtils;
+
+    private Stream<RequirementCapabilityRelDef> getCapabilitiesRelationInfoStream(Component updatedContainerComponent, String newInstanceId, ContainerRelationsMergeInfo containerRelationsMergeInfo, ComponentInstanceBuildingBlocks instanceBuildBlocks) {
+        Map<String, CapabilityOwner> capOwnersByName = MapUtil.toMap(instanceBuildBlocks.getCapabilitiesOwners(), CapabilityOwner::getName, (p1, p2) -> p1);
+        List<RelationMergeInfo> toRelationsInfo = containerRelationsMergeInfo.getToRelationsInfo();
+        Stream<RequirementCapabilityRelDef> toRelationsInfoStream = null;
+        if (toRelationsInfo != null) {
+            toRelationsInfoStream = toRelationsInfo.stream()
+                                    .map(oldCapInfo -> mergeInstanceUtils.restoreCapabilityRelation(oldCapInfo, newInstanceId, capOwnersByName, updatedContainerComponent))
+                                    .filter(Objects::nonNull);
+        }
+        return toRelationsInfoStream;
     }
 
     /**
@@ -184,6 +169,10 @@ public class ComponentInstanceRelationMerge implements ComponentInstanceMergeInt
                                                            ComponentInstance currentResourceInstance) {
 
         final List<RequirementCapabilityRelDef> componentInstancesRelations = containerComponent.getComponentInstancesRelations();
+        if (componentInstancesRelations == null) {
+            return Collections.emptyList();
+        }
+        
         final String vfInstanceId = currentResourceInstance.getUniqueId();
 
         return componentInstancesRelations.stream()
@@ -194,223 +183,20 @@ public class ComponentInstanceRelationMerge implements ComponentInstanceMergeInt
     private List<RelationMergeInfo> convert(List<RequirementCapabilityRelDef> relationsDef, 
                                             Function<RequirementCapabilityRelDef, RelationMergeInfo> mapFunc) {
         return relationsDef.stream()
-                            .map(mapFunc::apply)
+                            .map(mapFunc)
                             .filter(Objects::nonNull)
                             .collect(Collectors.toList());
     }
     
-    private RelationMergeInfo mapRelationCapability(RequirementCapabilityRelDef relDef, List<ComponentInstance> vfcInstances) {
-        // Id of the VfcInstance that is the owner of the capability
-        String ownerId = relDef.resolveSingleRelationship().getRelation().getCapabilityOwnerId();
-        return createRelationMergeInfo(vfcInstances, ownerId, currVfcInst -> mapVfcInstanceCapability(currVfcInst, relDef));
-    }
-    
-    private RelationMergeInfo mapRelationRequirement(RequirementCapabilityRelDef relDef, List<ComponentInstance> vfcInstances) {
-        // Id of the VfcInstance that is the owner of the requirement
-        String ownerId = relDef.resolveSingleRelationship().getRelation().getRequirementOwnerId();
-        return createRelationMergeInfo(vfcInstances, ownerId, currVfcInst -> mapVfcInstanceRequirement(currVfcInst, relDef));
-    }
-    
-    private RelationMergeInfo createRelationMergeInfo(List<ComponentInstance> vfcInstances, String ownerId, Function<ComponentInstance, RelationMergeInfo> mapFunc) {
-        return vfcInstances.stream()
-                            .filter(inst -> StringUtils.equals(inst.getUniqueId(), ownerId))
-                            .map(mapFunc::apply)
-                            .filter(Objects::nonNull)
-                            .findAny()
-                            .orElse(null);
-    }
-    
-    
-    private RelationMergeInfo mapVfcInstanceCapability(ComponentInstance vfcInstance, RequirementCapabilityRelDef relDef) {
-        String capabilityUniqueId = relDef.resolveSingleRelationship().getRelation().getCapabilityUid();
-
-
-        String vfcInstanceName = vfcInstance.getName();
-        String vfcUid = vfcInstance.getComponentUid();
-
-        Either<Resource, StorageOperationStatus> vfcResource = toscaOperationFacade.getToscaElement(vfcUid);
-        if(vfcResource.isLeft()) {
-            Resource vfc = vfcResource.left().value();
-
-            CapabilityDefinition capabilityDef = retrieveCapabilityDefinition(capabilityUniqueId, vfc);
-            String capabilityType;
-            String capabilityName;
-            if (capabilityDef != null) {
-                capabilityType = capabilityDef.getType();
-                capabilityName = capabilityDef.getName();
-            }
-            else {
-                log.debug("Failed to retrieve capability type for relation with name: {} and uniqueId {}", relDef.resolveSingleRelationship().getRelation().getCapability(), capabilityUniqueId);
-                capabilityType = null;
-                capabilityName = null;
-            }
-
-            return new RelationMergeInfo(capabilityType, capabilityName, vfcInstanceName, relDef);
-        }
-        else {
-            log.debug("Failed to load VFC by uid {}", vfcUid);
-            return null;
-        }
-    }
-    
-    private RelationMergeInfo mapVfcInstanceRequirement(ComponentInstance vfcInstance, RequirementCapabilityRelDef relDef) {
-        String requirementUniqueId = relDef.resolveSingleRelationship().getRelation().getRequirementUid();
-
-        String vfcInstanceName = vfcInstance.getName();
-        String vfcUid = vfcInstance.getComponentUid();
-
-        Either<Resource, StorageOperationStatus> vfcResource = toscaOperationFacade.getToscaElement(vfcUid);
-        if(vfcResource.isLeft()) {
-            Resource vfc = vfcResource.left().value();
-
-            RequirementDefinition requirementDef = retrieveRequirementDefinition(requirementUniqueId, vfc);
-            String requirementType;
-            String requirementName;
-            if (requirementDef != null) {
-                requirementType = requirementDef.getCapability();
-                requirementName = requirementDef.getName();
-            }
-            else {
-                log.debug("Failed to retrieve requirement type for relation with name: {} and uniqueId {}", relDef.resolveSingleRelationship().getRelation().getRequirement(), requirementUniqueId);
-                requirementType = null;
-                requirementName = null;
-            }
-
-            return new RelationMergeInfo(requirementType, requirementName, vfcInstanceName, relDef);
-        }
-        else {
-            log.debug("Failed to load VFC by uid {}", vfcUid);
-            return null;
-        }
-    }
-
-    private CapabilityDefinition retrieveCapabilityDefinition(String uniqueId, Resource vfc) {
-        return vfc.getCapabilities().values().stream()
-                                                .flatMap(List::stream)
-                                                .filter(Objects::nonNull)
-                                                .filter(def -> uniqueId.equals(def.getUniqueId()))
-                                                .findFirst()
-                                                .orElse(null);
-    }
-    
-    private String retrieveCapabilityUid(String name, Component vfc) {
-        return vfc.getCapabilities().values().stream()
-                                                .flatMap(List::stream)
-                                                .filter(Objects::nonNull)
-                                                .filter(def -> name.equals(def.getName()))
-                                                .findFirst()
-                                                .map(CapabilityDefinition::getUniqueId)
-                                                .orElse(null);
-    }
-
-    private RequirementDefinition retrieveRequirementDefinition(String uniqueId, Resource vfc) {
-        return vfc.getRequirements().values().stream()
-                                                .flatMap(List::stream)
-                                                .filter(Objects::nonNull)
-                                                .filter(def -> uniqueId.equals(def.getUniqueId()))
-                                                .findFirst()
-                                                .orElse(null);
-    }
-
-    private String retrieveRequirementUid(String name, Component vfc) {
-        return vfc.getRequirements().values().stream()
-                                                .flatMap(List::stream)
-                                                .filter(Objects::nonNull)
-                                                .filter(def -> name.equals(def.getName()))
-                                                .findFirst()
-                                                .map(RequirementDefinition::getUniqueId)
-                                                .orElse(null);
-    }
-
-
-
-    private VfRelationsMergeInfo getRelationsMergeInfo(DataForMergeHolder dataHolder,
-                                                        Component updatedContainerComponent,
-                                                        Wrapper<Either<Component, ResponseFormat>> resultWrapper) {
-        VfRelationsMergeInfo vfRelationsMergeInfo = dataHolder.getVfRelationsMergeInfo();
-        if (vfRelationsMergeInfo == null) {
+    private ContainerRelationsMergeInfo getRelationsMergeInfo(DataForMergeHolder dataHolder,
+                                                              Component updatedContainerComponent,
+                                                              Wrapper<Either<Component, ResponseFormat>> resultWrapper) {
+        ContainerRelationsMergeInfo containerRelationsMergeInfo = dataHolder.getContainerRelationsMergeInfo();
+        if (containerRelationsMergeInfo == null) {
             log.debug("There is no info about relations should be restored.");
             resultWrapper.setInnerElement(Either.left(updatedContainerComponent));
         }
 
-        return vfRelationsMergeInfo;
-    }
-
-
-    private RequirementCapabilityRelDef restoreCapabilityRelation(RelationMergeInfo oldCapInfo,
-                                                                  String newInstanceId,
-                                                                  Map<String, ComponentInstance> vfciMap,
-                                                                  Component updatedContainerComponent) {
-        String oldVfcInstanceName = oldCapInfo.getVfcInstanceName();
-
-        ComponentInstance newVfcInstance = vfciMap.get(oldVfcInstanceName);
-        if (newVfcInstance != null) {
-            // Append relation to updated container
-            RequirementCapabilityRelDef oldRelDef = oldCapInfo.getRelDef();
-            oldRelDef.setToNode(newInstanceId);
-
-            RelationshipInfo oldRelationshipInfo = oldRelDef.resolveSingleRelationship().getRelation();
-            oldRelationshipInfo.setCapabilityOwnerId(newVfcInstance.getUniqueId());
-            oldRelationshipInfo.getRelationship().setType(oldCapInfo.getCapReqType());
-
-
-            String vfcUid = newVfcInstance.getComponentUid();
-            Either<Component, StorageOperationStatus> eitherComponent = toscaOperationFacade.getToscaElement(vfcUid);
-
-            if(eitherComponent.isLeft()) {
-                String capabilityUid = retrieveCapabilityUid(oldCapInfo.getCapReqName() , eitherComponent.left().value());
-                oldRelationshipInfo.setCapabilityUid(capabilityUid);
-            }
-            else {
-                log.debug("Unexpected error: resource was not loaded for VF ID: {}", vfcUid);
-            }
-
-            updatedContainerComponent.getComponentInstancesRelations().add(oldRelDef);
-            return oldRelDef;
-        }
-        else {
-            log.debug("Skip relation since it was not found VFC Instance with name {}", oldVfcInstanceName);
-            return null;
-        }
-    }
-
-
-
-    private RequirementCapabilityRelDef restoreRequirementRelation(RelationMergeInfo oldReqInfo,
-                                                                    String newInstanceId,
-                                                                   Map<String, ComponentInstance> vfciMap,
-                                                                   Component updatedContainerComponent) {
-        String oldVfcInstanceName = oldReqInfo.getVfcInstanceName();
-
-        ComponentInstance newVfcInstance = vfciMap.get(oldReqInfo.getVfcInstanceName());
-        if (newVfcInstance != null) {
-            // Append relation to updated container
-            RequirementCapabilityRelDef oldRelDef = oldReqInfo.getRelDef();
-            oldRelDef.setFromNode(newInstanceId);
-
-            RelationshipInfo oldRelationshipInfo = oldRelDef.resolveSingleRelationship().getRelation();
-            oldRelationshipInfo.setRequirementOwnerId(newVfcInstance.getUniqueId());
-            oldRelationshipInfo.getRelationship().setType(oldReqInfo.getCapReqType());
-
-            String vfcUid = newVfcInstance.getComponentUid();
-            Either<Component, StorageOperationStatus> eitherComponent = toscaOperationFacade.getToscaElement(vfcUid);
-
-            if(eitherComponent.isLeft()) {
-                String requirementUid = retrieveRequirementUid(oldReqInfo.getCapReqName() , eitherComponent.left().value());
-                oldRelationshipInfo.setRequirementUid(requirementUid);
-            }
-            else {
-                log.debug("Unexpected error: resource was not loaded for VF ID: {}", vfcUid);
-            }
-
-            updatedContainerComponent.getComponentInstancesRelations().add(oldRelDef);
-            return oldRelDef;
-        }
-        else {
-            log.debug("Skip relation since it was not found VFC Instance with name {}", oldVfcInstanceName);
-            return null;
-        }
+        return containerRelationsMergeInfo;
     }
-
-    
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/VfRelationsMergeInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ContainerRelationsMergeInfo.java
index e116b66408..7440838a87 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/VfRelationsMergeInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ContainerRelationsMergeInfo.java
@@ -2,11 +2,11 @@ package org.openecomp.sdc.be.components.merge.instance;
 
 import java.util.List;
 
-public class VfRelationsMergeInfo {
+public class ContainerRelationsMergeInfo {
     private List<RelationMergeInfo> fromRelationsInfo;
     private List<RelationMergeInfo> toRelationsInfo;
 
-    public VfRelationsMergeInfo(List<RelationMergeInfo> fromRelationsInfo, List<RelationMergeInfo> toRelationsInfo) {
+    ContainerRelationsMergeInfo(List<RelationMergeInfo> fromRelationsInfo, List<RelationMergeInfo> toRelationsInfo) {
         this.fromRelationsInfo = fromRelationsInfo;
         this.toRelationsInfo = toRelationsInfo;
     }
@@ -15,16 +15,8 @@ public class VfRelationsMergeInfo {
         return fromRelationsInfo;
     }
 
-    public void setFromRelationsInfo(List<RelationMergeInfo> fromRelationsInfo) {
-        this.fromRelationsInfo = fromRelationsInfo;
-    }
-
     public List<RelationMergeInfo> getToRelationsInfo() {
         return toRelationsInfo;
     }
 
-    public void setToRelationsInfo(List<RelationMergeInfo> toRelationsInfo) {
-        this.toRelationsInfo = toRelationsInfo;
-    }
-
 }
\ No newline at end of file
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolder.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolder.java
index 636bdda854..7388819ebf 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolder.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/DataForMergeHolder.java
@@ -1,18 +1,9 @@
 package org.openecomp.sdc.be.components.merge.instance;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.InputDefinition;
+
+import org.openecomp.sdc.be.model.*;
+
+import java.util.*;
 
 /**
  * Created by chaya on 9/7/2017.
@@ -24,10 +15,12 @@ public class DataForMergeHolder {
     private List<InputDefinition> origComponentInputs;
     private Map<String, ArtifactDefinition> origCompInstDeploymentArtifactsCreatedOnTheInstance;
     private Map<String, ArtifactDefinition> origCompInstInformationalArtifactsCreatedOnTheInstance;
+    private Map<String, List<String>> origComponentInstanceExternalRefs;
     private List<ArtifactDefinition> origComponentInstanceHeatEnvArtifacts;
-    private VfRelationsMergeInfo vfRelationsMergeInfo;
+    private ContainerRelationsMergeInfo containerRelationsMergeInfo;
     private List<CapabilityDefinition> origInstanceCapabilities;
     private Component origInstanceNode;
+    private Component currInstanceNode;
     private String origComponentInstId;
 
     public DataForMergeHolder() {
@@ -39,19 +32,19 @@ public class DataForMergeHolder {
         origInstanceCapabilities = new ArrayList<>();
     }
 
-    public List<ArtifactDefinition> getOrigComponentInstanceHeatEnvArtifacts() {
+    List<ArtifactDefinition> getOrigComponentInstanceHeatEnvArtifacts() {
         return origComponentInstanceHeatEnvArtifacts;
     }
 
-    public void setOrigComponentInstanceHeatEnvArtifacts(List<ArtifactDefinition> origComponentInstanceHeatEnvArtifacts) {
+    void setOrigComponentInstanceHeatEnvArtifacts(List<ArtifactDefinition> origComponentInstanceHeatEnvArtifacts) {
         this.origComponentInstanceHeatEnvArtifacts = origComponentInstanceHeatEnvArtifacts;
     }
 
-    public List<ComponentInstanceInput> getOrigComponentInstanceInputs() {
+    List<ComponentInstanceInput> getOrigComponentInstanceInputs() {
         return origComponentInstanceInputs;
     }
 
-    public void setOrigComponentInstanceInputs(List<ComponentInstanceInput> origComponentInstanceInputs) {
+    void setOrigComponentInstanceInputs(List<ComponentInstanceInput> origComponentInstanceInputs) {
         Optional.ofNullable(origComponentInstanceInputs).orElse(Collections.emptyList()).stream().forEach(input -> {
             ComponentInstanceInput copyInput = new ComponentInstanceInput();
             copyInput.setType(input.getType());
@@ -77,11 +70,11 @@ public class DataForMergeHolder {
         });
     }
 
-    public List<ComponentInstanceProperty> getOrigComponentInstanceProperties() {
+    List<ComponentInstanceProperty> getOrigComponentInstanceProperties() {
         return origComponentInstanceProperties;
     }
 
-    public void setOrigComponentInstanceProperties(List<ComponentInstanceProperty> origComponentInstanceProperties) {
+    void setOrigComponentInstanceProperties(List<ComponentInstanceProperty> origComponentInstanceProperties) {
         Optional.ofNullable(origComponentInstanceProperties).orElse(Collections.emptyList()).stream().forEach(property -> {
             ComponentInstanceProperty propertyCopy = new ComponentInstanceProperty();
             propertyCopy.setType(property.getType());
@@ -95,50 +88,66 @@ public class DataForMergeHolder {
         });
     }
 
-    public List<InputDefinition> getOrigComponentInputs() {
+    List<InputDefinition> getOrigComponentInputs() {
         return origComponentInputs;
     }
 
-    public void setOrigComponentInputs(List<InputDefinition> origComponentInputs) {
+    void setOrigComponentInputs(List<InputDefinition> origComponentInputs) {
         this.origComponentInputs = origComponentInputs;
     }
 
-    public Map<String, ArtifactDefinition> getOrigComponentDeploymentArtifactsCreatedOnTheInstance(){ return this.origCompInstDeploymentArtifactsCreatedOnTheInstance;}
+    Map<String, ArtifactDefinition> getOrigComponentDeploymentArtifactsCreatedOnTheInstance(){ return this.origCompInstDeploymentArtifactsCreatedOnTheInstance;}
 
-    public Map<String, ArtifactDefinition> getOrigComponentInformationalArtifactsCreatedOnTheInstance(){ return origCompInstInformationalArtifactsCreatedOnTheInstance;}
+    Map<String, ArtifactDefinition> getOrigComponentInformationalArtifactsCreatedOnTheInstance(){ return origCompInstInformationalArtifactsCreatedOnTheInstance;}
 
-    public void setOrigComponentDeploymentArtifactsCreatedOnTheInstance(Map<String, ArtifactDefinition> origDeploymentArtifacts){
+    void setOrigComponentDeploymentArtifactsCreatedOnTheInstance(Map<String, ArtifactDefinition> origDeploymentArtifacts){
         origCompInstDeploymentArtifactsCreatedOnTheInstance = origDeploymentArtifacts;
     }
 
-    public void setOrigComponentInformationalArtifactsCreatedOnTheInstance(Map<String, ArtifactDefinition> origInformationalArtifacts){
+    void setOrigComponentInformationalArtifactsCreatedOnTheInstance(Map<String, ArtifactDefinition> origInformationalArtifacts){
         origCompInstInformationalArtifactsCreatedOnTheInstance = origInformationalArtifacts;
     }
 
-    public void setVfRelationsInfo(VfRelationsMergeInfo vfRelationsMergeInfo) {
-        this.vfRelationsMergeInfo = vfRelationsMergeInfo;
+    Map<String, List<String>> getOrigCompInstExternalRefs() {
+        return origComponentInstanceExternalRefs;
+    }
+
+    void setOrigComponentInstanceExternalRefs(Map<String, List<String>> origComponentInstanceExternalRefs) {
+        this.origComponentInstanceExternalRefs = origComponentInstanceExternalRefs;
+    }
+
+    void setVfRelationsInfo(ContainerRelationsMergeInfo containerRelationsMergeInfo) {
+        this.containerRelationsMergeInfo = containerRelationsMergeInfo;
     }
 
-    public VfRelationsMergeInfo getVfRelationsMergeInfo() {
-        return vfRelationsMergeInfo;
+    ContainerRelationsMergeInfo getContainerRelationsMergeInfo() {
+        return containerRelationsMergeInfo;
     }
 
-    public List<CapabilityDefinition> getOrigInstanceCapabilities() {
+    List<CapabilityDefinition> getOrigInstanceCapabilities() {
         return origInstanceCapabilities;
     }
 
-    public void setOrigInstanceCapabilities(List<CapabilityDefinition> origInstanceCapabilities) {
+    void setOrigInstanceCapabilities(List<CapabilityDefinition> origInstanceCapabilities) {
         this.origInstanceCapabilities = origInstanceCapabilities;
     }
 
-    public Component getOrigInstanceNode() {
+    Component getOrigInstanceNode() {
         return origInstanceNode;
     }
 
-    public void setOrigInstanceNode(Component origInstanceNode) {
+    void setOrigInstanceNode(Component origInstanceNode) {
         this.origInstanceNode = origInstanceNode;
     }
 
+    Component getCurrInstanceNode() {
+        return currInstanceNode;
+    }
+
+    public void setCurrInstanceNode(Component currInstanceNode) {
+        this.currInstanceNode = currInstanceNode;
+    }
+
     public String getOrigComponentInstId() {
         return origComponentInstId;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ExternalRefsMergeBL.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ExternalRefsMergeBL.java
new file mode 100644
index 0000000000..e9c4364181
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/ExternalRefsMergeBL.java
@@ -0,0 +1,49 @@
+package org.openecomp.sdc.be.components.merge.instance;
+
+import fj.data.Either;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.jsontitan.operations.ExternalReferencesOperation;
+import org.openecomp.sdc.exception.ResponseFormat;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.apache.commons.collections.MapUtils.isEmpty;
+
+@org.springframework.stereotype.Component
+public class ExternalRefsMergeBL implements ComponentInstanceMergeInterface {
+
+    private final ExternalReferencesOperation externalReferencesOperation;
+
+    ExternalRefsMergeBL(ExternalReferencesOperation externalReferencesOperation) {
+        this.externalReferencesOperation = externalReferencesOperation;
+    }
+
+    @Override
+    public void saveDataBeforeMerge(DataForMergeHolder dataHolder, Component containerComponent,
+                                    ComponentInstance currentResourceInstance, Component originComponent) {
+        Map<String, List<String>> externalRefs = externalReferencesOperation.getAllExternalReferences(containerComponent.getUniqueId(),
+                currentResourceInstance.getUniqueId());
+        dataHolder.setOrigComponentInstanceExternalRefs(externalRefs);
+    }
+
+    @Override
+    public Either<Component, ResponseFormat> mergeDataAfterCreate(User user, DataForMergeHolder dataHolder, Component updatedContainerComponent, String newInstanceId) {
+        Optional<ComponentInstance> componentInstance = updatedContainerComponent.getComponentInstanceById(newInstanceId);
+        if (!componentInstance.isPresent()) {
+            throw new ComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND,
+                    newInstanceId);
+        }
+        Map<String, List<String>>  savedExternalRefs = dataHolder.getOrigCompInstExternalRefs();
+        if (!isEmpty(savedExternalRefs)) {
+            externalReferencesOperation.addAllExternalReferences(updatedContainerComponent.getUniqueId(),
+                    componentInstance.get().getUniqueId(), savedExternalRefs);
+        }
+        return Either.left(updatedContainerComponent);
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/RelationMergeInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/RelationMergeInfo.java
index 4ab802ad35..da6ef7156e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/RelationMergeInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/instance/RelationMergeInfo.java
@@ -4,14 +4,14 @@ import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
 
 public class RelationMergeInfo {
     private String capReqType;
-    private String vfcInstanceName;
+    private String capOwnerName;
     private RequirementCapabilityRelDef relDef;
     private String capReqName;
 
-    public RelationMergeInfo(String capReqType, String capReqName, String vfcInstanceName, RequirementCapabilityRelDef relDef) {
+    public RelationMergeInfo(String capReqType, String capReqName, String capOwnerName, RequirementCapabilityRelDef relDef) {
         this.capReqType = capReqType;
         this.capReqName = capReqName;
-        this.vfcInstanceName = vfcInstanceName;
+        this.capOwnerName = capOwnerName;
         this.relDef = relDef;
     }
 
@@ -19,31 +19,15 @@ public class RelationMergeInfo {
         return capReqType;
     }
 
-    public void setCapReqType(String type) {
-        this.capReqType = type;
+    public String getCapOwnerName() {
+        return capOwnerName;
     }
-
-    public String getVfcInstanceName() {
-        return vfcInstanceName;
-    }
-
-    public void setVfcInstanceName(String vfcInstanceName) {
-        this.vfcInstanceName = vfcInstanceName;
-    }
-
     public RequirementCapabilityRelDef getRelDef() {
         return relDef;
     }
 
-    public void setRelDef(RequirementCapabilityRelDef relDef) {
-        this.relDef = relDef;
-    }
-
     public String getCapReqName() {
         return capReqName;
     }
 
-    public void setCapReqName(String capReqName) {
-        this.capReqName = capReqName;
-    }
 }
\ No newline at end of file
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/policy/PoliciesMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/policy/PoliciesMergeCommand.java
new file mode 100644
index 0000000000..e57317f165
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/policy/PoliciesMergeCommand.java
@@ -0,0 +1,130 @@
+package org.openecomp.sdc.be.components.merge.policy;
+
+import org.openecomp.sdc.be.components.merge.ComponentsGlobalMergeCommand;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.PolicyDefinition;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.core.annotation.Order;
+
+import java.util.*;
+
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections.MapUtils.isEmpty;
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.ANY_ORDER_COMMAND;
+
+@org.springframework.stereotype.Component
+@Order(ANY_ORDER_COMMAND)
+public class PoliciesMergeCommand implements ComponentsGlobalMergeCommand, VspComponentsMergeCommand {
+
+    private static final Logger log = Logger.getLogger(PoliciesMergeCommand.class);
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+
+    public PoliciesMergeCommand(ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils) {
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+    }
+
+    @Override
+    public ActionStatus mergeComponents(Component prevComponent, Component currentComponent) {
+        log.debug("#mergeComponents - merging user defined policies to current component {}", currentComponent.getUniqueId());
+        if (isEmpty(prevComponent.getPolicies())) {
+            return ActionStatus.OK;
+        }
+        Map<String, PolicyDefinition> policiesToMerge = resolvePoliciesForMerge(prevComponent, currentComponent);
+        return associatePoliciesToComponent(currentComponent, policiesToMerge);
+    }
+
+    private ActionStatus associatePoliciesToComponent(Component currentComponent, Map<String, PolicyDefinition> policiesToMerge) {
+        log.debug("#associatePoliciesToComponent - associating {} policies into component {}", policiesToMerge.size(), currentComponent.getUniqueId());
+        currentComponent.setPolicies(policiesToMerge);
+        StorageOperationStatus associateResult = toscaOperationFacade.associatePoliciesToComponent(currentComponent.getUniqueId(), new ArrayList<>(policiesToMerge.values()));
+        return componentsUtils.convertFromStorageResponse(associateResult);
+    }
+
+    @Override
+    public String description() {
+        return "merge component policies";
+    }
+
+    private Map<String, PolicyDefinition> resolvePoliciesForMerge(Component prevComponent, Component currentComponent) {
+        Map<String, PolicyDefinition> policies = prevComponent.getPolicies();
+        policies.values().forEach(policy -> updatePolicyTargets(policy, prevComponent, currentComponent));
+        return policies;
+    }
+
+    private void updatePolicyTargets(PolicyDefinition policy, Component prevComponent, Component currComponent) {
+        log.debug("#updatePolicyTargets - updating policy {} targets for component {}", policy.getUniqueId(), currComponent.getUniqueId());
+        if (isEmpty(policy.getTargets())) {
+            return;
+        }
+        Map<PolicyTargetType, List<String>> targets =  buildPolicyTargetsMap(policy, prevComponent, currComponent);
+        policy.setTargets(targets);
+    }
+
+    private Map<PolicyTargetType, List<String>> buildPolicyTargetsMap(PolicyDefinition policy, Component prevComponent, Component currComponent) {
+        List<String> componentInstanceTargets = resolveNewComponentInstanceTargets(policy, prevComponent, currComponent);
+        List<String> groupTargets = resolveNewGroupTargets(policy, prevComponent, currComponent);
+        Map<PolicyTargetType, List<String>> targets = new HashMap<>();
+        targets.put(PolicyTargetType.COMPONENT_INSTANCES, componentInstanceTargets);
+        targets.put(PolicyTargetType.GROUPS, groupTargets);
+        return targets;
+    }
+
+    private List<String> resolveNewComponentInstanceTargets(PolicyDefinition policy, Component prevComponent, Component currComponent) {
+        List<String> prevCompInstanceTargets = policy.resolveComponentInstanceTargets();
+        if (isEmpty(prevCompInstanceTargets)) {
+            return emptyList();
+        }
+        return resolveInstanceTargetsByInstanceName(prevComponent, currComponent, prevCompInstanceTargets);
+    }
+
+    private List<String> resolveNewGroupTargets(PolicyDefinition policy, Component prevComponent, Component currComponent) {
+        List<String> prevGroupTargets = policy.resolveGroupTargets();
+        if (isEmpty(prevGroupTargets)) {
+            return emptyList();
+        }
+        return resolveGroupTargetsByInvariantName(prevComponent, currComponent, prevGroupTargets);
+    }
+
+    private List<String> resolveInstanceTargetsByInstanceName(Component prevComponent, Component currComponent, List<String> prevCompInstanceTargets) {
+        return prevCompInstanceTargets.stream()
+                .map(prevInstId -> resolveNewInstId(prevComponent, currComponent, prevInstId))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(toList());
+    }
+
+    private List<String> resolveGroupTargetsByInvariantName(Component prevComponent, Component currComponent, List<String> prevGroupTargets) {
+        return prevGroupTargets.stream()
+                .map(prevGroupId -> resolveNewGroupId(prevComponent, currComponent, prevGroupId))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(toList());
+    }
+
+    private Optional<String> resolveNewInstId(Component prevCmpt, Component newCmpt, String prevInstanceId) {
+        return prevCmpt.getComponentInstanceById(prevInstanceId)
+                .map(ComponentInstance::getName)
+                .flatMap(newCmpt::getComponentInstanceByName)
+                .map(ComponentInstance::getUniqueId);
+    }
+
+    private Optional<String> resolveNewGroupId(Component prevCmpt, Component newCmpt, String prevGroupId) {
+        return prevCmpt.getGroupById(prevGroupId)
+                .map(GroupDefinition::getInvariantName)
+                .flatMap(newCmpt::getGroupByInvariantName)
+                .map(GroupDefinition::getUniqueId);
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ComplexPropertyValueMerger.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ComplexPropertyValueMerger.java
deleted file mode 100644
index a68e28024c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ComplexPropertyValueMerger.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.openecomp.sdc.be.components.merge.property;
-
-import java.util.List;
-
-public class ComplexPropertyValueMerger extends PropertyValueMerger {
-
-    private static final ComplexPropertyValueMerger INSTANCE = new ComplexPropertyValueMerger();
-
-    public static PropertyValueMerger getInstance() {
-        return INSTANCE;
-    }
-
-    @Override
-    Object merge(Object oldVal, Object newVal, List<String> someStrings) {
-        return mergeValues(oldVal, newVal, someStrings);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java
index bc2f71e2ef..faa8ebbdec 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/DataDefinitionsValuesMergingBusinessLogic.java
@@ -1,18 +1,24 @@
 package org.openecomp.sdc.be.components.merge.property;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
+import java.util.List;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.openecomp.sdc.be.components.merge.property.PropertyInstanceMergeDataBuilder.buildDataForMerging;
+
 @Component
 public class DataDefinitionsValuesMergingBusinessLogic  {
 
-    @javax.annotation.Resource
     private PropertyDataValueMergeBusinessLogic propertyValueMergeBL;
 
+    public DataDefinitionsValuesMergingBusinessLogic(PropertyDataValueMergeBusinessLogic propertyValueMergeBL) {
+        this.propertyValueMergeBL = propertyValueMergeBL;
+    }
+
     /**
      * Merge previous version data definition values into the new version data definition.
      * A data definition value is merged if it had a value in previous version and has no value in the current version.
@@ -23,10 +29,10 @@ public class DataDefinitionsValuesMergingBusinessLogic  {
      * @param newInputs the new version inputs
      */
     public <T extends PropertyDataDefinition> void mergeInstanceDataDefinitions(List<T> oldInstanceDataDefinition, List<InputDefinition> oldInputs, List<T> updatedInstanceDataDefinition, List<InputDefinition> newInputs) {
-        if (updatedInstanceDataDefinition == null || updatedInstanceDataDefinition.isEmpty() || oldInstanceDataDefinition == null || oldInstanceDataDefinition.isEmpty()) {
+        if (isEmpty(updatedInstanceDataDefinition) || isEmpty(oldInstanceDataDefinition)) {
             return;
         }
-        List<MergePropertyData> mergePropertyData = PropertyInstanceMergeDataBuilder.getInstance().buildDataForMerging(oldInstanceDataDefinition, oldInputs, updatedInstanceDataDefinition, newInputs);
+        List<MergePropertyData> mergePropertyData = buildDataForMerging(oldInstanceDataDefinition, oldInputs, updatedInstanceDataDefinition, newInputs);
         mergePropertyData.forEach(this::mergeInstanceDefinition);
 
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
index 63a7a1b3a0..df65c1161f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
@@ -1,10 +1,10 @@
 package org.openecomp.sdc.be.components.merge.property;
 
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-
 /**
  * A POJO which represents an instance property data definition (a {@link org.openecomp.sdc.be.model.ComponentInstanceProperty} or {@link org.openecomp.sdc.be.model.ComponentInstanceInput})
  * that its value needs to be merged during an upgrade of a VSP.
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyDataValueMergeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyDataValueMergeBusinessLogic.java
index 7356b446a4..df7b877364 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyDataValueMergeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyDataValueMergeBusinessLogic.java
@@ -7,18 +7,14 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
 import org.openecomp.sdc.be.model.tosca.ToscaFunctions;
-import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.tosca.PropertyConvertor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
 import com.google.gson.Gson;
@@ -28,72 +24,62 @@ import fj.data.Either;
 @Component
 public class PropertyDataValueMergeBusinessLogic {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PropertyDataValueMergeBusinessLogic.class);
+    private static final Logger LOGGER = Logger.getLogger(PropertyDataValueMergeBusinessLogic.class);
 
+    private final PropertyValueMerger propertyValueMerger;
+    private final ApplicationDataTypeCache dataTypeCache;
+    
     private final PropertyConvertor propertyConvertor = PropertyConvertor.getInstance();
-
-    private PropertyValueMerger complexPropertyValueMerger = ComplexPropertyValueMerger.getInstance();
-
-    private PropertyValueMerger scalarPropertyValueMerger = ScalarPropertyValueMerger.getInstance();
-
-    @Resource
-    private ApplicationDataTypeCache dataTypeCache;
-
     private final Gson gson = new Gson();
 
+    
+    public PropertyDataValueMergeBusinessLogic(PropertyValueMerger propertyValueMerger, ApplicationDataTypeCache dataTypeCache) {
+        this.propertyValueMerger = propertyValueMerger;
+        this.dataTypeCache = dataTypeCache;
+    }
+
     /**
      *
      * @param oldProp the old property to merge value from
      * @param newProp the new property to merge value into
-     * @param getInputNamesToMerge inputs names which their corresponding get_input values are allowed to be merged
      */
     public void mergePropertyValue(PropertyDataDefinition oldProp, PropertyDataDefinition newProp, List<String> getInputNamesToMerge) {
         Either<Map<String, DataTypeDefinition>, TitanOperationStatus> dataTypesEither = dataTypeCache.getAll();
         if (dataTypesEither.isRight()) {
             LOGGER.debug("failed to fetch data types, skip merging of previous property values. status: {}", dataTypesEither.right().value());
         }
-        mergePropertyValue(oldProp, newProp, dataTypesEither.left().value(), getInputNamesToMerge);
-        mergeComplexPropertyGetInputsValues(oldProp, newProp);
+        else {
+            mergePropertyValue(oldProp, newProp, dataTypesEither.left().value(), getInputNamesToMerge);
+        }
     }
-
+    
     private void mergePropertyValue(PropertyDataDefinition oldProp, PropertyDataDefinition newProp, Map<String, DataTypeDefinition> dataTypes, List<String> getInputNamesToMerge) {
         Object oldValAsObject = convertPropertyStrValueToObject(oldProp, dataTypes);
         Object newValAsObject = convertPropertyStrValueToObject(newProp, dataTypes);
-        PropertyValueMerger propertyValueMerger = getPropertyValueMerger(newProp);
         if(oldValAsObject != null){
-            Object mergedValue = propertyValueMerger.mergeValues(oldValAsObject, newValAsObject, getInputNamesToMerge);
+            Object mergedValue =  propertyValueMerger.merge(oldValAsObject, newValAsObject, getInputNamesToMerge, newProp.getType(), newProp.getSchemaType(), dataTypes);
             newProp.setValue(convertPropertyValueObjectToString(mergedValue));
+            
+            mergePropertyGetInputsValues(oldProp, newProp);
         }
+        
     }
-
-    private PropertyValueMerger getPropertyValueMerger(PropertyDataDefinition newProp) {
-        if (ToscaPropertyType.isPrimitiveType(newProp.getType()) || ToscaPropertyType.isPrimitiveType(newProp.getSchemaType())) {
-            return scalarPropertyValueMerger;
-        }
-        return complexPropertyValueMerger;
-    }
-
+    
     private String convertPropertyValueObjectToString(Object mergedValue) {
-        if (isEmptyValue(mergedValue)) {
+        if (PropertyValueMerger.isEmptyValue(mergedValue)) {
             return null;
         }
         return mergedValue instanceof String? mergedValue.toString() : gson.toJson(mergedValue);
     }
 
     private Object convertPropertyStrValueToObject(PropertyDataDefinition propertyDataDefinition, Map<String, DataTypeDefinition> dataTypes) {
-            String propValue = propertyDataDefinition.getValue() == null ? "": propertyDataDefinition.getValue();
-            String propertyType = propertyDataDefinition.getType();
-            String innerType = propertyDataDefinition.getSchemaType();
-            return propertyConvertor.convertToToscaObject(propertyType, propValue, innerType, dataTypes);
+        String propValue = propertyDataDefinition.getValue() == null ? "": propertyDataDefinition.getValue();
+        String propertyType = propertyDataDefinition.getType();
+        String innerType = propertyDataDefinition.getSchemaType();
+        return propertyConvertor.convertToToscaObject(propertyType, propValue, innerType, dataTypes, true);
     }
 
-    private boolean isEmptyValue(Object val) {
-        return val == null ||
-               val instanceof Map && ((Map) val).isEmpty() ||
-               val instanceof List && ((List) val).isEmpty();
-    }
-
-    private void mergeComplexPropertyGetInputsValues(PropertyDataDefinition oldProp, PropertyDataDefinition newProp) {
+    protected void mergePropertyGetInputsValues(PropertyDataDefinition oldProp, PropertyDataDefinition newProp) {
         if (!oldProp.isGetInputProperty()) {
             return;
         }
@@ -117,14 +103,4 @@ public class PropertyDataValueMergeBusinessLogic {
         String getInputEntry = "\"%s\":\"%s\"";
         return value != null && value.contains(String.format(getInputEntry, ToscaFunctions.GET_INPUT.getFunctionName(), inputName));
     }
-
-
-
-
-
-
-
-
-
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyInstanceMergeDataBuilder.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyInstanceMergeDataBuilder.java
index 09f26a39ee..7f9bf1c370 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyInstanceMergeDataBuilder.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyInstanceMergeDataBuilder.java
@@ -1,27 +1,21 @@
 package org.openecomp.sdc.be.components.merge.property;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.model.InputDefinition;
 
-public class PropertyInstanceMergeDataBuilder {
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
-    private final static PropertyInstanceMergeDataBuilder INSTANCE = new PropertyInstanceMergeDataBuilder();
+class PropertyInstanceMergeDataBuilder {
 
     private PropertyInstanceMergeDataBuilder() {
     }
 
-    public static PropertyInstanceMergeDataBuilder getInstance() {
-        return INSTANCE;
-    }
-
-    public <T extends PropertyDataDefinition> List<MergePropertyData> buildDataForMerging(List<T> oldProps,
+    static <T extends PropertyDataDefinition> List<MergePropertyData> buildDataForMerging(List<T> oldProps,
                                                                                           List<InputDefinition> oldInputs,
                                                                                           List<T> newProps,
                                                                                           List<InputDefinition> newInputs) {
@@ -34,7 +28,7 @@ public class PropertyInstanceMergeDataBuilder {
 
     }
 
-    private <T extends PropertyDataDefinition> List<MergePropertyData> buildMergeData(Map<String, T> oldPropsByName, Map<String, InputDefinition> oldInputsByName, Map<String, T> newPropsByName, Map<String, InputDefinition> newInputsByName) {
+    private static <T extends PropertyDataDefinition> List<MergePropertyData> buildMergeData(Map<String, T> oldPropsByName, Map<String, InputDefinition> oldInputsByName, Map<String, T> newPropsByName, Map<String, InputDefinition> newInputsByName) {
         List<MergePropertyData> mergeData = new ArrayList<>();
         newPropsByName.forEach((name, prop) -> {
             if (oldPropsByName.containsKey(name)) {
@@ -44,7 +38,7 @@ public class PropertyInstanceMergeDataBuilder {
         return mergeData;
     }
 
-    private MergePropertyData buildMergePropertyData(PropertyDataDefinition oldProp,
+    private static MergePropertyData buildMergePropertyData(PropertyDataDefinition oldProp,
                                                     Map<String, InputDefinition> oldInputsByName,
                                                     PropertyDataDefinition newProp,
                                                     Map<String, InputDefinition> newInputsByName) {
@@ -58,18 +52,18 @@ public class PropertyInstanceMergeDataBuilder {
         return mergePropertyData;
     }
 
-    private void setGetInputData(PropertyDataDefinition oldProp, Map<String, InputDefinition> oldInputsByName, Map<String, InputDefinition> newInputsByName, MergePropertyData mergePropertyData) {
+    private static void setGetInputData(PropertyDataDefinition oldProp, Map<String, InputDefinition> oldInputsByName, Map<String, InputDefinition> newInputsByName, MergePropertyData mergePropertyData) {
         List<String> oldDeclaredByUserInputNames = getOldDeclaredInputsByUser(oldProp.getGetInputValues(), oldInputsByName);
         List<String> oldGetInputNamesWhichExistInNewVersion = getOldGetInputNamesWhichExistInNewVersion(oldProp.getGetInputValues(), newInputsByName);
         mergePropertyData.addAddGetInputNamesToMerge(oldDeclaredByUserInputNames);
         mergePropertyData.addAddGetInputNamesToMerge(oldGetInputNamesWhichExistInNewVersion);
     }
 
-    private List<String> getOldGetInputNamesWhichExistInNewVersion(List<GetInputValueDataDefinition> getInputValues, Map<String, InputDefinition> newInputsByName) {
+    private static List<String> getOldGetInputNamesWhichExistInNewVersion(List<GetInputValueDataDefinition> getInputValues, Map<String, InputDefinition> newInputsByName) {
         return getInputValues.stream().map(GetInputValueDataDefinition::getInputName).filter(newInputsByName::containsKey).collect(Collectors.toList());
     }
 
-    private List<String> getOldDeclaredInputsByUser(List<GetInputValueDataDefinition> getInputValues, Map<String, InputDefinition> oldInputsByName) {
+    private static List<String> getOldDeclaredInputsByUser(List<GetInputValueDataDefinition> getInputValues, Map<String, InputDefinition> oldInputsByName) {
         return getInputValues.stream().map(GetInputValueDataDefinition::getInputName)
                                       .map(oldInputsByName::get)
                                       .filter(oldInput -> oldInput.getInstanceUniqueId() != null)
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyValueMerger.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyValueMerger.java
index 88601bb521..93d39cf2ab 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyValueMerger.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/PropertyValueMerger.java
@@ -3,116 +3,154 @@ package org.openecomp.sdc.be.components.merge.property;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
-import org.openecomp.sdc.be.components.impl.ImportUtils;
-
-public abstract class PropertyValueMerger {
-
-    abstract Object merge(Object oldVal, Object newVal, List<String> someStrings);
-
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PropertyValueMerger {
+    
     @SuppressWarnings("unchecked")
     /**
      * merges property value oldVal into property value newVal recursively
      * @param oldVal - cannot be {@code Null}
      */
-    protected Object mergeValues(Object oldVal, Object newVal, List<String> getInputNamesToMerge) {
+    protected Object merge(Object oldVal, Object newVal, List<String> inputNamesToMerge, String type, String innerType, Map<String, DataTypeDefinition> dataTypes) {
         if (isEmptyValue(newVal)) {
-            return removeUnwantedGetInputValues(oldVal, getInputNamesToMerge);
+            return removeUnwantedGetInputValues(oldVal, inputNamesToMerge);
         }
         if (isMapTypeValues(oldVal, newVal)) {
-            return mergeMapValue((Map<String, Object>) oldVal, (Map<String, Object>) newVal, getInputNamesToMerge);
+            return mergeMapValue((Map<String, Object>) oldVal, (Map<String, Object>) newVal, inputNamesToMerge, type, innerType, dataTypes);
         }
         if (isListTypeValues(oldVal, newVal)) {
-            return mergeListValue((List<Object>) oldVal, (List<Object>) newVal, getInputNamesToMerge);
+            return mergeListValue((List<Object>) oldVal, (List<Object>) newVal, inputNamesToMerge, innerType, dataTypes);
         }
         if (isSameTypeValues(oldVal, newVal)) {
             return mergeScalarValue(oldVal, newVal);
         }
         return newVal;
-
     }
-
-    private Map<String, Object> mergeMapValue(Map<String, Object> oldValMap, Map<String, Object> newValMap, List<String> getInputNamesToMerge) {
-        mergeEntriesExistInNewValue(oldValMap, newValMap, getInputNamesToMerge);//continue the recursion
-        setOldEntriesNotExistInNewValue(oldValMap, newValMap, getInputNamesToMerge);
+    
+    private Map<String, Object> mergeMapValue(Map<String, Object> oldValMap, Map<String, Object> newValMap, List<String> inputNamesToMerge, String type, String innertType, Map<String, DataTypeDefinition> dataTypes) {
+        mergeEntriesExistInOldValue(oldValMap, newValMap, inputNamesToMerge, type, innertType, dataTypes);//continue the recursion
+        if (type != null && !type.equals("map")) {
+            setOldEntriesNotExistInNewValue(oldValMap, newValMap, inputNamesToMerge);
+        }
+        
         return newValMap;
     }
 
-    private void mergeEntriesExistInNewValue(Map<String, Object> oldValMap, Map<String, Object> newValMap, List<String> getInputNamesToMerge) {
+    private void mergeEntriesExistInOldValue(Map<String, Object> oldValMap, Map<String, Object> newValMap, List<String> inputNamesToMerge, String type, String innerType, Map<String, DataTypeDefinition> dataTypes) {
         for (Map.Entry<String, Object> newValEntry : newValMap.entrySet()) {
             Object oldVal = oldValMap.get(newValEntry.getKey());
             if (oldVal != null) {
-                newValMap.put(newValEntry.getKey(), merge(oldVal, newValEntry.getValue(), getInputNamesToMerge));
+                ImmutablePair<String, String> types = getTypeAndInnerTypePair(newValEntry.getKey(), type, innerType, dataTypes);
+                newValMap.put(newValEntry.getKey(), merge(oldVal, newValEntry.getValue(), inputNamesToMerge, types.getLeft(), types.getRight(), dataTypes));
             }
         }
     }
-
+    
     private void setOldEntriesNotExistInNewValue(Map<String, Object> oldVal, Map<String, Object> newVal, List<String> getInputNamesToMerge) {
         for (Map.Entry<String, Object> oldValEntry : oldVal.entrySet()) {
-            if (!isGetInputEntry(oldValEntry) || isGetInputToMerge(getInputNamesToMerge, oldValEntry)) {
+            if (!isInputEntry(oldValEntry) || isInputToMerge(getInputNamesToMerge, oldValEntry)) {
                 Object oldValObj = oldValEntry.getValue();
                 newVal.computeIfAbsent(oldValEntry.getKey(), key -> removeUnwantedGetInputValues(oldValObj, getInputNamesToMerge));
             }
         }
     }
-
-    private List<Object> mergeListValue(List<Object> oldVal, List<Object> newVal, List<String> getInputNamesToMerge) {
-        List<Object> mergedList = mergeLists(oldVal, newVal, getInputNamesToMerge);
-        copyRestOfBiggerList(oldVal, newVal, getInputNamesToMerge, mergedList);
-        return mergedList;
+    
+    private ImmutablePair<String, String> getTypeAndInnerTypePair(String propName, String type, String innerType, Map<String, DataTypeDefinition> dataTypes) {
+        if (type == null || (ToscaPropertyType.isScalarType(type) && ToscaPropertyType.isScalarType(innerType))) {
+            return ImmutablePair.of(innerType, null);
+        }
+        
+        String newInnerType = null;
+        DataTypeDefinition innerTypeDef = dataTypes.get(type);
+        if (innerTypeDef != null) {
+            List<PropertyDefinition> properties = innerTypeDef.getProperties();
+            if (properties!= null) {
+                Optional<PropertyDefinition> optionalProperty = findProperty(properties, propName);
+                
+                innerType = optionalProperty.map(PropertyDefinition::getType)
+                                            .orElse(innerType);
+                
+                newInnerType = optionalProperty.map(PropertyDefinition::getSchemaType)
+                                               .orElse(null);
+            }
+        }
+                
+        return ImmutablePair.of(innerType, newInnerType);
+    }
+    
+    private Optional<PropertyDefinition> findProperty(List<PropertyDefinition> properties, String propName) {
+        return properties.stream()
+                .filter(p -> propName.equals(p.getName()))
+                .findFirst();
     }
 
-    private void copyRestOfBiggerList(List<Object> oldVal, List<Object> newVal, List<String> getInputNamesToMerge, List<Object> mergedList) {
+    private List<Object> mergeListValue(List<Object> oldVal, List<Object> newVal, List<String> inputNamesToMerge, String innerType, Map<String, DataTypeDefinition> dataTypes) {
+        List<Object> mergedList = newVal;
+    
         if (oldVal.size() == newVal.size()) {
-            return;
-        }
-        int maxListSize = Math.max(oldVal.size(), newVal.size());
-        List<Object> greaterList = newVal.size() == maxListSize ? newVal : oldVal;
-        for (int i = mergedList.size(); i < maxListSize; i ++) {
-            Object listVal = greaterList.get(i);
-            Object listValToMerge = greaterList == oldVal ? removeUnwantedGetInputValues(listVal, getInputNamesToMerge) : listVal;
-            mergedList.add(listValToMerge);
+            mergedList = mergeLists(oldVal, newVal, inputNamesToMerge, innerType, dataTypes);
         }
+
+        return mergedList;
     }
+    
 
-    private List<Object> mergeLists(List<Object> oldVal, List<Object> newVal, List<String> getInputNamesToMerge) {
+    private List<Object> mergeLists(List<Object> oldVal, List<Object> newVal, List<String> inputNamesToMerge, String innerType, Map<String, DataTypeDefinition> dataTypes) {
         int minListSize = Math.min(oldVal.size(), newVal.size());
         List<Object> mergedList = new ArrayList<>();
         for (int i = 0; i < minListSize; i++) {
-            Object mergedVal = merge(oldVal.get(i), newVal.get(i), getInputNamesToMerge);
+            Object mergedVal = merge(oldVal.get(i), newVal.get(i), inputNamesToMerge, innerType, null, dataTypes);
             mergedList.add(mergedVal);
         }
         return mergedList;
     }
-
-    Object mergeScalarValue(Object oldVal, Object newVal) {
+    
+    
+    private Object mergeScalarValue(Object oldVal, Object newVal) {
         return isEmptyValue(newVal) ? oldVal : newVal;
     }
+    
+    static boolean isEmptyValue(Object val) {
+        return val == null ||
+               val instanceof String && StringUtils.isEmpty((String)val) ||
+               val instanceof Map && ((Map<?,?>) val).isEmpty() ||
+               val instanceof List && ((List<?>) val).isEmpty();
 
+    }
+    
     @SuppressWarnings("unchecked")
-    Object removeUnwantedGetInputValues(Object val, List<String> getInputNamesToMerge) {
+    Object removeUnwantedGetInputValues(Object val, List<String> inputNamesToMerge) {
         if (val instanceof  Map) {
-            return removeUnwantedGetInputValues((Map<String, Object>) val, getInputNamesToMerge);
+            return removeUnwantedGetInputValues((Map<String, Object>) val, inputNamesToMerge);
         }
         if (val instanceof List) {
-            return removeUnwantedGetInputValues((List<Object>)val, getInputNamesToMerge);
+            return removeUnwantedGetInputValues((List<Object>)val, inputNamesToMerge);
         }
         return val;
     }
 
-    private List<Object> removeUnwantedGetInputValues(List<Object> listVal, List<String> getInputNamesToMerge) {
-        return listVal.stream().map(val -> removeUnwantedGetInputValues(val, getInputNamesToMerge)).collect(Collectors.toList());
+    private List<Object> removeUnwantedGetInputValues(List<Object> listVal, List<String> inputNamesToMerge) {
+        return listVal.stream().map(val -> removeUnwantedGetInputValues(val, inputNamesToMerge)).collect(Collectors.toList());
     }
 
-    private Map<String, Object> removeUnwantedGetInputValues(Map<String, Object> val, List<String> getInputNamesToMerge) {
-        return val.entrySet().stream().filter(entry -> !isGetInputEntry(entry) || isGetInputToMerge(getInputNamesToMerge, entry))
-                .collect(Collectors.toMap(Map.Entry::getKey, entry -> removeUnwantedGetInputValues(entry.getValue(), getInputNamesToMerge)));
+    private Map<String, Object> removeUnwantedGetInputValues(Map<String, Object> val, List<String> inputNamesToMerge) {
+        return val.entrySet().stream().filter(entry -> !isInputEntry(entry) || isInputToMerge(inputNamesToMerge, entry))
+                .collect(Collectors.toMap(Map.Entry::getKey, entry -> removeUnwantedGetInputValues(entry.getValue(), inputNamesToMerge)));
     }
 
-    private boolean isGetInputToMerge(List<String> getInputNamesToMerge, Map.Entry<String, Object> entry) {
-        return getInputNamesToMerge.contains(retrieveGetInputInputName(entry.getValue()));
+    private boolean isInputToMerge(List<String> inputNamesToMerge, Map.Entry<String, Object> entry) {
+        return inputNamesToMerge.contains(retrieveInputName(entry.getValue()));
     }
 
     private boolean isMapTypeValues(Object oldVal, Object newVal) {
@@ -127,22 +165,13 @@ public abstract class PropertyValueMerger {
         return oldVal.getClass().equals(newVal.getClass());
     }
 
-    private String retrieveGetInputInputName(Object getInputValue) {
-        return getInputValue instanceof List ? (String)((List) getInputValue).get(0) : (String)getInputValue;
-    }
-
-    private boolean isGetInputEntry(Map.Entry<String, Object> oldValEntry) {
-        return oldValEntry.getKey().equals(ImportUtils.ToscaTagNamesEnum.GET_INPUT.getElementName());
+    private String retrieveInputName(Object inputValue) {
+        return inputValue instanceof List ? (String)((List<?>) inputValue).get(0) : (String)inputValue;
     }
 
-    private boolean isEmptyValue(Object val) {
-        return val == null ||
-               val instanceof String && StringUtils.isEmpty((String)val) ||
-               val instanceof Map && ((Map) val).isEmpty() ||
-               val instanceof List && ((List) val).isEmpty();
-
-
+    protected boolean isInputEntry(Map.Entry<String, Object> oldValEntry) {
+        return oldValEntry.getKey().equals(TypeUtils.ToscaTagNamesEnum.GET_INPUT.getElementName());
     }
-
-
+    
+    
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ScalarPropertyValueMerger.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ScalarPropertyValueMerger.java
deleted file mode 100644
index 39381e7322..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/ScalarPropertyValueMerger.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.openecomp.sdc.be.components.merge.property;
-
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
-@Component("scalar-prop-value-merger")
-public class ScalarPropertyValueMerger extends PropertyValueMerger {
-
-    private final static ScalarPropertyValueMerger INSTANCE = new ScalarPropertyValueMerger();
-
-    public static PropertyValueMerger getInstance() {
-        return INSTANCE;
-    }
-
-    @Override
-    Object merge(Object oldVal, Object newVal, List<String> getInputNamesToMerge) {
-        return mergeScalarValue(removeUnwantedGetInputValues(oldVal, getInputNamesToMerge), newVal);
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/MergeCommandsFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/MergeCommandsFactory.java
new file mode 100644
index 0000000000..4ebad2db2c
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/MergeCommandsFactory.java
@@ -0,0 +1,33 @@
+package org.openecomp.sdc.be.components.merge.resource;
+
+import fj.data.Either;
+import org.openecomp.sdc.be.components.merge.ComponentsGlobalMergeCommand;
+import org.openecomp.sdc.be.components.merge.ComponentsMergeCommand;
+import org.openecomp.sdc.be.components.merge.TopologyComparator;
+import org.openecomp.sdc.be.components.merge.VspComponentsMergeCommand;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.Resource;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class MergeCommandsFactory {
+
+    private final List<ComponentsGlobalMergeCommand> globalMergeCommands;
+    private final List<VspComponentsMergeCommand> mergeCommands;
+    private final TopologyComparator topologyComparator;
+
+    public MergeCommandsFactory(List<ComponentsGlobalMergeCommand> globalMergeCommands, List<VspComponentsMergeCommand> mergeCommands, TopologyComparator topologyComparator) {
+        this.globalMergeCommands = globalMergeCommands;
+        this.mergeCommands = mergeCommands;
+        this.topologyComparator = topologyComparator;
+    }
+
+    public Either<List<? extends ComponentsMergeCommand>, ActionStatus> getMergeCommands(Resource prevResource, Resource currResource) {
+        return topologyComparator.isTopologyChanged(prevResource, currResource)
+                .left()
+                .map(topologyChanged -> topologyChanged ? globalMergeCommands : mergeCommands);
+
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/MergeResourceBLFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/MergeResourceBLFactory.java
deleted file mode 100644
index 9d11eb9aaf..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/MergeResourceBLFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.openecomp.sdc.be.components.merge.resource;
-
-
-import org.openecomp.sdc.be.components.merge.GlobalTypesMergeBusinessLogic;
-import org.openecomp.sdc.be.components.merge.TopologyComparator;
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.model.Resource;
-import org.springframework.stereotype.Component;
-
-import fj.data.Either;
-
-@Component
-public class MergeResourceBLFactory {
-
-    @javax.annotation.Resource
-    private ResourceDataMergeBusinessLogic resourceDataMergeBusinessLogic;
-
-    @javax.annotation.Resource
-    private GlobalTypesMergeBusinessLogic globalTypesMergeBusinessLogic;
-
-    @javax.annotation.Resource
-    private TopologyComparator topologyComparator;
-
-    public Either<MergeResourceBusinessLogic, ActionStatus> getInstance(Resource oldResource, Resource newResource) {
-        Either<Boolean, ActionStatus> isTopologyChangeEither = topologyComparator.isTopologyChanged(oldResource, newResource);
-        return isTopologyChangeEither.bimap(this::getInstance, actionStatus -> actionStatus);
-    }
-
-    private MergeResourceBusinessLogic getInstance(boolean topologyChanged) {
-        return topologyChanged ? globalTypesMergeBusinessLogic : resourceDataMergeBusinessLogic;
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogic.java
index f9901222c9..9f2d96bf0e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/resource/ResourceDataMergeBusinessLogic.java
@@ -1,23 +1,25 @@
 package org.openecomp.sdc.be.components.merge.resource;
 
-import java.util.List;
-
-import org.openecomp.sdc.be.components.merge.instance.ComponentsMergeCommand;
+import org.openecomp.sdc.be.components.merge.ComponentsMergeCommand;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public class ResourceDataMergeBusinessLogic implements MergeResourceBusinessLogic {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ResourceDataMergeBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(ResourceDataMergeBusinessLogic.class);
+    public static final int FIRST_COMMAND = 0;
+    public static final int LAST_COMMAND = Integer.MAX_VALUE;
+    public static final int ANY_ORDER_COMMAND = 1;
 
-    private List<ComponentsMergeCommand> componentMergingCommands;
+    private MergeCommandsFactory mergeCommandsFactory;
 
-    public ResourceDataMergeBusinessLogic(List<ComponentsMergeCommand> componentMergingCommands) {
-        this.componentMergingCommands = componentMergingCommands;
+    public ResourceDataMergeBusinessLogic(MergeCommandsFactory mergeCommandsFactory) {
+        this.mergeCommandsFactory = mergeCommandsFactory;
     }
 
     @Override
@@ -25,10 +27,16 @@ public class ResourceDataMergeBusinessLogic implements MergeResourceBusinessLogi
         if (oldResource == null) {
             return ActionStatus.OK;
         }
+        return mergeCommandsFactory.getMergeCommands(oldResource, newResource)
+                .either(mergeCommands -> executeMergeCommands(oldResource, newResource, mergeCommands),
+                        err -> err);
+    }
+
+    private ActionStatus executeMergeCommands(Resource oldResource, Resource newResource, List<? extends ComponentsMergeCommand> componentMergingCommands) {
         for (ComponentsMergeCommand componentMergeCommand : componentMergingCommands) {
             ActionStatus mergeStatus = componentMergeCommand.mergeComponents(oldResource, newResource);
             if (mergeStatus != ActionStatus.OK) {
-                LOGGER.error("failed on merge command {} of resource {} status is {}", componentMergeCommand.description(), newResource.getUniqueId(), mergeStatus);
+                log.error("failed on merge command {} of resource {} status is {}", componentMergeCommand.description(), newResource.getUniqueId(), mergeStatus);
                 return mergeStatus;
             }
         }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/CapabilityOwner.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/CapabilityOwner.java
new file mode 100644
index 0000000000..fa59200b42
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/CapabilityOwner.java
@@ -0,0 +1,33 @@
+package org.openecomp.sdc.be.components.merge.utils;
+
+import org.openecomp.sdc.be.model.CapabilityDefinition;
+
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.emptyMap;
+
+public class CapabilityOwner {
+
+    private String uniqueId;
+    private String name;
+    private Map<String, List<CapabilityDefinition>> capabilities;
+
+    public CapabilityOwner(String uniqueId, String name, Map<String, List<CapabilityDefinition>> capabilities) {
+        this.uniqueId = uniqueId;
+        this.name = name;
+        this.capabilities = capabilities;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Map<String, List<CapabilityDefinition>> getCapabilities() {
+        return capabilities == null ? emptyMap() : capabilities;
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/ComponentInstanceBuildingBlocks.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/ComponentInstanceBuildingBlocks.java
new file mode 100644
index 0000000000..9b2bb93ad1
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/ComponentInstanceBuildingBlocks.java
@@ -0,0 +1,67 @@
+package org.openecomp.sdc.be.components.merge.utils;
+
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.GroupDefinition;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.openecomp.sdc.be.dao.utils.MapUtil.mergeMaps;
+import static org.openecomp.sdc.be.dao.utils.MapUtil.toMap;
+
+public class ComponentInstanceBuildingBlocks {
+
+    private Map<String, GroupDefinition> groups = new HashMap<>();
+    private Map<String, ComponentInstance> vfcInstances = new HashMap<>();
+
+    private ComponentInstanceBuildingBlocks(){}
+
+    private ComponentInstanceBuildingBlocks(List<GroupDefinition> groups, List<ComponentInstance> vfcInstances) {
+        this.groups = groups == null ? new HashMap<>() : toMap(groups, GroupDataDefinition::getUniqueId);
+        this.vfcInstances = vfcInstances == null ? new HashMap<>() : toMap(vfcInstances, ComponentInstance::getUniqueId);
+    }
+
+    private ComponentInstanceBuildingBlocks(Map<String, GroupDefinition> groups,  Map<String, ComponentInstance> vfcInstances) {
+        this.groups = groups == null ? new HashMap<>() : groups;
+        this.vfcInstances = vfcInstances == null ? new HashMap<>() : vfcInstances;
+    }
+
+    static ComponentInstanceBuildingBlocks of(List<GroupDefinition> groups, List<ComponentInstance> instances) {
+        return new ComponentInstanceBuildingBlocks(groups, instances);
+    }
+
+    static ComponentInstanceBuildingBlocks empty() {
+        return new ComponentInstanceBuildingBlocks();
+    }
+
+
+    @SuppressWarnings("unchecked")
+    static ComponentInstanceBuildingBlocks merge(ComponentInstanceBuildingBlocks first, ComponentInstanceBuildingBlocks second) {
+        return new ComponentInstanceBuildingBlocks(mergeMaps(first.groups, second.groups),
+                                                   mergeMaps(first.vfcInstances, second.vfcInstances));
+    }
+
+    public List<GroupDefinition> getGroups() {
+        return new ArrayList<>(groups.values());
+    }
+
+    public List<ComponentInstance> getVfcInstances() {
+        return new ArrayList<>(vfcInstances.values());
+    }
+
+    public List<CapabilityOwner> getCapabilitiesOwners() {
+        Stream<CapabilityOwner> groupsStream = groups.values().stream()
+                .map(grp -> new CapabilityOwner(grp.getUniqueId(), grp.getInvariantName(), grp.getCapabilities()));
+
+        Stream<CapabilityOwner> instanceStream = vfcInstances.values().stream()
+                .map(instance -> new CapabilityOwner(instance.getUniqueId(), instance.getName(), instance.getCapabilities()));
+
+        return Stream.concat(groupsStream, instanceStream).collect(Collectors.toList());
+    }
+    
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/MergeInstanceUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/MergeInstanceUtils.java
index 132ad10f42..06da9ecd98 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/MergeInstanceUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/utils/MergeInstanceUtils.java
@@ -1,49 +1,50 @@
 package org.openecomp.sdc.be.components.merge.utils;
 
-import static java.util.function.Function.identity;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
+import org.openecomp.sdc.be.components.merge.instance.RelationMergeInfo;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import com.google.common.annotations.VisibleForTesting;
+import java.util.*;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static org.openecomp.sdc.be.dao.utils.MapUtil.toMap;
 
 /**
  * This class is Utils class but it should be bean
  * @author dr2032
  *
  */
-@org.springframework.stereotype.Component("MergeInstanceUtils")
+@org.springframework.stereotype.Component
 public class MergeInstanceUtils {
-    private Logger log = LoggerFactory.getLogger(MergeInstanceUtils.class);
+    private static final Logger log = Logger.getLogger(MergeInstanceUtils.class);
     
-    @Autowired
-    private ToscaOperationFacade toscaOperationFacade;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ExceptionUtils exceptionUtils;
+
+    public MergeInstanceUtils(ToscaOperationFacade toscaOperationFacade, ExceptionUtils exceptionUtils) {
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.exceptionUtils = exceptionUtils;
+    }
 
     /**
-     * Maps capability owner IDs of old component instance to capability owner IDs of the new component instance
      * @param container containing new component instance
      * @param origInstanceNode old component (in case of PROXY it should be actual service)
      * @param newInstanceId - ID of new instance of the component
-     * @param oldCapabilitiesOwnerIds
-     * @return
+     * @param oldCapabilitiesOwnerIds the old capabilities owner ids
+     * @return a map of capability owner IDs of old component instance to capability owner IDs of the new component instance
      */
     public Map<String, String> mapOldToNewCapabilitiesOwnerIds(Component container,
                                                                Component origInstanceNode,
@@ -62,148 +63,314 @@ public class MergeInstanceUtils {
         return resultMap;
     }
 
-
-    private static boolean isCVFC(Component component) {
-        ComponentTypeEnum componentType = component.getComponentType();
-        if (!componentType.equals(ComponentTypeEnum.RESOURCE)) {
-            return false;
-        }
-
-        Resource resource = (Resource) component;
-        ResourceTypeEnum resourceType = resource.getResourceType();
-        return resourceType == ResourceTypeEnum.CVFC;
-    }
-
-
     /**
-     * Maps capability owner IDs of old component instance to capability owner IDs of the new component instance
-     * @param oldInstance
-     * @param newInstance
-     * @return
+     * @param oldInstance the old instance to find its capabilities owner ids
+     * @param newInstance the new instance to find its capabilities owner ids
+     * @return a map between capability owner IDs of old component instance to capability owner IDs of the new component instance
      */
     public Map<String, String> mapOldToNewCapabilitiesOwnerIds(ComponentInstance oldInstance, ComponentInstance newInstance) {
-        List<ComponentInstance> oldVfcInstances  = getVfcInstances(oldInstance);
-        List<ComponentInstance> newVfcInstances  = getVfcInstances(newInstance);
-
-        Map<String, ComponentInstance> newVfciNameMap = convertToVfciNameMap(newVfcInstances);
-
-        return oldVfcInstances.stream()
-                            .filter(oldVfci -> newVfciNameMap.containsKey(oldVfci.getName()))
-                            .collect(Collectors.toMap(ComponentInstance::getUniqueId, oldVfci -> newVfciNameMap.get(oldVfci.getName()).getUniqueId()));
+        List<CapabilityOwner> prevCapabilityOwners  = getInstanceAtomicBuildingBlocks(oldInstance).getCapabilitiesOwners();
+        List<CapabilityOwner> newCapOwners  = getInstanceAtomicBuildingBlocks(newInstance).getCapabilitiesOwners();
+        return getCapabilitiesOwnerMapping(prevCapabilityOwners, newCapOwners);
     }
 
-
     /**
-     * Method converts list of Component Instances to map of the instances where the key is their name
-     * @param componentInstances
-     * @return
+     * @param oldResource - old version of the Resource
+     * @param newResource - new version of the same Resource
+     * @return list of updated Relations created in UI
      */
-    public Map<String, ComponentInstance> convertToVfciNameMap(List<ComponentInstance> componentInstances) {
-        return componentInstances != null ?
-                componentInstances.stream()
-                            .collect(Collectors.toMap(ComponentInstance::getName, identity())): Collections.emptyMap();
+    public List<RequirementCapabilityRelDef> updateUiRelationsInResource(Resource oldResource, Resource newResource) {
+        Map<String, ComponentInstance> mapOldComponentInstances = buildComponentInstanceMap(oldResource, ComponentInstance::getUniqueId);
+        Map<String, ComponentInstance> mapNewComponentInstances = buildComponentInstanceMap(newResource, ComponentInstance::getName);
+
+        return getUpdatedCapReqDefs(oldResource,
+                mapOldComponentInstances,
+                mapNewComponentInstances,
+                RequirementCapabilityRelDef::isOriginUI);
     }
 
-
-    
     /**
-     * Returns List of componentInstances by specified componentInstance
-     * If componentInstance is for atomic component the returned list will contain the specified componentInstance only.
-     * @param componentInstance
-     * @return
+     *
+     * @param componentInstance the instance which its building blocks are to be returned
+     * @return the atomic building (groups and instances) blocks which the given component instance is a composition of
      */
-    public List<ComponentInstance> getVfcInstances(ComponentInstance componentInstance) {
+    public ComponentInstanceBuildingBlocks getInstanceAtomicBuildingBlocks(ComponentInstance componentInstance) {
         if (componentInstance == null) {
-            return Collections.emptyList();
+            return ComponentInstanceBuildingBlocks.empty();
         }
-
-
-        List<ComponentInstance> vfcInstances;
-
         String componentId = componentInstance.getActualComponentUid();
-        Either<Component, StorageOperationStatus> eitherComponent = toscaOperationFacade.getToscaElement(componentId);
+        Component component = toscaOperationFacade.getToscaElement(componentId).left().on(err -> exceptionUtils.rollBackAndThrow(err, componentId));
+        return getInstanceAtomicBuildingBlocks(componentInstance, component);
+    }
 
-        if(eitherComponent.isLeft()) {
-            Component component = eitherComponent.left().value();
-            vfcInstances = getVfcInstances(componentInstance, component);
+    /**
+     *
+     * @param componentInstance the instance which its building blocks are to be returned
+     * @param component the type thar the given component instance was created from
+     * @return the atomic building blocks (groups and instances) which the given component instance is a composition of
+     */
+    public ComponentInstanceBuildingBlocks getInstanceAtomicBuildingBlocks(ComponentInstance componentInstance, Component component) {
+        if (componentInstance == null || component == null) {
+            return ComponentInstanceBuildingBlocks.empty();
+        }
+        ComponentInstanceBuildingBlocks instanceBuildingBlocks;
+        if (ModelConverter.isAtomicComponent(component) || isCVFC(component)) {
+            if (componentInstance.getIsProxy()) {
+                // Component is proxy and it doesn't contain required data
+                instanceBuildingBlocks = getInstanceAtomicBuildingBlocks(componentInstance);
+            }
+            else {
+                instanceBuildingBlocks = ComponentInstanceBuildingBlocks.of(new ArrayList<>(), singletonList(componentInstance));
+            }
         }
         else {
-            log.debug("Unexpected error: resource was not loaded for VF ID: {}", componentId);
-            vfcInstances =  Collections.emptyList();
+            instanceBuildingBlocks = recursiveScanForAtomicBuildingBlocks(component);
         }
+        return instanceBuildingBlocks;
+    }
 
-        return vfcInstances;
+    public RelationMergeInfo mapRelationCapability(RequirementCapabilityRelDef relDef, List<CapabilityOwner> capsOwners) {
+        String ownerId = relDef.resolveSingleRelationship().getRelation().getCapabilityOwnerId();
+        return createCapabilityRelationMergeInfo(capsOwners, ownerId, relDef);
     }
 
+    public RelationMergeInfo mapRelationRequirement(RequirementCapabilityRelDef relDef, List<ComponentInstance> vfcInstances) {
+        String ownerId = relDef.resolveSingleRelationship().getRelation().getRequirementOwnerId();
+        return createRequirementRelationMergeInfo(vfcInstances, ownerId, relDef);
+    }
 
-    /**
-     * Returns List of componentInstances by specified componentInstance and component
-     * If componentInstance is for atomic component the returned list will contain the specified componentInstance only.
-     * @param componentInstance
-     * @param eitherComponent
-     * @return
-     */
-    public List<ComponentInstance> getVfcInstances(ComponentInstance componentInstance, Component component) {
-        if (componentInstance == null || component == null) {
-            return Collections.emptyList();
+
+    public RequirementCapabilityRelDef restoreCapabilityRelation(RelationMergeInfo oldCapInfo,
+                                                                 String newInstanceId,
+                                                                 Map<String, CapabilityOwner> capOwnerByName,
+                                                                 Component updatedContainerComponent) {
+        String oldCapOwnerName = oldCapInfo.getCapOwnerName();
+
+        CapabilityOwner newCapOwner = capOwnerByName.get(oldCapOwnerName);
+        if (newCapOwner != null) {
+            // Append relation to updated container
+            RequirementCapabilityRelDef oldRelDef = oldCapInfo.getRelDef();
+            oldRelDef.setToNode(newInstanceId);
+            RelationshipInfo oldRelationshipInfo = oldRelDef.resolveSingleRelationship().getRelation();
+            oldRelationshipInfo.setCapabilityOwnerId(newCapOwner.getUniqueId());
+            oldRelationshipInfo.getRelationship().setType(oldCapInfo.getCapReqType());
+            String capabilityUid = retrieveCapabilityUid(oldCapInfo.getCapReqName(), newCapOwner);
+            oldRelationshipInfo.setCapabilityUid(capabilityUid);
+            if (updatedContainerComponent != null) {
+                updatedContainerComponent.getComponentInstancesRelations().add(oldRelDef);
+            }
+            return oldRelDef;
+        } else {
+            log.debug("#restoreCapabilityRelation - Skip relation since it was not found VFC Instance with name {}", oldCapOwnerName);
+            return null;
         }
+    }
 
 
-        List<ComponentInstance> vfcInstances;
 
-        if (ModelConverter.isAtomicComponent(component) || isCVFC(component)) {
-            if (componentInstance.getIsProxy()) {
-                // Component is proxy and it doesn't contain required data
-                vfcInstances = getVfcInstances(componentInstance);
+    public RequirementCapabilityRelDef restoreRequirementRelation(RelationMergeInfo oldReqInfo,
+                                                                  String newInstanceId,
+                                                                  Map<String, ComponentInstance> vfciMap,
+                                                                  Component updatedContainerComponent) {
+        String oldVfcInstanceName = oldReqInfo.getCapOwnerName();
+
+        ComponentInstance newVfcInstance = vfciMap.get(oldReqInfo.getCapOwnerName());
+        if (newVfcInstance != null) {
+            // Append relation to updated container
+            RequirementCapabilityRelDef oldRelDef = oldReqInfo.getRelDef();
+            oldRelDef.setFromNode(newInstanceId);
+
+            RelationshipInfo oldRelationshipInfo = oldRelDef.resolveSingleRelationship().getRelation();
+            oldRelationshipInfo.setRequirementOwnerId(newVfcInstance.getUniqueId());
+            oldRelationshipInfo.getRelationship().setType(oldReqInfo.getCapReqType());
+
+            String vfcUid = newVfcInstance.getComponentUid();
+            Either<Component, StorageOperationStatus> eitherComponent = toscaOperationFacade.getToscaElement(vfcUid);
+
+            if(eitherComponent.isLeft()) {
+                String requirementUid = retrieveRequirementUid(oldReqInfo.getCapReqName() , eitherComponent.left().value());
+                oldRelationshipInfo.setRequirementUid(requirementUid);
             }
             else {
-                vfcInstances = Arrays.asList(componentInstance);
+                log.debug("#restoreRequirementCapabilityRelDef - Unexpected error: resource was not loaded for VF ID: {}", vfcUid);
+            }
+
+            if (updatedContainerComponent != null) {
+                updatedContainerComponent.getComponentInstancesRelations().add(oldRelDef);
             }
+            return oldRelDef;
         }
         else {
-            vfcInstances = recursiveScanForAtomicComponentInstances(component);
+            log.debug("#restoreRequirementCapabilityRelDef - Skip relation since it was not found VFC Instance with name {}", oldVfcInstanceName);
+            return null;
         }
+    }
 
-        return vfcInstances;
+    private List<ComponentInstance> getVfcInstances(ComponentInstance componentInstance) {
+        return getInstanceAtomicBuildingBlocks(componentInstance).getVfcInstances();
     }
 
+    private Map<String, String> getCapabilitiesOwnerMapping(List<CapabilityOwner> oldCapOwners, List<CapabilityOwner> newCapOwners) {
+        Map<String, CapabilityOwner> newCapOwnerNameMap = toMap(newCapOwners, CapabilityOwner::getName, (p1, p2) -> p1);
+        return oldCapOwners.stream()
+                .filter(oldCapOwner -> newCapOwnerNameMap.containsKey(oldCapOwner.getName()))
+                .collect(Collectors.toMap(CapabilityOwner::getUniqueId, oldCapOwner -> newCapOwnerNameMap.get(oldCapOwner.getName()).getUniqueId(), (p1, p2) -> p1));
+    }
 
-    @VisibleForTesting
-    public void setToscaOperationFacade(ToscaOperationFacade toscaOperationFacade) {
-        this.toscaOperationFacade = toscaOperationFacade;
+    private static boolean isCVFC(Component component) {
+        ComponentTypeEnum componentType = component.getComponentType();
+        if (!componentType.equals(ComponentTypeEnum.RESOURCE)) {
+            return false;
+        }
+        Resource resource = (Resource) component;
+        ResourceTypeEnum resourceType = resource.getResourceType();
+        return resourceType == ResourceTypeEnum.CVFC;
+    }
+
+
+    private RequirementCapabilityRelDef mergeCapRelDefs(RequirementCapabilityRelDef capRelDefFrom, RequirementCapabilityRelDef capRelDefTo) {
+        if (capRelDefFrom == capRelDefTo) {
+            return capRelDefFrom;
+        }
+        else if (capRelDefFrom == null) {
+            return capRelDefTo;
+        }
+        else if (capRelDefTo == null) {
+            return capRelDefFrom;
+        }
+        
+        RelationshipInfo relationshipInfoFrom = capRelDefFrom.resolveSingleRelationship().getRelation();
+        RelationshipInfo relationshipInfoTo = capRelDefTo.resolveSingleRelationship().getRelation();
+        
+        relationshipInfoFrom.setCapabilityOwnerId(relationshipInfoTo.getCapabilityOwnerId());
+        relationshipInfoFrom.setCapabilityUid(relationshipInfoTo.getCapabilityUid());
+        
+        return capRelDefFrom;
     }
+    
 
 
+    private Map<String, ComponentInstance> buildComponentInstanceMap(Resource oldRresource, Function<ComponentInstance, String> getKeyFunc) {
+        return oldRresource.getComponentInstances().stream()
+                .collect(Collectors.toMap(getKeyFunc, Function.identity(), (p1, p2) -> p1));
+    }
 
-    /**
-     * @param component
-     * @return
-     */
-    private List<ComponentInstance> recursiveScanForAtomicComponentInstances(Component component) {
-        List<ComponentInstance> vfcInstances;
-
-        List<ComponentInstance> componentInstances = component.getComponentInstances();
-        if (componentInstances != null) {
-            // Go recursively to collect atomic components only
-            vfcInstances = componentInstances.stream()
-                                             .map(this::getVfcInstances)
-                                             .flatMap(List::stream)
-                                             .collect(Collectors.toList());
+    private List<RequirementCapabilityRelDef> getUpdatedCapReqDefs(Resource oldResource,
+                                                                   Map<String, ComponentInstance> mapOldComponentInstances,
+                                                                   Map<String, ComponentInstance> mapNewComponentInstances,
+                                                                   Predicate<? super RequirementCapabilityRelDef> filter) {
+        return oldResource.getComponentInstancesRelations().stream()
+                        .filter(filter)
+                        .map(rel -> createRelationMergeInfoPair(rel, mapOldComponentInstances))
+                        .map(infoPair -> restoreRequirementCapabilityRelDef(infoPair, mapNewComponentInstances))
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList());
+    }
+
+    private ImmutablePair<RelationMergeInfo, RelationMergeInfo> createRelationMergeInfoPair(RequirementCapabilityRelDef reqCapDef,
+                                                                                            Map<String, ComponentInstance> mapOldComponentInstances) {
+        
+        ComponentInstance oldComponentInstanceFrom = mapOldComponentInstances.get(reqCapDef.getFromNode());
+        RelationMergeInfo fromRelationMergeInfo = createRequirmentRelationMergeInfo(oldComponentInstanceFrom, reqCapDef);
+        
+        ComponentInstance oldComponentInstanceTo = mapOldComponentInstances.get(reqCapDef.getToNode());
+        RelationMergeInfo toRelationMergeInfo = createCapabilityRelationMergeInfo(oldComponentInstanceTo, reqCapDef);
+        return new ImmutablePair<>(fromRelationMergeInfo, toRelationMergeInfo);
+    }
+
+    private RelationMergeInfo createRequirmentRelationMergeInfo(ComponentInstance componentInstance, RequirementCapabilityRelDef reqCapDef ) {
+        
+        List<ComponentInstance> vfcInstances = getVfcInstances(componentInstance);
+        if  (vfcInstances != null) { 
+            return mapRelationRequirement(reqCapDef, vfcInstances);
         }
         else {
-            vfcInstances = Collections.emptyList();
+            log.debug("#createRelationMergeInfo - It's unexpected that vfc instnaces were not found for {}", componentInstance);
+            return null;
         }
+    }
 
-        return vfcInstances;
+    private RelationMergeInfo createCapabilityRelationMergeInfo(ComponentInstance componentInstance,
+                                                      RequirementCapabilityRelDef reqCapDef) {
+        List<CapabilityOwner> capabilityOwners = getInstanceAtomicBuildingBlocks(componentInstance).getCapabilitiesOwners();
+        return mapRelationCapability(reqCapDef, capabilityOwners);
     }
 
+    
+    private RequirementCapabilityRelDef restoreRequirementCapabilityRelDef(ImmutablePair<RelationMergeInfo, RelationMergeInfo> mergeInfoPair, Map<String, ComponentInstance> mapNewComponentInstances) {
+        RequirementCapabilityRelDef capRelDefFrom = restoreRequirementRelDef(mergeInfoPair, mapNewComponentInstances);
+        RequirementCapabilityRelDef capRelDefTo = restoreCapabilityRelDef(mergeInfoPair, mapNewComponentInstances);
+
+        return mergeCapRelDefs(capRelDefFrom, capRelDefTo);
+    }
+
+    private RequirementCapabilityRelDef restoreRequirementRelDef(ImmutablePair<RelationMergeInfo, RelationMergeInfo> mergeInfoPair, Map<String, ComponentInstance> mapNewComponentInstances) {
+        RequirementCapabilityRelDef capRelDefFrom;
+        RelationMergeInfo mergeInfoFrom = mergeInfoPair.getLeft();
+        if (mergeInfoFrom != null) {
+            ComponentInstance newComponentInstanceFrom = mapNewComponentInstances.get(mergeInfoFrom.getCapOwnerName());
+            capRelDefFrom = restoreRequirementRelDef(newComponentInstanceFrom, mergeInfoFrom,  newComponentInstanceFrom.getUniqueId());
+        }
+        else {
+            capRelDefFrom = null;
+        }
+        return capRelDefFrom;
+    }
+
+    private RequirementCapabilityRelDef restoreCapabilityRelDef(ImmutablePair<RelationMergeInfo, RelationMergeInfo> mergeInfoPair, Map<String, ComponentInstance> mapNewComponentInstances) {
+        RequirementCapabilityRelDef capRelDefTo;
+        RelationMergeInfo mergeInfoTo = mergeInfoPair.getRight();
+        if (mergeInfoTo != null) {
+            ComponentInstance newComponentInstanceTo = mapNewComponentInstances.get(mergeInfoTo.getCapOwnerName());
+            capRelDefTo = restoreCapabilityRelDef(newComponentInstanceTo, mergeInfoTo, newComponentInstanceTo.getUniqueId());
+        }
+        else {
+            capRelDefTo = null;
+        }
+        return capRelDefTo;
+    }
+
+    private RequirementCapabilityRelDef  restoreRequirementRelDef(ComponentInstance newComponentInstance, RelationMergeInfo mergeInfoFrom, String newComponentInstanceFromId) {
+        if (newComponentInstance != null) {
+            List<ComponentInstance> vfcInstances = getVfcInstances(newComponentInstance);
+            if(vfcInstances != null) {
+                Map<String, ComponentInstance> vfciMap = toMap(vfcInstances, ComponentInstance::getName, (p1, p2) -> p1);
+                return restoreRequirementRelation(mergeInfoFrom, newComponentInstanceFromId, vfciMap, null);
+            }
+            else {
+                log.debug("#restoreRequirementCapabilityRelDef - It was not found VFC instances for component instance {}", newComponentInstance);
+            }
+        }
+        return null;
+    }
+
+    private RequirementCapabilityRelDef restoreCapabilityRelDef(ComponentInstance newComponentInstance, RelationMergeInfo mergeInfoTo, String newComponentInstanceToId) {
+        if (newComponentInstance != null) {
+            List<CapabilityOwner> capsOwners = getInstanceAtomicBuildingBlocks(newComponentInstance).getCapabilitiesOwners();
+            if(capsOwners != null) {
+                Map<String, CapabilityOwner> vfciMap = toMap(capsOwners, CapabilityOwner::getName, (p1, p2) -> p1);
+                return restoreCapabilityRelation(mergeInfoTo, newComponentInstanceToId, vfciMap, null);
+            }
+            else {
+                log.debug("#restoreRequirementCapabilityRelDef - It was not found VFC instances for component instance {}", newComponentInstance);
+            }
+        }
+        return null;
+    }
+
+
+    private ComponentInstanceBuildingBlocks recursiveScanForAtomicBuildingBlocks(Component component) {
+        ComponentInstanceBuildingBlocks capsOwners = ComponentInstanceBuildingBlocks.of(component.getGroups(), null);
+        List<ComponentInstance> componentInstances = component.safeGetComponentInstances();
+        // Go recursively to collect atomic components only
+        ComponentInstanceBuildingBlocks propsOwnersRec = componentInstances.stream()
+                .map(this::getInstanceAtomicBuildingBlocks)
+                .reduce(ComponentInstanceBuildingBlocks::merge)
+                .orElse(ComponentInstanceBuildingBlocks.empty());
+        return ComponentInstanceBuildingBlocks.merge(capsOwners, propsOwnersRec);
+    }
 
 
-    /**
-     * @param newInstanceId
-     * @param oldCapabilitiesOwnerIds
-     * @return
-     */
     private Map<String, String> prepareMapForAtomicComponent(String newInstanceId, List<String> oldCapabilitiesOwnerIds) {
         Map<String, String> resultMap;
 
@@ -213,51 +380,143 @@ public class MergeInstanceUtils {
             resultMap.put(oldCapabilitiesOwnerIds.get(0), newInstanceId);
         }
         else {
-            log.debug("For automic component the list of old capabilities owner Ids should contains one element while actual size is {},", oldCapabilityOwnerIdsSize);
-            resultMap = Collections.emptyMap();
+            log.debug("#prepareMapForAtomicComponent - For atomic component the list of old capabilities owner Ids should contains one element while actual size is {},", oldCapabilityOwnerIdsSize);
+            resultMap = emptyMap();
         }
 
         return resultMap;
     }
 
-    /**
-     * @param container
-     * @param origInstanceNode
-     * @param newInstanceId
-     * @param oldCapabilitiesOwnerIds
-     * @return
-     */
     private Map<String, String> prepareMapForNonAtomicComponent(Component container, Component origInstanceNode,
                                                                     String newInstanceId, List<String> oldCapabilitiesOwnerIds) {
-        Map<String, String> resultMap;
-        List<ComponentInstance> oldVfcInstances = recursiveScanForAtomicComponentInstances(origInstanceNode);
-
         ComponentInstance newInstance = container.getComponentInstanceById(newInstanceId).orElse(null);
         if (newInstance == null) {
-            log.debug("Failed to get component instance by newInstanceId: {}.", newInstanceId);
-            resultMap = Collections.emptyMap();
+            log.debug("#prepareMapForNonAtomicComponent - Failed to get component instance by newInstanceId: {}.", newInstanceId);
+            return emptyMap();
+        }
+        List<CapabilityOwner> prevCapOwners = recursiveScanForAtomicBuildingBlocks(origInstanceNode).getCapabilitiesOwners();
+        Component origNewCmpt = toscaOperationFacade.getToscaElement(newInstance.getActualComponentUid()).left().on(err -> exceptionUtils.rollBackAndThrow(err, newInstance.getActualComponentUid()));
+        return mapOldOwnerIdsToNewOnes(oldCapabilitiesOwnerIds, prevCapOwners, newInstance, origNewCmpt);
+    }
+
+    private Map<String, String> mapOldOwnerIdsToNewOnes(List<String> oldCapabilitiesOwnerIds,
+                                                        List<CapabilityOwner> prevCapOwners, ComponentInstance newInstance, Component origNewInstanceType) {
+        List<CapabilityOwner> newCapOwners = getInstanceAtomicBuildingBlocks(newInstance, origNewInstanceType).getCapabilitiesOwners();
+        return getCapabilitiesOwnerMapping(oldCapabilitiesOwnerIds, prevCapOwners, newCapOwners);
+    }
+
+    private Map<String, String> getCapabilitiesOwnerMapping(List<String> oldCapabilitiesOwnerIds, List<CapabilityOwner> prevCapOwners, List<CapabilityOwner> newCapOwners) {
+        Map<String, CapabilityOwner> capOwnersByName = toMap(newCapOwners, CapabilityOwner::getName, (p1, p2) -> p1);
+        return prevCapOwners
+                .stream()
+                .filter(oldCapOwner -> oldCapabilitiesOwnerIds.contains(oldCapOwner.getUniqueId()))
+                .filter(oldCapOwner -> capOwnersByName.containsKey(oldCapOwner.getName()))
+                .collect(Collectors.toMap(CapabilityOwner::getUniqueId, oldCapOwner -> capOwnersByName.get(oldCapOwner.getName()).getUniqueId(), (p1, p2) -> p1));
+    }
+
+
+    private RelationMergeInfo createCapabilityRelationMergeInfo(List<CapabilityOwner> vfcInstances, String ownerId, RequirementCapabilityRelDef relation) {
+        return vfcInstances.stream()
+                            .filter(inst -> StringUtils.equals(inst.getUniqueId(), ownerId))
+                            .map(capabilityOwner -> getCapabilityMergeInfo(capabilityOwner, relation))
+                            .findAny()
+                            .orElse(null);
+    }
+
+
+    private RelationMergeInfo createRequirementRelationMergeInfo(List<ComponentInstance> vfcInstances, String ownerId, RequirementCapabilityRelDef relation) {
+        return vfcInstances.stream()
+                .filter(inst -> StringUtils.equals(inst.getUniqueId(), ownerId))
+                .map(currVfcInst -> mapVfcInstanceRequirement(currVfcInst, relation))
+                .filter(Objects::nonNull)
+                .findAny()
+                .orElse(null);
+    }
+
+    private RelationMergeInfo getCapabilityMergeInfo(CapabilityOwner capabilityOwner, RequirementCapabilityRelDef relDef) {
+        String capabilityUniqueId = relDef.resolveSingleRelationship().getRelation().getCapabilityUid();
+        String capOwnerName = capabilityOwner.getName();
+        CapabilityDefinition capabilityDef = retrieveCapabilityDefinition(capabilityUniqueId, capabilityOwner);
+        String capabilityType;
+        String capabilityName;
+        if (capabilityDef != null) {
+            capabilityType = capabilityDef.getType();
+            capabilityName = capabilityDef.getName();
+        } else {
+            log.debug("#getCapabilityMergeInfo - Failed to retrieve capability type for relation with name: {} and uniqueId {}", relDef.resolveSingleRelationship().getRelation().getCapability(), capabilityUniqueId);
+            capabilityType = null;
+            capabilityName = null;
+        }
+        return new RelationMergeInfo(capabilityType, capabilityName, capOwnerName, relDef);
+    }
+    
+    private RelationMergeInfo mapVfcInstanceRequirement(ComponentInstance vfcInstance, RequirementCapabilityRelDef relDef) {
+        String requirementUniqueId = relDef.resolveSingleRelationship().getRelation().getRequirementUid();
+        
+        String vfcInstanceName = vfcInstance.getName();
+        String vfcUid = vfcInstance.getComponentUid();
+        
+        Either<Resource, StorageOperationStatus> vfcResource = toscaOperationFacade.getToscaElement(vfcUid);
+        if(vfcResource.isLeft()) {
+            Resource vfc = vfcResource.left().value();
+            
+            RequirementDefinition requirementDef = retrieveRequirementDefinition(requirementUniqueId, vfc);
+            String requirementType;
+            String requirementName;
+            if (requirementDef != null) {
+                requirementType = requirementDef.getCapability();
+                requirementName = requirementDef.getName();
+            }
+            else {
+                log.debug("#mapVfcInstanceRequirement - Failed to retrieve requirement type for relation with name: {} and uniqueId {}", relDef.resolveSingleRelationship().getRelation().getRequirement(), requirementUniqueId);
+                requirementType = null;
+                requirementName = null;                
+            }
+            
+            return new RelationMergeInfo(requirementType, requirementName, vfcInstanceName, relDef);
         }
         else {
-            resultMap = mapOldVfcIdsToNewOnes(oldCapabilitiesOwnerIds, oldVfcInstances, newInstance);
+            log.debug("#mapVfcInstanceRequirement - Failed to load VFC by uid {}", vfcUid); 
+            return null;
         }
-        return resultMap;
     }
 
-    /**
-     * @param oldCapabilitiesOwnerIds
-     * @param oldVfcInstances
-     * @param newInstance
-     * @return
-     */
-    private Map<String, String> mapOldVfcIdsToNewOnes(List<String> oldCapabilitiesOwnerIds,
-                                                                List<ComponentInstance> oldVfcInstances, ComponentInstance newInstance) {
-        List<ComponentInstance> newVfcInstances = getVfcInstances(newInstance);
-        Map<String, ComponentInstance> newVfciNameMap = convertToVfciNameMap(newVfcInstances);
-
-        return oldVfcInstances.stream()
-                        .filter(oldVfc -> oldCapabilitiesOwnerIds.contains(oldVfc.getUniqueId()))
-                        .filter(oldVfci -> newVfciNameMap.containsKey(oldVfci.getName()))
-                        .collect(Collectors.toMap(ComponentInstance::getUniqueId, oldVfci -> newVfciNameMap.get(oldVfci.getName()).getUniqueId()));
+    private CapabilityDefinition retrieveCapabilityDefinition(String uniqueId, CapabilityOwner capabilityOwner) {
+        return capabilityOwner.getCapabilities().values().stream()
+                                                .flatMap(List::stream)
+                                                .filter(Objects::nonNull)
+                                                .filter(def -> uniqueId.equals(def.getUniqueId()))
+                                                .findFirst()
+                                                .orElse(null);
+    }
+    
+    private RequirementDefinition retrieveRequirementDefinition(String uniqueId, Resource vfc) {
+        return vfc.getRequirements().values().stream()
+                .flatMap(List::stream)
+                .filter(Objects::nonNull)
+                .filter(def -> uniqueId.equals(def.getUniqueId()))
+                .findFirst()
+                .orElse(null);
+    }
+    
+    private String retrieveCapabilityUid(String name, CapabilityOwner capabilityOwner) {
+        return capabilityOwner.getCapabilities().values()
+                                                .stream()
+                                                .flatMap(List::stream)
+                                                .filter(Objects::nonNull)
+                                                .filter(def -> name.equals(def.getName()))
+                                                .findFirst()
+                                                .map(CapabilityDefinition::getUniqueId)
+                                                .orElse(null);
     }
 
+    private String retrieveRequirementUid(String name, Component vfc) {
+        return vfc.getRequirements().values().stream()
+                                                .flatMap(List::stream)
+                                                .filter(Objects::nonNull)
+                                                .filter(def -> name.equals(def.getName()))
+                                                .findFirst()
+                                                .map(RequirementDefinition::getUniqueId)
+                                                .orElse(null);
+    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/path/ForwardingPathValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/path/ForwardingPathValidator.java
index 492d0a1c42..a099aad15c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/path/ForwardingPathValidator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/path/ForwardingPathValidator.java
@@ -1,9 +1,6 @@
 package org.openecomp.sdc.be.components.path;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
+import fj.data.Either;
 import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.components.impl.ResponseFormatManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -12,13 +9,14 @@ import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 @Component("forwardingPathValidator")
 public class ForwardingPathValidator {
@@ -26,7 +24,7 @@ public class ForwardingPathValidator {
     @Autowired
     protected ToscaOperationFacade toscaOperationFacade;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ForwardingPathValidator.class);
+    private static final Logger logger = Logger.getLogger(ForwardingPathValidator.class);
     private static final int  PATH_NAME_LENGTH = 200;
     private static final int  PROTOCOL_LENGTH = 200;
     private static final int  DESTINATION_PORT_LENGTH = 200;
@@ -67,7 +65,7 @@ public class ForwardingPathValidator {
                                                                           ResponseFormatManager responseFormatManager) {
         if (dataDefinition.getDestinationPortNumber() != null &&
             dataDefinition.getDestinationPortNumber().length() > DESTINATION_PORT_LENGTH ) {
-            LOGGER.debug("Forwarding path destination port {} too long, , maximum allowed 200 characters ",
+            logger.debug("Forwarding path destination port {} too long, , maximum allowed 200 characters ",
                     dataDefinition.getDestinationPortNumber());
             ResponseFormat errorResponse = responseFormatManager.getResponseFormat(ActionStatus
                     .FORWARDING_PATH_DESTINATION_PORT_MAXIMUM_LENGTH, dataDefinition.getDestinationPortNumber());
@@ -79,7 +77,7 @@ public class ForwardingPathValidator {
     private Either<Boolean, ResponseFormat> validateProtocol(ForwardingPathDataDefinition dataDefinition,
                                                              ResponseFormatManager responseFormatManager) {
         if (dataDefinition.getProtocol() != null && dataDefinition.getProtocol().length() > PROTOCOL_LENGTH) {
-            LOGGER.debug("Forwarding path protocol {} too long, , maximum allowed 200 characters ", dataDefinition.getProtocol());
+            logger.debug("Forwarding path protocol {} too long, , maximum allowed 200 characters ", dataDefinition.getProtocol());
             ResponseFormat errorResponse = responseFormatManager.getResponseFormat(ActionStatus
                     .FORWARDING_PATH_PROTOCOL_MAXIMUM_LENGTH, dataDefinition.getProtocol());
             return Either.right(errorResponse);
@@ -104,7 +102,7 @@ public class ForwardingPathValidator {
             return Either.right(isPathNameUniqueResponse.right().value());
         }
         if (!isPathNameUniqueResponse.left().value()) {
-            LOGGER.debug("Forwarding path name {} already in use ", dataDefinition.getName());
+            logger.debug("Forwarding path name {} already in use ", dataDefinition.getName());
             ResponseFormat errorResponse = responseFormatManager.getResponseFormat(ActionStatus
                     .FORWARDING_PATH_NAME_ALREADY_IN_USE, dataDefinition.getName());
             return Either.right(errorResponse);
@@ -114,7 +112,7 @@ public class ForwardingPathValidator {
 
     private Either<Boolean, ResponseFormat> validatePathNameLength(ResponseFormatManager responseFormatManager, String pathName) {
         if (pathName.length() > PATH_NAME_LENGTH) {
-            LOGGER.debug("Forwarding path name  {} too long, , maximum allowed 200 characters ", pathName);
+            logger.debug("Forwarding path name  {} too long, , maximum allowed 200 characters ", pathName);
             ResponseFormat errorResponse = responseFormatManager.getResponseFormat(ActionStatus
                     .FORWARDING_PATH_NAME_MAXIMUM_LENGTH, pathName);
             return Either.right(errorResponse);
@@ -124,7 +122,7 @@ public class ForwardingPathValidator {
 
     private Either<Boolean, ResponseFormat> validatePathNameIfEmpty(ResponseFormatManager responseFormatManager, String pathName) {
         if (StringUtils.isEmpty(pathName)) {
-            LOGGER.debug("Forwarding Path Name can't be empty");
+            logger.debug("Forwarding Path Name can't be empty");
             ResponseFormat errorResponse = responseFormatManager.getResponseFormat(ActionStatus.FORWARDING_PATH_NAME_EMPTY);
             return Either.right(errorResponse);
         }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstanceInputPropertyDecelerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstanceInputPropertyDeclarator.java
index 660c7b71b9..9bf462a186 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstanceInputPropertyDecelerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstanceInputPropertyDeclarator.java
@@ -1,38 +1,35 @@
 package org.openecomp.sdc.be.components.property;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.commons.collections.CollectionUtils;
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
+import org.openecomp.sdc.be.datatypes.elements.Annotation;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import fj.data.Either;
+import java.util.*;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.openecomp.sdc.be.model.utils.ComponentUtilities.getInputAnnotations;
 
 @org.springframework.stereotype.Component
-public class ComponentInstanceInputPropertyDecelerator extends DefaultPropertyDecelerator<ComponentInstance, ComponentInstanceInput> {
+public class ComponentInstanceInputPropertyDeclarator extends DefaultPropertyDeclarator<ComponentInstance, ComponentInstanceInput> {
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentInstanceInputPropertyDecelerator.class);
-    private ToscaOperationFacade toscaOperationFacade;
-    private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
+    private static final Logger log = Logger.getLogger(ComponentInstanceInputPropertyDeclarator.class);
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
+    private final ExceptionUtils exceptionUtils;
 
-    public ComponentInstanceInputPropertyDecelerator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation, ToscaOperationFacade toscaOperationFacade, ComponentInstanceBusinessLogic componentInstanceBusinessLogic) {
+    public ComponentInstanceInputPropertyDeclarator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation, ToscaOperationFacade toscaOperationFacade, ComponentInstanceBusinessLogic componentInstanceBusinessLogic, ExceptionUtils exceptionUtils) {
         super(componentsUtils, propertyOperation);
         this.toscaOperationFacade = toscaOperationFacade;
         this.componentInstanceBusinessLogic = componentInstanceBusinessLogic;
+        this.exceptionUtils = exceptionUtils;
     }
 
     @Override
@@ -54,7 +51,7 @@ public class ComponentInstanceInputPropertyDecelerator extends DefaultPropertyDe
     }
 
     @Override
-    void addPropertiesListToInput(ComponentInstanceInput declaredProp, PropertyDataDefinition originalProp, InputDefinition input) {
+    void addPropertiesListToInput(ComponentInstanceInput declaredProp, InputDefinition input) {
         List<ComponentInstanceInput> inputsValueList = input.getInputs();
         if(inputsValueList == null) {
             inputsValueList = new ArrayList<>(); // adding the property with the new value for UI
@@ -66,11 +63,37 @@ public class ComponentInstanceInputPropertyDecelerator extends DefaultPropertyDe
     @Override
     public StorageOperationStatus unDeclarePropertiesAsInputs(Component component, InputDefinition input) {
         List<ComponentInstanceInput> componentInstanceInputsByInputId = componentInstanceBusinessLogic.getComponentInstanceInputsByInputId(component, input.getUniqueId());
-        if (CollectionUtils.isEmpty(componentInstanceInputsByInputId)) {
+        if (isEmpty(componentInstanceInputsByInputId)) {
             return StorageOperationStatus.OK;
         }
         componentInstanceInputsByInputId.forEach(cmptInstanceInput -> prepareValueBeforeDelete(input, cmptInstanceInput, cmptInstanceInput.getPath()));
         return toscaOperationFacade.updateComponentInstanceInputs(component, componentInstanceInputsByInputId.get(0).getComponentInstanceId(), componentInstanceInputsByInputId);
     }
 
+    @Override
+    InputDefinition createInputFromProperty(String componentId, ComponentInstance propertiesOwner, String inputName, ComponentInstancePropInput propInput, PropertyDataDefinition prop) {
+        InputDefinition inputFromProperty = super.createInputFromProperty(componentId, propertiesOwner, inputName, propInput, prop);
+        Component propertiesOwnerNodeType = getInstanceOriginType(propertiesOwner);
+        enrichInputWithAnnotations(prop, inputFromProperty, propertiesOwnerNodeType);
+        return inputFromProperty;
+    }
+
+    private void enrichInputWithAnnotations(PropertyDataDefinition prop, InputDefinition inputFromProperty, Component propertiesOwnerNodeType) {
+        List<Annotation> inputAnnotations = getInputAnnotations(propertiesOwnerNodeType, prop.getName());
+        if(!isEmpty(inputAnnotations)){
+            inputFromProperty.setAnnotations(inputAnnotations);
+        }
+    }
+
+    private Component getInstanceOriginType(ComponentInstance propertiesOwner) {
+        return toscaOperationFacade.getToscaElement(propertiesOwner.getActualComponentUid(), getFilterComponentInputs())
+                    .left()
+                    .on(err -> exceptionUtils.rollBackAndThrow(err, propertiesOwner.getActualComponentUid()));
+    }
+
+    private ComponentParametersView getFilterComponentInputs() {
+        ComponentParametersView filterInputs = new ComponentParametersView(true);
+        filterInputs.setIgnoreInputs(false);
+        return filterInputs;
+    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDecelerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDeclarator.java
index 81e7fc0283..160bf890b7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDecelerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/ComponentInstancePropertyDeclarator.java
@@ -1,11 +1,6 @@
 package org.openecomp.sdc.be.components.property;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
@@ -17,19 +12,18 @@ import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import fj.data.Either;
+import java.util.*;
 
 @org.springframework.stereotype.Component
-public class ComponentInstancePropertyDecelerator extends DefaultPropertyDecelerator<ComponentInstance, ComponentInstanceProperty> {
+public class ComponentInstancePropertyDeclarator extends DefaultPropertyDeclarator<ComponentInstance, ComponentInstanceProperty> {
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentInstancePropertyDecelerator.class);
+    private static final Logger log = Logger.getLogger(ComponentInstancePropertyDeclarator.class);
     private ToscaOperationFacade toscaOperationFacade;
     private ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
 
-    public ComponentInstancePropertyDecelerator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation, ToscaOperationFacade toscaOperationFacade, ComponentInstanceBusinessLogic componentInstanceBusinessLogic) {
+    public ComponentInstancePropertyDeclarator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation, ToscaOperationFacade toscaOperationFacade, ComponentInstanceBusinessLogic componentInstanceBusinessLogic) {
         super(componentsUtils, propertyOperation);
         this.toscaOperationFacade = toscaOperationFacade;
         this.componentInstanceBusinessLogic = componentInstanceBusinessLogic;
@@ -44,7 +38,7 @@ public class ComponentInstancePropertyDecelerator extends DefaultPropertyDeceler
     Either<?, StorageOperationStatus> updatePropertiesValues(Component component, String cmptInstanceId, List<ComponentInstanceProperty> properties) {
         log.debug("#updatePropertiesValues - updating component instance properties for instance {} on component {}", cmptInstanceId, component.getUniqueId());
         Map<String, List<ComponentInstanceProperty>> instProperties = Collections.singletonMap(cmptInstanceId, properties);
-        return toscaOperationFacade.addComponentInstancePropertiesToComponent(component, instProperties, cmptInstanceId);
+        return toscaOperationFacade.addComponentInstancePropertiesToComponent(component, instProperties);
     }
 
     @Override
@@ -54,7 +48,7 @@ public class ComponentInstancePropertyDecelerator extends DefaultPropertyDeceler
     }
 
     @Override
-    void addPropertiesListToInput(ComponentInstanceProperty declaredProp, PropertyDataDefinition originalProp, InputDefinition input) {
+    void addPropertiesListToInput(ComponentInstanceProperty declaredProp, InputDefinition input) {
         List<ComponentInstanceProperty> propertiesList = input.getProperties();
         if(propertiesList == null) {
             propertiesList = new ArrayList<>(); // adding the property with the new value for UI
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDecelerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDeclarator.java
index 28bb30de73..a5ba0003d2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDecelerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/DefaultPropertyDeclarator.java
@@ -1,17 +1,7 @@
 package org.openecomp.sdc.be.components.property;
 
-import static org.openecomp.sdc.common.api.Constants.GET_INPUT;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+import com.google.gson.Gson;
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.json.simple.JSONObject;
@@ -20,33 +10,29 @@ import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertiesOwner;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstancePropInput;
-import org.openecomp.sdc.be.model.IComponentInstanceConnectedElement;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 
-import com.google.gson.Gson;
+import java.util.*;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
+import static org.openecomp.sdc.common.api.Constants.GET_INPUT;
 
-public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends PropertiesOwner, PROPERTYTYPE extends PropertyDataDefinition> implements PropertyDecelerator {
+public abstract class DefaultPropertyDeclarator<PROPERTYOWNER extends PropertiesOwner, PROPERTYTYPE extends PropertyDataDefinition> implements PropertyDeclarator {
 
-    private static final Logger log = LoggerFactory.getLogger(DefaultPropertyDecelerator.class);
+    private static final Logger log = Logger.getLogger(DefaultPropertyDeclarator.class);
     private static final short LOOP_PROTECTION_LEVEL = 10;
     private final Gson gson = new Gson();
     private ComponentsUtils componentsUtils;
     private PropertyOperation propertyOperation;
 
-    public DefaultPropertyDecelerator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation) {
+    public DefaultPropertyDeclarator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation) {
         this.componentsUtils = componentsUtils;
         this.propertyOperation = propertyOperation;
     }
@@ -65,21 +51,21 @@ public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends Propertie
 
     abstract Optional<PROPERTYOWNER> resolvePropertiesOwner(Component component, String propertiesOwnerId);
 
-    abstract void addPropertiesListToInput(PROPERTYTYPE declaredProp, PropertyDataDefinition originalProp, InputDefinition input);
+    abstract void addPropertiesListToInput(PROPERTYTYPE declaredProp, InputDefinition input);
 
     private StorageOperationStatus onPropertiesOwnerNotFound(String componentId, String propertiesOwnerId) {
         log.debug("#declarePropertiesAsInputs - properties owner {} was not found on component {}", propertiesOwnerId, componentId);
         return StorageOperationStatus.NOT_FOUND;
     }
 
-    private Either<List<InputDefinition>, StorageOperationStatus> declarePropertiesAsInputs(Component component, PropertiesOwner propertiesOwner, List<ComponentInstancePropInput> propsToDeclare) {
+    private Either<List<InputDefinition>, StorageOperationStatus> declarePropertiesAsInputs(Component component, PROPERTYOWNER propertiesOwner, List<ComponentInstancePropInput> propsToDeclare) {
         PropertiesDeclarationData inputsProperties = createInputsAndOverridePropertiesValues(component.getUniqueId(), propertiesOwner, propsToDeclare);
         return updatePropertiesValues(component, propertiesOwner.getUniqueId(), inputsProperties.getPropertiesToUpdate())
                 .left()
                 .map(updatePropsRes -> inputsProperties.getInputsToCreate());
     }
 
-    private PropertiesDeclarationData createInputsAndOverridePropertiesValues(String componentId, PropertiesOwner propertiesOwner, List<ComponentInstancePropInput> propsToDeclare) {
+    private PropertiesDeclarationData createInputsAndOverridePropertiesValues(String componentId, PROPERTYOWNER propertiesOwner, List<ComponentInstancePropInput> propsToDeclare) {
         List<PROPERTYTYPE> declaredProperties = new ArrayList<>();
         List<InputDefinition> createdInputs = propsToDeclare.stream()
                 .map(propInput -> declarePropertyInput(componentId, propertiesOwner, declaredProperties, propInput))
@@ -87,7 +73,7 @@ public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends Propertie
         return new PropertiesDeclarationData(createdInputs, declaredProperties);
     }
 
-    private InputDefinition declarePropertyInput(String componentId, PropertiesOwner propertiesOwner, List<PROPERTYTYPE> declaredProperties, ComponentInstancePropInput propInput) {
+    private InputDefinition declarePropertyInput(String componentId, PROPERTYOWNER propertiesOwner, List<PROPERTYTYPE> declaredProperties, ComponentInstancePropInput propInput) {
         PropertyDataDefinition prop = resolveProperty(declaredProperties, propInput);
         propInput.setOwnerId(null);
         propInput.setParentUniqueId(null);
@@ -96,11 +82,11 @@ public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends Propertie
         if(!declaredProperties.contains(declaredProperty)){
             declaredProperties.add(declaredProperty);
         }
-        addPropertiesListToInput(declaredProperty, prop, inputDefinition);
+        addPropertiesListToInput(declaredProperty, inputDefinition);
         return inputDefinition;
     }
 
-    private InputDefinition createInput(String componentId, PropertiesOwner propertiesOwner, ComponentInstancePropInput propInput, PropertyDataDefinition prop) {
+    private InputDefinition createInput(String componentId, PROPERTYOWNER propertiesOwner, ComponentInstancePropInput propInput, PropertyDataDefinition prop) {
         String generatedInputName = generateInputName(propertiesOwner.getNormalizedName(), propInput);
         return createInputFromProperty(componentId, propertiesOwner, generatedInputName, propInput, prop);
     }
@@ -124,7 +110,7 @@ public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends Propertie
         return resolvedProperty.isPresent() ? resolvedProperty.get() : propInput;
     }
 
-    private InputDefinition createInputFromProperty(String componentId, PropertiesOwner propertiesOwner, String inputName, ComponentInstancePropInput propInput, PropertyDataDefinition prop) {
+    InputDefinition createInputFromProperty(String componentId, PROPERTYOWNER propertiesOwner, String inputName, ComponentInstancePropInput propInput, PropertyDataDefinition prop) {
         String propertiesName = propInput.getPropertiesName() ;
         PropertyDefinition selectedProp = propInput.getInput();
         String[] parsedPropNames = propInput.getParsedPropNames();
@@ -133,15 +119,17 @@ public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends Propertie
         if(propertiesName != null && !propertiesName.isEmpty() && selectedProp != null){
             complexProperty = true;
             input = new InputDefinition(selectedProp);
+            input.setDefaultValue(selectedProp.getValue());
         }else{
             input = new InputDefinition(prop);
+            input.setDefaultValue(prop.getValue());
         }
-        input.setDefaultValue(prop.getValue());
         input.setName(inputName);
         input.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId(componentId, input.getName()));
         input.setInputPath(propertiesName);
         input.setInstanceUniqueId(propertiesOwner.getUniqueId());
         input.setPropertyId(propInput.getUniqueId());
+        input.setValue(null);
         changePropertyValueToGetInputValue(inputName, parsedPropNames, input, prop, complexProperty);
         ((IComponentInstanceConnectedElement)prop).setComponentInstanceId(propertiesOwner.getUniqueId());
         ((IComponentInstanceConnectedElement)prop).setComponentInstanceName(propertiesOwner.getName());
@@ -363,11 +351,8 @@ public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends Propertie
      *        @return mutated @param toscaElement , where empty maps are deleted , return null for empty map.
      **/
     private Object cleanEmptyNestedValuesInMap(Object toscaElement , short loopProtectionLevel ){
-        //region - Stop if map is empty
         if (loopProtectionLevel<=0 || toscaElement==null || !(toscaElement instanceof  Map))
             return toscaElement;
-        //endregion
-        //region - Remove empty map entries & return null iff empty map
         if ( MapUtils.isNotEmpty( (Map)toscaElement ) ) {
             Object ret;
             Set<Object> keysToRemove = new HashSet<>();                                                                 // use different set to avoid ConcurrentModificationException
@@ -381,10 +366,9 @@ public abstract class DefaultPropertyDecelerator<PROPERTYOWNER extends Propertie
             if (CollectionUtils.isNotEmpty(set))
                 set.removeAll(keysToRemove);
 
-            if ( isEmptyNestedMap(toscaElement) )                                                                         // similar to < if ( MapUtils.isEmpty( (Map)toscaElement ) ) > ,but adds nested map check
+            if ( isEmptyNestedMap(toscaElement) )
                 return null;
         }
-        //endregion
         else
             return null;
         return toscaElement;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclarator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclarator.java
new file mode 100644
index 0000000000..7817d51658
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/GroupPropertyDeclarator.java
@@ -0,0 +1,148 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.openecomp.sdc.be.components.property;
+
+import fj.data.Either;
+import org.apache.commons.collections.CollectionUtils;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.impl.GroupOperation;
+import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.openecomp.sdc.be.components.property.GetInputUtils.isGetInputValueForInput;
+
+@org.springframework.stereotype.Component
+public class GroupPropertyDeclarator extends DefaultPropertyDeclarator<GroupDefinition, PropertyDataDefinition> {
+
+    private static final Logger log = Logger.getLogger(GroupPropertyDeclarator.class);
+    private GroupOperation groupOperation;
+
+    public GroupPropertyDeclarator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation, GroupOperation groupOperation) {
+        super(componentsUtils, propertyOperation);
+        this.groupOperation = groupOperation;
+    }
+
+    @Override
+    PropertyDataDefinition createDeclaredProperty(PropertyDataDefinition prop) {
+        return new PropertyDataDefinition(prop);
+    }
+
+    @Override
+    Either<?, StorageOperationStatus> updatePropertiesValues(Component component, String groupId, List<PropertyDataDefinition> properties) {
+        log.debug("#updatePropertiesValues - updating group properties for group {} on component {}", groupId, component.getUniqueId());
+        StorageOperationStatus updateStatus = groupOperation.updateGroupProperties(component, groupId, properties);
+        return updateStatus == StorageOperationStatus.OK ? Either.left(updateStatus) : Either.right(updateStatus);
+    }
+
+    @Override
+    Optional<GroupDefinition> resolvePropertiesOwner(Component component, String groupId) {
+        log.debug("#resolvePropertiesOwner - fetching group {} of component {}", groupId, component.getUniqueId());
+        return component.getGroupById(groupId);
+    }
+
+    @Override
+    void addPropertiesListToInput(PropertyDataDefinition declaredProp, InputDefinition input) {
+        List<ComponentInstanceProperty> propertiesList = input.getProperties();
+        if(propertiesList == null) {
+            propertiesList = new ArrayList<>(); // adding the property with the new value for UI
+        }
+        propertiesList.add(new ComponentInstanceProperty(declaredProp));
+        input.setProperties(propertiesList);
+
+    }
+
+    @Override
+    public StorageOperationStatus unDeclarePropertiesAsInputs(Component component, InputDefinition inputForDelete) {
+        return getGroupPropertiesDeclaredAsInput(component, inputForDelete.getUniqueId())
+                .map(groupProperties -> unDeclareGroupProperties(component, inputForDelete, groupProperties))
+                .orElse(StorageOperationStatus.OK);
+    }
+
+    private StorageOperationStatus unDeclareGroupProperties(Component container, InputDefinition input, GroupProperties groupProperties) {
+        String groupId = groupProperties.getGroupId();
+        List<PropertyDataDefinition> propsDeclaredAsInput = groupProperties.getProperties();
+        propsDeclaredAsInput.forEach(groupProp -> prepareValueBeforeDelete(input, groupProp, Collections.emptyList()));
+        return groupOperation.updateGroupProperties(container, groupId, propsDeclaredAsInput);
+    }
+
+    private Optional<GroupProperties> getGroupPropertiesDeclaredAsInput(Component container, String inputId) {
+        if (container.getGroups() == null) {
+            return Optional.empty();
+        }
+        return container.getGroups()
+                .stream()
+                .filter(group -> Objects.nonNull(group.getProperties()))
+                .map(grp -> getGroupPropertiesDeclaredAsInput(grp, inputId))
+                .filter(GroupProperties::isNotEmpty)
+                .findFirst();
+    }
+
+
+    private GroupProperties getGroupPropertiesDeclaredAsInput(GroupDefinition group, String inputId) {
+        List<PropertyDataDefinition> propertyDataDefinitions = group.getProperties()
+                .stream()
+                .filter(prop -> isPropertyDeclaredAsInputByInputId(prop, inputId))
+                .collect(toList());
+        return new GroupProperties(group.getUniqueId(), propertyDataDefinitions);
+    }
+
+    private boolean isPropertyDeclaredAsInputByInputId(PropertyDataDefinition property, String inputId) {
+        if (isEmpty(property.getGetInputValues())) {
+            return false;
+        }
+        return property.getGetInputValues().stream()
+                .filter(Objects::nonNull)
+                .anyMatch(getInputVal -> isGetInputValueForInput(getInputVal, inputId));
+    }
+
+
+    private class GroupProperties {
+        private String groupId;
+        private List<PropertyDataDefinition> properties;
+
+        GroupProperties(String groupId, List<PropertyDataDefinition> properties) {
+            this.groupId = groupId;
+            this.properties = (properties == null)? null :new ArrayList<>(properties);
+        }
+
+        String getGroupId() {
+            return groupId;
+        }
+
+        public List<PropertyDataDefinition> getProperties() {
+            return new ArrayList<>(properties);
+        }
+
+        boolean isNotEmpty() {
+            return CollectionUtils.isNotEmpty(properties);
+        }
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PolicyPropertyDecelerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclarator.java
index a2a146be91..9f150aa336 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PolicyPropertyDecelerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PolicyPropertyDeclarator.java
@@ -1,16 +1,26 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.openecomp.sdc.be.components.property;
 
-import static org.openecomp.sdc.be.components.property.GetInputUtils.isGetInputValueForInput;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
-import org.openecomp.sdc.be.datatypes.elements.PolicyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.Component;
@@ -20,18 +30,20 @@ import org.openecomp.sdc.be.model.PolicyDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.PolicyOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.openecomp.sdc.be.components.property.GetInputUtils.isGetInputValueForInput;
 
 @org.springframework.stereotype.Component
-public class PolicyPropertyDecelerator extends DefaultPropertyDecelerator<PolicyDefinition, PropertyDataDefinition> {
+public class PolicyPropertyDeclarator extends DefaultPropertyDeclarator<PolicyDefinition, PropertyDataDefinition> {
 
-    private static final Logger log = LoggerFactory.getLogger(PolicyPropertyDecelerator.class);
+    private static final Logger log = Logger.getLogger(PolicyPropertyDeclarator.class);
     private PolicyOperation policyOperation;
 
-    public PolicyPropertyDecelerator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation, PolicyOperation policyOperation) {
+    public PolicyPropertyDeclarator(ComponentsUtils componentsUtils, PropertyOperation propertyOperation, PolicyOperation policyOperation) {
         super(componentsUtils, propertyOperation);
         this.policyOperation = policyOperation;
     }
@@ -55,7 +67,7 @@ public class PolicyPropertyDecelerator extends DefaultPropertyDecelerator<Policy
     }
 
     @Override
-    void addPropertiesListToInput(PropertyDataDefinition declaredProp, PropertyDataDefinition originalProp, InputDefinition input) {
+    void addPropertiesListToInput(PropertyDataDefinition declaredProp, InputDefinition input) {
         List<ComponentInstanceProperty> propertiesList = input.getProperties();
         if(propertiesList == null) {
             propertiesList = new ArrayList<>(); // adding the property with the new value for UI
@@ -83,15 +95,12 @@ public class PolicyPropertyDecelerator extends DefaultPropertyDecelerator<Policy
         if (container.getPolicies() == null) {
             return Optional.empty();
         }
-        return container.getPolicies().values()
+        return container.getPolicies()
+                .values()
                 .stream()
                 .filter(policy -> Objects.nonNull(policy.getProperties()))
-                .collect(Collectors.toMap(PolicyDataDefinition::getUniqueId,
-                        p -> getPolicyPropertiesDeclaredAsInput(p, inputId)))
-                .entrySet()
-                .stream()
-                .filter(entry -> !entry.getValue().isEmpty())
-                .map(entry -> new PolicyProperties(entry.getKey(), entry.getValue()))
+                .map(policy -> getPolicyPropertiesDeclaredAsInput(policy, inputId))
+                .filter(PolicyProperties::isNotEmpty)
                 .findFirst();
     }
 
@@ -104,11 +113,13 @@ public class PolicyPropertyDecelerator extends DefaultPropertyDecelerator<Policy
                 .anyMatch(getInputVal -> isGetInputValueForInput(getInputVal, inputId));
     }
 
-    private List<PropertyDataDefinition> getPolicyPropertiesDeclaredAsInput(PolicyDefinition policy, String inputId) {
-        return policy.getProperties()
+    private PolicyProperties getPolicyPropertiesDeclaredAsInput(PolicyDefinition policy, String inputId) {
+        List<PropertyDataDefinition> collect = policy.getProperties()
                 .stream()
                 .filter(prop -> isPropertyDeclaredAsInputByInputId(prop, inputId))
                 .collect(Collectors.toList());
+        return new PolicyProperties(policy.getUniqueId(), collect);
+
     }
 
     private class PolicyProperties {
@@ -117,7 +128,7 @@ public class PolicyPropertyDecelerator extends DefaultPropertyDecelerator<Policy
 
         PolicyProperties(String policyId, List<PropertyDataDefinition> properties) {
             this.policyId = policyId;
-            this.properties = properties;
+            this.properties = (properties == null)? null : new ArrayList<>(properties);
         }
 
         String getPolicyId() {
@@ -125,7 +136,11 @@ public class PolicyPropertyDecelerator extends DefaultPropertyDecelerator<Policy
         }
 
         public List<PropertyDataDefinition> getProperties() {
-            return properties;
+            return new ArrayList<>(properties);
+        }
+
+        boolean isNotEmpty() {
+            return CollectionUtils.isNotEmpty(properties);
         }
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDecelerationOrchestrator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDecelerationOrchestrator.java
deleted file mode 100644
index 373dd4a76c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDecelerationOrchestrator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.openecomp.sdc.be.components.property;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstInputsMap;
-import org.openecomp.sdc.be.model.ComponentInstancePropInput;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import fj.data.Either;
-
-@org.springframework.stereotype.Component
-public class PropertyDecelerationOrchestrator {
-
-    private static final Logger log = LoggerFactory.getLogger(PropertyDecelerationOrchestrator.class);
-    private ComponentInstanceInputPropertyDecelerator componentInstanceInputPropertyDecelerator;
-    private ComponentInstancePropertyDecelerator componentInstancePropertyDecelerator;
-    private PolicyPropertyDecelerator policyPropertyDecelerator;
-    private List<PropertyDecelerator> propertyDecelerators;
-
-    public PropertyDecelerationOrchestrator(ComponentInstanceInputPropertyDecelerator componentInstanceInputPropertyDecelerator, ComponentInstancePropertyDecelerator componentInstancePropertyDecelerator, PolicyPropertyDecelerator policyPropertyDecelerator) {
-        this.componentInstanceInputPropertyDecelerator = componentInstanceInputPropertyDecelerator;
-        this.componentInstancePropertyDecelerator = componentInstancePropertyDecelerator;
-        this.policyPropertyDecelerator = policyPropertyDecelerator;
-        propertyDecelerators = Arrays.asList(componentInstanceInputPropertyDecelerator, componentInstancePropertyDecelerator, policyPropertyDecelerator);
-    }
-
-    public Either<List<InputDefinition>, StorageOperationStatus> declarePropertiesToInputs(Component component, ComponentInstInputsMap componentInstInputsMap) {
-        PropertyDecelerator propertyDecelerator = getPropertyDecelerator(componentInstInputsMap);
-        Pair<String, List<ComponentInstancePropInput>> propsToDeclare = componentInstInputsMap.resolvePropertiesToDeclare();
-        return propertyDecelerator.declarePropertiesAsInputs(component, propsToDeclare.getLeft(), propsToDeclare.getRight());
-    }
-
-    public StorageOperationStatus unDeclarePropertiesAsInputs(Component component, InputDefinition inputToDelete) {
-        log.debug("#unDeclarePropertiesAsInputs - removing input declaration for input {} on component {}", inputToDelete.getName(), component.getUniqueId());
-        for (PropertyDecelerator propertyDecelerator : propertyDecelerators) {
-            StorageOperationStatus storageOperationStatus = propertyDecelerator.unDeclarePropertiesAsInputs(component, inputToDelete);
-            if (StorageOperationStatus.OK != storageOperationStatus) {
-                log.debug("#unDeclarePropertiesAsInputs - failed to remove input declaration for input {} on component {}. reason {}", inputToDelete.getName(), component.getUniqueId(), storageOperationStatus);
-                return storageOperationStatus;
-            }
-        }
-        return StorageOperationStatus.OK;
-
-    }
-
-    private PropertyDecelerator getPropertyDecelerator(ComponentInstInputsMap componentInstInputsMap) {
-        if (!MapUtils.isEmpty(componentInstInputsMap.getComponentInstanceInputsMap())) {
-            return componentInstanceInputPropertyDecelerator;
-        }
-        if (!MapUtils.isEmpty(componentInstInputsMap.getComponentInstanceProperties())) {
-            return componentInstancePropertyDecelerator;
-        }
-        if (!MapUtils.isEmpty(componentInstInputsMap.getPolicyProperties())) {
-            return policyPropertyDecelerator;
-        }
-        throw new IllegalStateException("there are no properties selected for deceleration");
-
-    }
-
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDeclarationOrchestrator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDeclarationOrchestrator.java
new file mode 100644
index 0000000000..937e2ccfc8
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDeclarationOrchestrator.java
@@ -0,0 +1,71 @@
+package org.openecomp.sdc.be.components.property;
+
+import fj.data.Either;
+import org.apache.commons.lang3.tuple.Pair;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstInputsMap;
+import org.openecomp.sdc.be.model.ComponentInstancePropInput;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+
+@org.springframework.stereotype.Component
+public class PropertyDeclarationOrchestrator {
+
+    private static final Logger log = Logger.getLogger(PropertyDeclarationOrchestrator.class);
+    private ComponentInstanceInputPropertyDeclarator componentInstanceInputPropertyDeclarator;
+    private ComponentInstancePropertyDeclarator componentInstancePropertyDeclarator;
+    private PolicyPropertyDeclarator policyPropertyDeclarator;
+    private GroupPropertyDeclarator groupPropertyDeclarator;
+    private List<PropertyDeclarator> propertyDeclarators;
+
+    public PropertyDeclarationOrchestrator(ComponentInstanceInputPropertyDeclarator componentInstanceInputPropertyDeclarator, ComponentInstancePropertyDeclarator componentInstancePropertyDeclarator, PolicyPropertyDeclarator policyPropertyDeclarator, GroupPropertyDeclarator groupPropertyDeclarator) {
+        this.componentInstanceInputPropertyDeclarator = componentInstanceInputPropertyDeclarator;
+        this.componentInstancePropertyDeclarator = componentInstancePropertyDeclarator;
+        this.policyPropertyDeclarator = policyPropertyDeclarator;
+        this.groupPropertyDeclarator = groupPropertyDeclarator;
+        propertyDeclarators = Arrays.asList(componentInstanceInputPropertyDeclarator, componentInstancePropertyDeclarator, policyPropertyDeclarator, groupPropertyDeclarator);
+    }
+
+    public Either<List<InputDefinition>, StorageOperationStatus> declarePropertiesToInputs(Component component, ComponentInstInputsMap componentInstInputsMap) {
+        PropertyDeclarator propertyDeclarator = getPropertyDeclarator(componentInstInputsMap);
+        Pair<String, List<ComponentInstancePropInput>> propsToDeclare = componentInstInputsMap.resolvePropertiesToDeclare();
+        return propertyDeclarator.declarePropertiesAsInputs(component, propsToDeclare.getLeft(), propsToDeclare.getRight());
+    }
+
+    public StorageOperationStatus unDeclarePropertiesAsInputs(Component component, InputDefinition inputToDelete) {
+        log.debug("#unDeclarePropertiesAsInputs - removing input declaration for input {} on component {}", inputToDelete.getName(), component.getUniqueId());
+        for (PropertyDeclarator propertyDeclarator : propertyDeclarators) {
+            StorageOperationStatus storageOperationStatus = propertyDeclarator.unDeclarePropertiesAsInputs(component, inputToDelete);
+            if (StorageOperationStatus.OK != storageOperationStatus) {
+                log.debug("#unDeclarePropertiesAsInputs - failed to remove input declaration for input {} on component {}. reason {}", inputToDelete.getName(), component.getUniqueId(), storageOperationStatus);
+                return storageOperationStatus;
+            }
+        }
+        return StorageOperationStatus.OK;
+
+    }
+
+    private PropertyDeclarator getPropertyDeclarator(ComponentInstInputsMap componentInstInputsMap) {
+        if (isNotEmpty(componentInstInputsMap.getComponentInstanceInputsMap())) {
+            return componentInstanceInputPropertyDeclarator;
+        }
+        if (isNotEmpty(componentInstInputsMap.getComponentInstanceProperties())) {
+            return componentInstancePropertyDeclarator;
+        }
+        if (isNotEmpty(componentInstInputsMap.getPolicyProperties())) {
+            return policyPropertyDeclarator;
+        }
+        if (isNotEmpty(componentInstInputsMap.getGroupProperties())) {
+            return groupPropertyDeclarator;
+        }
+        throw new IllegalStateException("there are no properties selected for declaration");
+
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDecelerator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDeclarator.java
index 8314309f8c..a5add358d7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDecelerator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/property/PropertyDeclarator.java
@@ -1,15 +1,14 @@
 package org.openecomp.sdc.be.components.property;
 
-import java.util.List;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstancePropInput;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 
-import fj.data.Either;
+import java.util.List;
 
-public interface PropertyDecelerator {
+public interface PropertyDeclarator {
 
     /**
      * creates a list of inputs from the given list of properties and updates the properties accordingly
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AbstractScheduleTaskRunner.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AbstractScheduleTaskRunner.java
index 8ab616e7e5..1c73ff1d08 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AbstractScheduleTaskRunner.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AbstractScheduleTaskRunner.java
@@ -1,13 +1,13 @@
 package org.openecomp.sdc.be.components.scheduledtasks;
 
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public abstract class AbstractScheduleTaskRunner {
-    private static final Logger log = LoggerFactory.getLogger(AbstractScheduleTaskRunner.class);
+    private static final Logger log = Logger.getLogger(AbstractScheduleTaskRunner.class);
     public abstract ExecutorService getExecutorService();
 
     protected void shutdownExecutor() {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTask.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTask.java
index e89c02e9b3..ecf2c057bb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTask.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/AsdcComponentsCleanerTask.java
@@ -20,31 +20,25 @@
 
 package org.openecomp.sdc.be.components.scheduledtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.CleanComponentsConfiguration;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
+
 @Component("asdcComponentsCleaner")
 public class AsdcComponentsCleanerTask extends AbstractScheduleTaskRunner implements Runnable {
 
-    private static final Logger log = LoggerFactory.getLogger(AsdcComponentsCleanerTask.class);
+    private static final Logger log = Logger.getLogger(AsdcComponentsCleanerTask.class);
 
     @javax.annotation.Resource
     private ComponentsCleanBusinessLogic componentsCleanBusinessLogic = null;
@@ -69,7 +63,7 @@ public class AsdcComponentsCleanerTask extends AbstractScheduleTaskRunner implem
             return;
 
         }
-        componentsToClean = new ArrayList<NodeTypeEnum>();
+        componentsToClean = new ArrayList<>();
         List<String> components = cleanComponentsConfiguration.getComponentsToClean();
         if (components == null) {
             log.info("no component were configured for cleaning");
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/ComponentsCleanBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/ComponentsCleanBusinessLogic.java
index d26b212658..06f37db6f3 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/ComponentsCleanBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/ComponentsCleanBusinessLogic.java
@@ -20,22 +20,23 @@
 
 package org.openecomp.sdc.be.components.scheduledtasks;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.annotations.VisibleForTesting;
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.BaseBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Component("componentsCleanBusinessLogic")
 public class ComponentsCleanBusinessLogic extends BaseBusinessLogic {
@@ -46,24 +47,48 @@ public class ComponentsCleanBusinessLogic extends BaseBusinessLogic {
     @Autowired
     private ServiceBusinessLogic serviceBusinessLogic;
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentsCleanBusinessLogic.class);
+    @VisibleForTesting
+    public static final String DELETE_LOCKER = "DELETE_LOCKER";
+
+    private static final Logger log = Logger.getLogger(ComponentsCleanBusinessLogic.class.getName());
 
-    public Map<NodeTypeEnum, Either<List<String>, ResponseFormat>> cleanComponents(List<NodeTypeEnum> componentsToClean) {
+    public Map<NodeTypeEnum, Either<List<String>, ResponseFormat>> cleanComponents(List<NodeTypeEnum> componentsToClean){
+        return cleanComponents(componentsToClean, false);
+    }
+
+    public Map<NodeTypeEnum, Either<List<String>, ResponseFormat>> cleanComponents(List<NodeTypeEnum> componentsToClean, boolean isAlreadyLocked) {
 
-        Map<NodeTypeEnum, Either<List<String>, ResponseFormat>> cleanedComponents = new HashMap<NodeTypeEnum, Either<List<String>, ResponseFormat>>();
+        Map<NodeTypeEnum, Either<List<String>, ResponseFormat>> cleanedComponents = new HashMap<>();
 
+        boolean isLockSucceeded = false;
         log.trace("start cleanComponents");
-        for (NodeTypeEnum type : componentsToClean) {
-            switch (type) {
-            case Resource:
-                processDeletionForType(cleanedComponents, NodeTypeEnum.Resource, resourceBusinessLogic);
-                break;
-            case Service:
-                processDeletionForType(cleanedComponents, NodeTypeEnum.Service, serviceBusinessLogic);
-                break;
-            default:
-                log.debug("{} component type does not have cleaning method defined", type);
-                break;
+        try {
+            if (!isAlreadyLocked) {
+                //lock if the delete node is not locked yet
+                isLockSucceeded = !isDeleteOperationLockFailed();
+            }
+            for (NodeTypeEnum type : componentsToClean) {
+                if (!isAlreadyLocked && !isLockSucceeded) {
+                    log.info("{}s won't be deleted as another process is locking the delete operation", type.getName());
+                    cleanedComponents.put(type, Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED)));
+                    break;
+                }
+                switch (type) {
+                    case Resource:
+                        processDeletionForType(cleanedComponents, NodeTypeEnum.Resource, resourceBusinessLogic);
+                        break;
+                    case Service:
+                        processDeletionForType(cleanedComponents, NodeTypeEnum.Service, serviceBusinessLogic);
+                        break;
+                    default:
+                        log.debug("{} component type does not have cleaning method defined", type);
+                        break;
+                }
+            }
+        }
+        finally {
+            if (!isAlreadyLocked && isLockSucceeded) {
+                unlockDeleteOperation();
             }
         }
 
@@ -76,14 +101,25 @@ public class ComponentsCleanBusinessLogic extends BaseBusinessLogic {
         if (deleteMarkedResources.isRight()) {
             log.debug("failed to clean deleted components of type {}. error: {}", type, deleteMarkedResources.right().value().getFormattedMessage());
         } else {
-            if (log.isDebugEnabled()) {
-                StringBuilder sb = new StringBuilder("list of deleted components - type " + type + ": ");
-                for (String id : deleteMarkedResources.left().value()) {
-                    sb.append(id).append(", ");
-                }
-                log.debug(sb.toString());
-            }
+            log.debug("list of deleted components - type {}: {}", type, deleteMarkedResources.left().value());
         }
         cleanedComponents.put(type, deleteMarkedResources);
     }
+
+    public StorageOperationStatus lockDeleteOperation() {
+        StorageOperationStatus result = graphLockOperation.lockComponentByName(DELETE_LOCKER, NodeTypeEnum.Component);
+        log.info("Lock cleanup operation is done with result = {}", result);
+        return result;
+    }
+
+    public StorageOperationStatus unlockDeleteOperation() {
+        StorageOperationStatus result = graphLockOperation.unlockComponentByName(DELETE_LOCKER, "", NodeTypeEnum.Component);
+        log.info("Unlock cleanup operation is done with result = {}", result);
+        return result;
+    }
+
+    public boolean isDeleteOperationLockFailed() {
+        return lockDeleteOperation() != StorageOperationStatus.OK;
+    }
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/RecoveryThreadManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/RecoveryThreadManager.java
index 8fd7fbf922..4aa6136994 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/RecoveryThreadManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/scheduledtasks/RecoveryThreadManager.java
@@ -20,20 +20,8 @@
 
 package org.openecomp.sdc.be.components.scheduledtasks;
 
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
-import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.convertToFunction;
-
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-
+import com.google.common.annotations.VisibleForTesting;
+import fj.data.Either;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.openecomp.sdc.be.components.distribution.engine.EnvironmentsEngine;
@@ -44,19 +32,27 @@ import org.openecomp.sdc.be.dao.cassandra.OperationalEnvironmentDao;
 import org.openecomp.sdc.be.datatypes.enums.EnvironmentStatusEnum;
 import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
 import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.google.common.annotations.VisibleForTesting;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.convertToFunction;
 
 @Component("recoveryThreadManager")
 public class RecoveryThreadManager extends AbstractScheduleTaskRunner {
 
-    private static final Logger log = LoggerFactory.getLogger(RecoveryThreadManager.class);
+    private static final Logger log = Logger.getLogger(RecoveryThreadManager.class);
     @VisibleForTesting
     FixEnvironmentTask task = new FixEnvironmentTask();
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/ServiceInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/ServiceInfo.java
new file mode 100644
index 0000000000..8554a78995
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/ServiceInfo.java
@@ -0,0 +1,84 @@
+package org.openecomp.sdc.be.components.upgrade;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+
+public class ServiceInfo {
+    private String uniqueId;
+    private String version;
+    private String name;
+    private ActionStatus status;
+ 
+    public ServiceInfo(){
+        status = ActionStatus.OK;
+    }
+    
+    public ServiceInfo(String id, ActionStatus status){
+        this.uniqueId = id;
+        this.status = status;
+    }
+    public String getUniqueId() {
+        return uniqueId;
+    }
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+    public String getVersion() {
+        return version;
+    }
+    public void setVersion(String version) {
+        this.version = version;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public ActionStatus getStatus() {
+        return status;
+    }
+    public void setStatus(ActionStatus status) {
+        this.status = status;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((status == null) ? 0 : status.hashCode());
+        result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode());
+        result = prime * result + ((version == null) ? 0 : version.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ServiceInfo other = (ServiceInfo) obj;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (status != other.status)
+            return false;
+        if (uniqueId == null) {
+            if (other.uniqueId != null)
+                return false;
+        } else if (!uniqueId.equals(other.uniqueId))
+            return false;
+        if (version == null) {
+            if (other.version != null)
+                return false;
+        } else if (!version.equals(other.version))
+            return false;
+        return true;
+    }
+    
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogic.java
new file mode 100644
index 0000000000..ef3ffb8953
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeBusinessLogic.java
@@ -0,0 +1,445 @@
+package org.openecomp.sdc.be.components.upgrade;
+
+import fj.data.Either;
+import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
+import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
+import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
+import org.openecomp.sdc.be.components.validation.UserValidations;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsontitan.operations.UpgradeOperation;
+import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.exception.ResponseFormat;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@org.springframework.stereotype.Component("upgradeBusinessLogic")
+public class UpgradeBusinessLogic {
+
+    private final LifecycleBusinessLogic lifecycleBusinessLogic;
+    private final ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
+    private final UserValidations userValidations;
+    private final ToscaOperationFacade toscaOperationFacade;
+    private final ComponentsUtils componentsUtils;
+    private final UpgradeOperation upgradeOperation;
+    private final TitanDao titanDao;
+    private LifecycleChangeInfoWithAction changeInfo = new LifecycleChangeInfoWithAction("automated upgrade");
+
+    private static final List<String> UUID_PROPS_NAMES = Arrays.asList("depending_service_uuid", "providing_service_uuid");
+    private static final List<String> INV_UUID_PROPS_NAMES = Arrays.asList("depending_service_invariant_uuid", "providing_service_invariant_uuid");
+    private static final List<String> NAME_PROPS_NAMES = Arrays.asList("depending_service_name", "providing_service_name");
+
+    private static final Logger LOGGER = Logger.getLogger(UpgradeBusinessLogic.class);
+
+    public UpgradeBusinessLogic(LifecycleBusinessLogic lifecycleBusinessLogic, ComponentInstanceBusinessLogic componentInstanceBusinessLogic, UserValidations userValidations, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils,
+                                UpgradeOperation upgradeOperation, TitanDao titanDao) {
+        this.lifecycleBusinessLogic = lifecycleBusinessLogic;
+        this.componentInstanceBusinessLogic = componentInstanceBusinessLogic;
+        this.userValidations = userValidations;
+        this.toscaOperationFacade = toscaOperationFacade;
+        this.componentsUtils = componentsUtils;
+        this.upgradeOperation = upgradeOperation;
+        this.titanDao = titanDao;
+    }
+
+
+    /**
+     * 
+     * @param componentId
+     * @param userId
+     * @return
+     */
+    public UpgradeStatus automatedUpgrade(String componentId, List<UpgradeRequest> upgradeRequest, String userId) {
+        UpgradeStatus status = new UpgradeStatus();
+        User user = userValidations.validateUserExists(userId, "automated upgrade", false);
+
+        Either<Component, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaFullElement(componentId);
+        if (storageStatus.isRight()) {
+            status.setError(componentsUtils.getResponseFormatByResource(componentsUtils.convertFromStorageResponse(storageStatus.right().value()), componentId));
+            return status;
+        }
+        Component component = storageStatus.left().value();
+        if (!component.isHighestVersion() || component.getLifecycleState() != LifecycleStateEnum.CERTIFIED) {
+            LOGGER.debug("automated Upgrade failed - target is not higest certified component {} state {} version {} ", component.getName(), component.getLifecycleState(), component.getVersion());
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_IS_NOT_HIHGEST_CERTIFIED, component.getName());
+            status.setError(responseFormat);
+            componentsUtils.auditComponentAdmin(responseFormat, user, component, getAuditTypeByComponent(component), component.getComponentType());
+
+            return status;
+        }
+        if ( component.isArchived() ){
+            LOGGER.debug("automated Upgrade failed - target is archived component {}  version {} ", component.getName(), component.getVersion());
+            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_IS_ARCHIVED, component.getName());
+            status.setError(responseFormat);
+            componentsUtils.auditComponentAdmin(responseFormat, user, component, getAuditTypeByComponent(component), component.getComponentType());
+
+            return status;
+        }
+        switch (component.getComponentType()) {
+        case RESOURCE:
+            hadnleUpgradeVFInService(component, upgradeRequest, user, status);
+            break;
+        case SERVICE:
+            hadnleUpgradeService(component, upgradeRequest, user, status);
+            break;
+        default:
+            LOGGER.debug("automated Upgrade failed - Not supported type {} for component {} ", component.getComponentType(), component.getName());
+            status.setError(componentsUtils.getResponseFormat(ActionStatus.UNSUPPORTED_ERROR));
+        }
+        return status;
+    }
+
+    /**
+     * 
+     * @param componentId
+     * @param userId
+     * @return
+     */
+    public Either<List<ComponentDependency>, ResponseFormat> getComponentDependencies(String componentId, String userId) {
+
+        User user = userValidations.validateUserExists(userId, "get Component Dependencies for automated upgrade", false);
+        try {
+            return upgradeOperation.getComponentDependencies(componentId)
+                    .right()
+                    .map(rf -> componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(rf)));
+        } finally {
+            // all operation were read only. no commit needed
+            titanDao.rollback();
+        }
+
+    }
+
+    private UpgradeStatus hadnleUpgradeVFInService(Component component, List<UpgradeRequest> componentUids, User user, UpgradeStatus upgradeStatus) {
+        Resource vfResource = (Resource) component;
+        if (vfResource.getResourceType() != ResourceTypeEnum.VF) {
+            LOGGER.debug("automated Upgrade failed - target is not VF resource {} {} ", vfResource.getName(), vfResource.getResourceType());
+            upgradeStatus.setStatus(ActionStatus.GENERAL_ERROR);
+            componentsUtils.auditComponentAdmin(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR), user, component, getAuditTypeByComponent(component), component.getComponentType());
+            return upgradeStatus;
+        }
+        componentUids.forEach(request -> upgradeInSingleService(request, vfResource, user, upgradeStatus));
+        upgradeStatus.setStatus(ActionStatus.OK);
+        componentsUtils.auditComponentAdmin(componentsUtils.getResponseFormat(ActionStatus.OK), user, component, AuditingActionEnum.VF_UPGRADE_SERVICES, component.getComponentType());
+
+        return upgradeStatus;
+    }
+
+    private UpgradeStatus hadnleUpgradeService(Component component, List<UpgradeRequest> upgradeRequest, User user, UpgradeStatus upgradeStatus) {
+        if ( Role.TESTER.name().equals(user.getRole()) ){
+            user.setRole(Role.DESIGNER.name());
+            LOGGER.debug("Change temporary for update service reference user role from TESTER to DESINGER");
+        }
+        Service service = (Service) component;
+        upgradeRequest.forEach(request -> upgradeSingleService(request, service, user, upgradeStatus));
+        upgradeStatus.setStatus(ActionStatus.OK);
+        componentsUtils.auditComponentAdmin(componentsUtils.getResponseFormat(ActionStatus.OK), user, component, AuditingActionEnum.UPDATE_SERVICE_REFERENCE, component.getComponentType());
+       return upgradeStatus;
+    }
+
+    private ActionStatus upgradeSingleService(UpgradeRequest request, Service service, User user, UpgradeStatus upgradeStatus) {
+        if (request.getResourceId() == null) {
+            // upgrade proxy version
+            return upgradeInSingleService(request, service, user, upgradeStatus);
+        } else {
+            // upgrade allotted resource -> service
+            return upgradeChainResourceService(request, service, user, upgradeStatus);
+        }
+    }
+
+    private ActionStatus upgradeInSingleService(UpgradeRequest request, Component newVersionComponent, User user, UpgradeStatus upgradeStatus) {
+        String serviceId = request.getServiceId();
+        return toscaOperationFacade.getToscaFullElement(serviceId)
+                .either(l -> handleService(l, newVersionComponent, user, upgradeStatus), err -> {
+            LOGGER.debug("Failed to fetch service by id {} error {}", serviceId, err);
+            ActionStatus errS = componentsUtils.convertFromStorageResponse(err);
+            upgradeStatus.addServiceStatus(serviceId, errS);
+            return errS;
+        });
+    }
+
+    private ActionStatus upgradeChainResourceService(UpgradeRequest request, Service service, User user, UpgradeStatus upgradeStatus) {
+        Component resource;
+        Either<? extends Component, ActionStatus> upgradeAllottedResource = upgradeAllottedResource(request, user, upgradeStatus, service);
+        if (upgradeAllottedResource.isRight()) {
+            return upgradeAllottedResource.right().value();
+        }
+
+        resource = upgradeAllottedResource.left().value();
+        // update VF instance in service
+
+        Either<Component, StorageOperationStatus> serviceContainer = toscaOperationFacade.getToscaFullElement(request.getServiceId());
+        if (serviceContainer.isRight()) {
+            LOGGER.debug("Failed to fetch resource by id {} error {}", request.getServiceId(), serviceContainer.right().value());
+            ActionStatus errS = componentsUtils.convertFromStorageResponse(serviceContainer.right().value());
+            upgradeStatus.addServiceStatus(request.getServiceId(), errS);
+            return errS;
+        }
+        return handleService(serviceContainer.left().value(), resource, user, upgradeStatus);
+
+    }
+
+    private Either<? extends Component, ActionStatus> upgradeAllottedResource(UpgradeRequest request, User user, UpgradeStatus upgradeStatus, Service service) {
+        return getElement(request.getResourceId(), upgradeStatus, request)
+                .left()
+                .bind(l -> upgradeStateAlloted(request, user, upgradeStatus, service, l));
+    }
+
+    private Either<Component, ActionStatus> getElement(String id, UpgradeStatus upgradeStatus, UpgradeRequest request) {
+        return toscaOperationFacade.getToscaElement(id)
+                .right()
+                .map(err -> {
+            ActionStatus errS = componentsUtils.convertFromStorageResponse(err);
+            upgradeStatus.addServiceStatus(request.getServiceId(), errS);
+            return errS;
+        });
+    }
+
+    private Either<? extends Component, ActionStatus> upgradeStateAlloted(UpgradeRequest request, User user, UpgradeStatus upgradeStatus, Service service, Component resource) {
+        if (resource.getLifecycleState() == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
+            LOGGER.debug("Automated upgrade failedd. Alloted vf {} is in state NOT_CERTIFIED_CHECKOUT", request.getResourceId());
+            upgradeStatus.addServiceStatus(request.getServiceId(), ActionStatus.RESOURCE_LIFECYCLE_STATE_NOT_VALID);
+            return Either.right(ActionStatus.RESOURCE_LIFECYCLE_STATE_NOT_VALID);
+        }
+        // check out VF
+        // update properties-reference to service in VF on VFCI
+        return changeComponentState(resource, LifeCycleTransitionEnum.CHECKOUT, user,  upgradeStatus, request.getServiceId())
+                .left()
+                .bind(l -> updateAllottedPropsAndCertify(request, user, upgradeStatus, service, l));
+    }
+
+    private Either<? extends Component, ActionStatus> updateAllottedPropsAndCertify(UpgradeRequest request, User user, UpgradeStatus upgradeStatus, Service service, Component resource) {
+        Either<? extends Component, ActionStatus> result = null;
+        try {
+            List<String> instanceIds = upgradeOperation.getInstanceIdFromAllottedEdge(resource.getUniqueId(), service.getInvariantUUID());
+            if (instanceIds != null) {
+                Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = resource.getComponentInstancesProperties();
+                Map<String, List<ComponentInstanceProperty>> propertiesToUpdate = new HashMap<>();
+
+                instanceIds.forEach(id -> findPropertiesToUpdate(id, componentInstancesProperties, propertiesToUpdate, service));
+
+                Either<Map<String, List<ComponentInstanceProperty>>, StorageOperationStatus> updatePropsResult = toscaOperationFacade.updateComponentInstancePropsToComponent(propertiesToUpdate, resource.getUniqueId());
+                if (updatePropsResult.isRight()) {
+                    LOGGER.debug("Failed to update properties in  Allotted resource {} {}, Error {}. ", resource.getName(), resource.getUniqueId(), updatePropsResult.right().value());
+
+                    result = Either.right(ActionStatus.GENERAL_ERROR);
+                    return result;
+                }
+
+                // certify VF
+                result =  changeComponentState(resource, LifeCycleTransitionEnum.CERTIFY, user,  upgradeStatus, request.getServiceId());
+            } else {
+                // nothing to update
+                LOGGER.debug("No Instances to update in allotted resource {} ", resource.getName());
+                result = Either.right(ActionStatus.NO_INSTANCES_TO_UPGRADE);
+            }
+            return result;
+        } finally  {
+            if ( result.isRight() ){
+                // undo checkout resource in case of failure
+                LOGGER.debug("Failed to update Allotted resource {} {}, Error {}. UNDOCHEKOUT our resource", resource.getName(), resource.getUniqueId(), result.right().value());
+                       
+                upgradeStatus.addServiceStatus(request.getServiceId(), ActionStatus.GENERAL_ERROR);
+            }
+        }
+    }
+
+    private void undocheckoutComponent(User user, Component resource) {
+        Either<? extends Component, ResponseFormat> changeComponentState = lifecycleBusinessLogic.changeComponentState(resource.getComponentType(), resource.getUniqueId(), user, LifeCycleTransitionEnum.UNDO_CHECKOUT, changeInfo, false, true);
+        if (changeComponentState.isRight()) {
+            LOGGER.debug("Failed to UNDOCHECKOUT Service {} {}, Error {}", resource.getName(), resource.getUniqueId(), changeComponentState.right().value());
+        }
+    }
+
+    private void findPropertiesToUpdate(String id, Map<String, List<ComponentInstanceProperty>> componentInstancesProperties, Map<String, List<ComponentInstanceProperty>> propertiesToUpdate, Service service) {
+        List<ComponentInstanceProperty> list = componentInstancesProperties.get(id);
+        List<ComponentInstanceProperty> propsPerInstance = new ArrayList<>();
+        list.forEach(p -> {
+            if (UUID_PROPS_NAMES.contains(p.getName())) {
+                p.setValue(service.getUUID());
+                propsPerInstance.add(p);
+            }
+            if (INV_UUID_PROPS_NAMES.contains(p.getName())) {
+                p.setValue(service.getInvariantUUID());
+                propsPerInstance.add(p);
+            }
+            if (NAME_PROPS_NAMES.contains(p.getName())) {
+                p.setValue(service.getName());
+                propsPerInstance.add(p);
+            }
+        });
+        propertiesToUpdate.put(id, propsPerInstance);
+    }
+
+    private ActionStatus handleService(Component component, Component newVersionComponent, User user, UpgradeStatus upgradeStatus) {
+        if (component.getComponentType() != ComponentTypeEnum.SERVICE) {
+            LOGGER.debug("component with id  {} and name {} isn't SERVICE.  type{} ", component.getName(), component.getUniqueId(), component.getComponentType());
+            upgradeStatus.addServiceStatus(component, ActionStatus.GENERAL_ERROR);
+            return ActionStatus.GENERAL_ERROR;
+        }
+        
+        Service service = (Service) component;
+        if (component.getLifecycleState() != LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
+            LOGGER.debug("Service {} {} is not in CHECKOUT state . Try to checkout it", component.getName(), component.getUniqueId());
+            Either<? extends Component, ActionStatus> changeComponentState = changeComponentState(component, LifeCycleTransitionEnum.CHECKOUT, user,  upgradeStatus, null);
+            if ( changeComponentState.isRight() ){
+                return changeComponentState.right().value();
+            }
+            service = (Service) changeComponentState.left().value();
+            //need to fetch service again with capability properties
+            Either<Component, StorageOperationStatus> toscaFullElement = toscaOperationFacade.getToscaFullElement(service.getUniqueId());
+            if ( toscaFullElement.isRight() ){
+                return componentsUtils.convertFromStorageResponse(toscaFullElement.right().value());
+            }
+            service = (Service) toscaFullElement.left().value();
+        }else{
+            LOGGER.debug("Service {} {} is  in CHECKOUT state . Restricted update operation", component.getName(), component.getUniqueId());
+            upgradeStatus.addServiceStatus(component, ActionStatus.COMPONENT_IN_CHECKOUT_STATE);
+            return ActionStatus.COMPONENT_IN_CHECKOUT_STATE;          
+        }
+        ActionStatus status = ActionStatus.GENERAL_ERROR;
+        try {
+            status = handleInstances(newVersionComponent, user, upgradeStatus, service);
+        } finally {
+            if (status != ActionStatus.OK) {
+                LOGGER.debug("Failed to upgrade instance for service {} status {}. Undocheckout service", service.getName(), status);
+                undocheckoutComponent(user, service);
+
+                upgradeStatus.addServiceStatus(component, status);
+            }
+        }
+        return status;
+    }
+    
+    private Either<? extends Component,ActionStatus> changeComponentState(Component component, LifeCycleTransitionEnum nextState, User user, UpgradeStatus upgradeStatus, String idForStatus){
+        if ( component.isArchived() ){
+            LOGGER.debug("Component  {} from type {} id {} is archived, Error {}", nextState, component.getName(), component.getComponentType(), component.getUniqueId());
+            setUpgradeStatus(component, upgradeStatus, idForStatus);
+            return Either.right(ActionStatus.COMPONENT_IS_ARCHIVED);
+        }
+        return lifecycleBusinessLogic.changeComponentState(component.getComponentType(), component.getUniqueId(), user, nextState, changeInfo, false, true)
+                .right()
+                .map(err-> {
+                    LOGGER.debug("Failed to {} Component  {} from type {} id {}, Error {}", nextState, component.getName(), component.getComponentType(), component.getUniqueId(), err);
+                    setUpgradeStatus(component, upgradeStatus, idForStatus);
+                    return ActionStatus.GENERAL_ERROR;
+                         
+                });
+    }
+
+
+    private void setUpgradeStatus(Component component, UpgradeStatus upgradeStatus, String idForStatus) {
+        if ( idForStatus == null ){ 
+            upgradeStatus.addServiceStatus(component, ActionStatus.GENERAL_ERROR);
+        }else{
+            upgradeStatus.addServiceStatus(idForStatus, ActionStatus.GENERAL_ERROR);
+        }
+    }
+
+    private ActionStatus handleInstances(Component newVersionComponent, User user, UpgradeStatus upgradeStatus, Service service) {
+        List<ComponentInstance> componentInstances = service.getComponentInstances();
+        if (componentInstances != null) {
+            List<ComponentInstance> instanceToChange = componentInstances
+                    .stream()
+                    .filter(ci -> matchInstance(ci, newVersionComponent))
+                    .collect(Collectors.toList());
+            if (instanceToChange != null && !instanceToChange.isEmpty()) {
+                return changeInstances(newVersionComponent, user, upgradeStatus, service, instanceToChange);
+            } else {
+                LOGGER.debug("No instances for change version");
+                return ActionStatus.NO_INSTANCES_TO_UPGRADE;
+            }
+        }
+        return ActionStatus.OK;
+    }
+
+    private ActionStatus changeInstances(Component newVersionComponent, User user, UpgradeStatus upgradeStatus, Service service, List<ComponentInstance> instanceToChange) {
+        Component serviceToUpgrade = service;
+        for (ComponentInstance ci : instanceToChange) {
+            Either<Component, ActionStatus> fetchService = fetchService(service.getUniqueId(),service.getName());
+            if ( fetchService.isRight()){
+                upgradeStatus.addServiceStatus(service, fetchService.right().value());
+                return fetchService.right().value();
+            }
+            serviceToUpgrade = fetchService.left().value();
+            ActionStatus status = changeVersionOfInstance(serviceToUpgrade, ci, newVersionComponent, user);
+            if (status != ActionStatus.OK) {
+                LOGGER.debug("Failed to change for instance {} version in service {}", ci.getName(), service.getName());
+                upgradeStatus.addServiceStatus(service, status);
+                return status;
+            }
+        }
+        Either<Component, ActionStatus> fetchService = fetchService(service.getUniqueId(),service.getName());
+        if ( fetchService.isRight()){
+            upgradeStatus.addServiceStatus(service, fetchService.right().value());
+            return fetchService.right().value();
+        }
+        serviceToUpgrade = fetchService.left().value();
+        
+        Either<? extends Component, ActionStatus> changeComponentState = changeComponentState(serviceToUpgrade, LifeCycleTransitionEnum.CHECKIN, user,  upgradeStatus, null);
+        if ( changeComponentState.isRight() ){
+            return changeComponentState.right().value();
+        }
+        upgradeStatus.addServiceStatus(serviceToUpgrade, ActionStatus.OK);
+        return ActionStatus.OK;
+    }
+
+
+    private Either<Component, ActionStatus> fetchService(String uniqueId, String name) {
+        return toscaOperationFacade.getToscaFullElement(uniqueId)
+                .right()
+                .map(r->{
+                    LOGGER.debug("Failed to fetch service {} id {} error {}", name, uniqueId, r);
+                    return ActionStatus.GENERAL_ERROR;
+                });
+    }
+
+    private ActionStatus changeVersionOfInstance(Component service, ComponentInstance ci, Component newVersionComponent, User user) {
+        LOGGER.debug("In Service {} change instance version {} to version {}", service.getName(), ci.getName(), newVersionComponent.getVersion());
+        ComponentInstance newComponentInstance = new ComponentInstance();
+        newComponentInstance.setComponentUid(newVersionComponent.getUniqueId());
+        Either<ComponentInstance, ResponseFormat> changeInstanceVersion = componentInstanceBusinessLogic.changeInstanceVersion(service, ci, newComponentInstance, user, service.getComponentType());
+        if (changeInstanceVersion.isLeft()) {
+            return ActionStatus.OK;
+        } else {
+            return ActionStatus.GENERAL_ERROR;
+        }
+    }
+
+    private boolean matchInstance(ComponentInstance ci, Component newVersionComponent) {
+        Either<Component, StorageOperationStatus> toscaElement;
+        ComponentParametersView filters = new ComponentParametersView(true);
+        if (newVersionComponent.getComponentType() == ComponentTypeEnum.SERVICE) {
+            if (ci.getIsProxy()) {
+                toscaElement = toscaOperationFacade.getToscaElement(ci.getSourceModelUid(), filters);
+            } else {
+                return false;
+            }
+        } else {
+            toscaElement = toscaOperationFacade.getToscaElement(ci.getComponentUid(), filters);
+        }
+        if (toscaElement.isLeft()) {
+            Component origin = toscaElement.left().value();
+            if (newVersionComponent.getInvariantUUID().equals(origin.getInvariantUUID()) && !newVersionComponent.getVersion().equals(origin.getVersion())) {
+                // only for same invariant UUID (same component) but different versions
+                return true;
+            }
+        }
+        return false;
+    }
+    private AuditingActionEnum getAuditTypeByComponent(Component component){
+        if ( ComponentTypeEnum.RESOURCE == component.getComponentType()){
+            return AuditingActionEnum.VF_UPGRADE_SERVICES;
+        }
+        return AuditingActionEnum.UPDATE_SERVICE_REFERENCE;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeRequest.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeRequest.java
new file mode 100644
index 0000000000..0684399d03
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeRequest.java
@@ -0,0 +1,32 @@
+package org.openecomp.sdc.be.components.upgrade;
+
+public class UpgradeRequest {
+    private String serviceId;
+    private String resourceId;
+     
+    public UpgradeRequest(){
+        
+    }
+    public UpgradeRequest(String serviceId ){
+        this.serviceId = serviceId;
+    }
+    public UpgradeRequest(String serviceId, String resourceId ){
+        this.serviceId = serviceId;
+        this.resourceId = resourceId;
+    }
+    
+    public String getServiceId() {
+        return serviceId;
+    }
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+    public String getResourceId() {
+        return resourceId;
+    }
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
+    }
+    
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeStatus.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeStatus.java
new file mode 100644
index 0000000000..bb3dc9dd66
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/upgrade/UpgradeStatus.java
@@ -0,0 +1,64 @@
+package org.openecomp.sdc.be.components.upgrade;
+
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.exception.ResponseFormat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UpgradeStatus {
+    ActionStatus status;
+    ResponseFormat error;
+    
+    
+    List<ServiceInfo> componentToUpgradeStatus;
+
+    public ActionStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(ActionStatus status) {
+        this.status = status;
+    }
+
+    public List<ServiceInfo> getComponentToUpgradeStatus() {
+        return componentToUpgradeStatus;
+    }
+
+    public void setComponentToUpgradeStatus(List<ServiceInfo> componentToUpgradeStatus) {
+        this.componentToUpgradeStatus = componentToUpgradeStatus;
+    }
+
+    public void addServiceStatus(ServiceInfo info) {
+        checkAndCreate();
+        componentToUpgradeStatus.add(info);
+    }
+    public void addServiceStatus(String serviceId, ActionStatus status) {
+        checkAndCreate();
+        ServiceInfo info = new ServiceInfo(serviceId, status );
+        componentToUpgradeStatus.add(info);
+    }
+    public void addServiceStatus(Component component, ActionStatus status) {
+        checkAndCreate();
+        ServiceInfo info = new ServiceInfo(component.getUniqueId(), status );
+        info.setName(component.getName());
+        info.setVersion(component.getVersion());
+        componentToUpgradeStatus.add(info);
+    }
+
+    private void checkAndCreate() {
+        if (componentToUpgradeStatus == null) {
+            componentToUpgradeStatus = new ArrayList<>();
+        }
+    }
+
+    public ResponseFormat getError() {
+        return error;
+    }
+
+    public void setError(ResponseFormat error) {
+        this.error = error;
+    }
+    
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/Utils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/Utils.java
index f7c639f6e0..f935a73de6 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/Utils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/utils/Utils.java
@@ -1,19 +1,15 @@
 package org.openecomp.sdc.be.components.utils;
 
+import org.apache.tinkerpop.shaded.minlog.Log;
+
+import javax.validation.constraints.NotNull;
 import java.security.SecureRandom;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.validation.constraints.NotNull;
-
-import org.apache.tinkerpop.shaded.minlog.Log;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class Utils {
 
-    private static final Logger log = LoggerFactory.getLogger(Utils.class);
     private static final Pattern COUNTER_PATTERN = Pattern.compile("\\d+$");
     private static final SecureRandom random = new SecureRandom();
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AccessValidations.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AccessValidations.java
index da098acb13..335a9398d7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AccessValidations.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AccessValidations.java
@@ -1,10 +1,12 @@
 package org.openecomp.sdc.be.components.validation;
 
-import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.exception.ResponseFormat;
+import org.openecomp.sdc.be.user.Role;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @org.springframework.stereotype.Component
 public class AccessValidations {
@@ -18,17 +20,45 @@ public class AccessValidations {
         this.componentValidations = componentValidations;
     }
 
-    public Component validateUserCanWorkOnComponentAndLockIt(ComponentTypeEnum componentTypeEnum, String componentId, String userId, String actionContext) {
-        userValidations.validateUserExists(userId, actionContext, false)
-                .left()
-                .on(this::onUserError);
+    public Component validateUserCanRetrieveComponentData(String componentId, String componentType, String userId, String actionContext)  {
+        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
+        retrieveUser(userId, actionContext);
+	    return componentValidations.getComponent(componentId, componentTypeEnum);
+    }
 
-        return componentValidations.validateComponentIsCheckedOutByUserAndLockIt(componentTypeEnum, componentId, userId);
+    public Component validateUserCanWorkOnComponent(String componentId, ComponentTypeEnum componentType, String userId, String actionContext) {
+        User user = retrieveUser(userId, actionContext);
+        validateUserIsAdminOrDesigner(user);
+        return componentValidations.validateComponentIsCheckedOutByUser(componentId, componentType, userId);
+    }
+    private User retrieveUser(String userId, String actionContext) {
+        return userValidations.validateUserExists(userId, actionContext, true);
     }
 
-    private User onUserError(ResponseFormat responseFormat) {
-        throw new ComponentException(responseFormat);
+    public void validateUserExist(String userId, String actionContext) {
+        userValidations.validateUserExists(userId, actionContext, false);
     }
 
+    public User userIsAdminOrDesigner(String userId, String actionContext){
+        User user = retrieveUser(userId, actionContext);
+        validateUserIsAdminOrDesigner(user);
+        return user;
+    }
 
+    private void validateUserIsAdminOrDesigner(User user) {
+        List<Role> roles = new ArrayList<>(2);
+        roles.add(Role.ADMIN);
+        roles.add(Role.DESIGNER);
+        userValidations.validateUserRole(user, roles);
+    }
+
+    public void validateUserCanWorkOnComponent(Component component, String userId, String actionContext) {
+        User user = retrieveUser(userId, actionContext);
+        validateUserIsAdminOrDesigner(user);
+        componentValidations.validateComponentIsCheckedOutByUser(component, userId);
+    }
+
+    public void validateUserExists(String userId, String context) {
+        retrieveUser(userId, context);
+    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AnnotationValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AnnotationValidator.java
new file mode 100644
index 0000000000..2b313ac751
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/AnnotationValidator.java
@@ -0,0 +1,64 @@
+package org.openecomp.sdc.be.components.validation;
+
+import org.openecomp.sdc.be.components.impl.ResourceImportManager;
+import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
+import org.openecomp.sdc.be.datatypes.elements.Annotation;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.AnnotationTypeDefinition;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class AnnotationValidator {
+
+
+    private final PropertyValidator propertyValidator;
+    private final ExceptionUtils exceptionUtils;
+    private final ApplicationDataTypeCache dataTypeCache;
+    private final ComponentsUtils componentsUtils;
+
+    private static final Logger log = Logger.getLogger(ResourceImportManager.class);
+
+
+    public AnnotationValidator(PropertyValidator propertyValidator
+                               , ExceptionUtils exceptionUtils, ApplicationDataTypeCache dataTypeCache
+                               ,ComponentsUtils componentsUtils) {
+        this.propertyValidator = propertyValidator;
+        this.exceptionUtils = exceptionUtils;
+        this.dataTypeCache = dataTypeCache;
+        this.componentsUtils = componentsUtils;
+    }
+
+    public List<Annotation> validateAnnotationsProperties(Annotation annotation, AnnotationTypeDefinition dbAnnotationTypeDefinition) {
+        List<Annotation> validAnnotations = new ArrayList<>();
+        if (annotation != null && propertiesValidator(
+                annotation.getProperties(), dbAnnotationTypeDefinition.getProperties())) {
+                    validAnnotations.add(annotation);
+        }
+        return validAnnotations;
+    }
+
+    private boolean propertiesValidator(List<PropertyDataDefinition> properties, List<PropertyDefinition> dbAnnotationTypeDefinitionProperties) {
+        List<PropertyDefinition> propertyDefinitionsList = new ArrayList<>();
+        if (properties == null || dbAnnotationTypeDefinitionProperties == null) {
+            return false;
+        }
+        properties.stream()
+                .forEach(property -> propertyDefinitionsList.add(new PropertyDefinition(property)));
+        Map<String, DataTypeDefinition> allDataTypes = dataTypeCache.getAll()
+                .left()
+                .on( error -> exceptionUtils
+                .rollBackAndThrow(error));
+        propertyValidator.thinPropertiesValidator(propertyDefinitionsList, dbAnnotationTypeDefinitionProperties, allDataTypes);
+        return true;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java
index c2722b5de0..d5a94c038a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ComponentValidations.java
@@ -20,13 +20,6 @@
 
 package org.openecomp.sdc.be.components.validation;
 
-import static java.util.stream.Collectors.toList;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import org.apache.commons.collections.CollectionUtils;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -39,21 +32,31 @@ import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.GroupDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.StorageException;
-import org.openecomp.sdc.be.model.operations.api.IGraphLockOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.common.util.ValidationUtils;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import static java.util.stream.Collectors.toList;
 
 @org.springframework.stereotype.Component
-public final class ComponentValidations {
+public class ComponentValidations {
 
     private final ToscaOperationFacade toscaOperationFacade;
-    private final IGraphLockOperation graphLockOperation;
 
-    public ComponentValidations(ToscaOperationFacade toscaOperationFacade, IGraphLockOperation graphLockOperation) {
+    public ComponentValidations(ToscaOperationFacade toscaOperationFacade) {
         this.toscaOperationFacade = toscaOperationFacade;
-        this.graphLockOperation = graphLockOperation;
+    }
+
+    public Optional<ComponentInstance> getComponentInstance(Component component, String instanceId) {
+        return component.getComponentInstances()
+                .stream()
+                .filter(ci -> ci.getUniqueId().equals(instanceId))
+                .findFirst();
     }
 
     public static boolean validateComponentInstanceExist(Component component, String instanceId) {
@@ -103,40 +106,35 @@ public final class ComponentValidations {
         return !existingNames.contains(normalizedNewName);
     }
 
-    public Component validateComponentIsCheckedOutByUserAndLockIt(ComponentTypeEnum componentTypeEnum, String componentId, String userId) {
-        Component component = getComponent(componentId, componentTypeEnum);
-
+    void validateComponentIsCheckedOutByUser(Component component, String userId) {
         if (!ComponentValidationUtils.canWorkOnComponent(component, userId)) {
-            throw new ComponentException(ActionStatus.ILLEGAL_COMPONENT_STATE, component.getName());
+            throw new ComponentException(ActionStatus.ILLEGAL_COMPONENT_STATE, component.getComponentType().name(), component.getName(), component.getLifecycleState().name());
         }
-
-        lockComponent(component);
-
+    }
+    Component validateComponentIsCheckedOutByUser(String componentId, ComponentTypeEnum componentTypeEnum, String userId) {
+        Component component = getComponent(componentId, componentTypeEnum);
+        validateComponentIsCheckedOutByUser(component, userId);
         return component;
     }
 
-    private Component getComponent(String componentId, ComponentTypeEnum componentType) {
+    Component getComponent(String componentId, ComponentTypeEnum componentType) {
         Component component = toscaOperationFacade.getToscaElement(componentId, new ComponentParametersView())
                 .left()
-                .on(this::onToscaOperationError);
+                .on(storageOperationStatus -> onToscaOperationError(storageOperationStatus, componentId));
 
-        if (componentType!=component.getComponentType()) {
-            throw new ComponentException(ActionStatus.INVALID_RESOURCE_TYPE);
-        }
+        validateComponentType(component, componentType);
 
         return component;
     }
 
-    private void lockComponent(Component component) {
-        StorageOperationStatus lockComponentStatus = graphLockOperation.lockComponent(component.getUniqueId(),
-                component.getComponentType().getNodeType());
-        if (!StorageOperationStatus.OK.equals(lockComponentStatus)) {
-            throw new StorageException(lockComponentStatus);
+    private void validateComponentType(Component component, ComponentTypeEnum componentType) {
+        if (componentType!=component.getComponentType()) {
+            throw new ComponentException(ActionStatus.INVALID_RESOURCE_TYPE);
         }
     }
 
-    private Component onToscaOperationError(StorageOperationStatus storageOperationStatus) {
-        throw new StorageException(storageOperationStatus);
+    private Component onToscaOperationError(StorageOperationStatus storageOperationStatus, String componentId) {
+        throw new StorageException(storageOperationStatus, componentId);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/InterfaceOperationValidation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/InterfaceOperationValidation.java
index e57c7b9496..9225f36a06 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/InterfaceOperationValidation.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/InterfaceOperationValidation.java
@@ -16,14 +16,7 @@
 
 package org.openecomp.sdc.be.components.validation;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
@@ -42,7 +35,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Component("interfaceOperationValidation")
 public class InterfaceOperationValidation {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/PolicyUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/PolicyUtils.java
index c1af08308e..80747b5991 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/PolicyUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/PolicyUtils.java
@@ -1,12 +1,6 @@
 package org.openecomp.sdc.be.components.validation;
 
-import java.util.Collections;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.StringUtils;
+import fj.data.Either;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -15,18 +9,26 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.PolicyDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import static org.apache.commons.collections.MapUtils.isEmpty;
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.openecomp.sdc.common.api.Constants.GROUP_POLICY_NAME_DELIMETER;
 
 /**
  * Provides specific functionality for policy
  */
 public class PolicyUtils {
 
-    private static final Logger log = LoggerFactory.getLogger(PolicyUtils.class);
+    private static final Logger log = Logger.getLogger(PolicyUtils.class);
 
     private PolicyUtils() {
         // No instances allowed
@@ -40,7 +42,7 @@ public class PolicyUtils {
      */
     public static int getNextPolicyCounter(Map<String, PolicyDefinition> policies) {
         int nextCounter = 0;
-        if (MapUtils.isNotEmpty(policies)) {
+        if (isNotEmpty(policies)) {
             int nextCounterFromIds = policies.values()
                                              .stream()
                                              .map(p -> extractNextPolicyCounterFromUniqueId(p.getUniqueId()))
@@ -72,13 +74,12 @@ public class PolicyUtils {
     /**
      * Retrieves the set of the excluded policy types for the specified component
      *
-     * @param  the component
      * @return the set of the policies
      */
     public static Set<String> getExcludedPolicyTypesByComponent(Component component) {
-        if (MapUtils.isEmpty(ConfigurationManager.getConfigurationManager()
-                                                 .getConfiguration()
-                                                 .getExcludedPolicyTypesMapping())) {
+        if (isEmpty(ConfigurationManager.getConfigurationManager()
+                                        .getConfiguration()
+                                        .getExcludedPolicyTypesMapping())) {
             return Collections.emptySet();
         }
         if (component.getComponentType() == ComponentTypeEnum.SERVICE) {
@@ -95,7 +96,7 @@ public class PolicyUtils {
 
     private static int extractNextPolicyCounterFromUniqueId(String uniqueId) {
         int counter = 0;
-        if (StringUtils.isNotEmpty(uniqueId)) {
+        if (isNotEmpty(uniqueId)) {
             counter = extractNextPolicyCounter(uniqueId, uniqueId.lastIndexOf(Constants.POLICY_UID_POSTFIX));
         }
         return counter;
@@ -103,7 +104,7 @@ public class PolicyUtils {
 
     private static int extractNextPolicyCounterFromName(String policyName) {
         int counter = 0;
-        if (StringUtils.isNotEmpty(policyName)) {
+        if (isNotEmpty(policyName)) {
             counter = extractNextPolicyCounter(policyName, policyName.length());
         }
         return counter;
@@ -112,11 +113,12 @@ public class PolicyUtils {
     private static int extractNextPolicyCounter(String policyName, int endIndex) {
         int counter = 0;
         try {
-            counter = Integer.valueOf(policyName.substring(policyName.lastIndexOf(Constants.GROUP_POLICY_NAME_DELIMETER) + Constants.GROUP_POLICY_NAME_DELIMETER
-                    .length(), endIndex)) + 1;
+            int beginIndex = policyName.lastIndexOf(GROUP_POLICY_NAME_DELIMETER) + GROUP_POLICY_NAME_DELIMETER.length();
+            String counterStr = policyName.substring(beginIndex, endIndex);
+            counter = Integer.valueOf(counterStr) + 1;
         }
         catch (NumberFormatException | IndexOutOfBoundsException e) {
-            log.error("The exception {} occurred upon extraction counter from the srting value {}. ", e, policyName);
+            log.error("#extractNextPolicyCounter - An error occurred when attempting to extract counter from policy name [{}]. ", policyName, e);
         }
         return counter;
     }
@@ -126,85 +128,52 @@ public class PolicyUtils {
     }
 
     private static void validateImmutablePolicyFields(PolicyDefinition receivedPolicy, PolicyDefinition validPolicy) {
-        boolean isUpdatedField = isUpdatedField(receivedPolicy.getUniqueId(), validPolicy.getUniqueId());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getUniqueId(), validPolicy.getUniqueId(), JsonPresentationFields.UNIQUE_ID);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getComponentName(), validPolicy.getComponentName());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getComponentName(), validPolicy.getComponentName(), JsonPresentationFields.CI_COMPONENT_NAME);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getDerivedFrom(), validPolicy.getDerivedFrom());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getDerivedFrom(), validPolicy.getDerivedFrom(), JsonPresentationFields.DERIVED_FROM);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getDescription(), validPolicy.getDescription());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getDescription(), validPolicy.getDescription(), JsonPresentationFields.DESCRIPTION);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getInvariantName(), validPolicy.getInvariantName());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getInvariantName(), validPolicy.getInvariantName(), JsonPresentationFields.CI_INVARIANT_NAME);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getInvariantUUID(), validPolicy.getInvariantUUID());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getInvariantUUID(), validPolicy.getInvariantUUID(), JsonPresentationFields.INVARIANT_UUID);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getPolicyTypeName(), validPolicy.getPolicyTypeName());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getPolicyTypeName(), validPolicy.getPolicyTypeName(), JsonPresentationFields.TYPE);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getPolicyTypeUid(), validPolicy.getPolicyTypeUid());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getPolicyTypeUid(), validPolicy.getPolicyTypeUid(), JsonPresentationFields.TYPE_UNIQUE_ID);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getPolicyUUID(), validPolicy.getPolicyUUID());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getPolicyUUID(), validPolicy.getPolicyUUID(), JsonPresentationFields.UUID);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getVersion(), validPolicy.getVersion());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getVersion(), validPolicy.getVersion(), JsonPresentationFields.VERSION);
-        }
-        isUpdatedField = isUpdatedField(receivedPolicy.getIsFromCsar().toString(), validPolicy.getIsFromCsar()
-                                                                                              .toString());
-        if (isUpdatedField) {
-            logImmutableFieldUpdateWarning(receivedPolicy.getIsFromCsar().toString(), validPolicy.getIsFromCsar()
-                                                                                                 .toString(), JsonPresentationFields.IS_FROM_CSAR);
-        }
+        logImmutableFieldUpdateWarning(receivedPolicy.getUniqueId(), validPolicy.getUniqueId(), JsonPresentationFields.UNIQUE_ID);
+        logImmutableFieldUpdateWarning(receivedPolicy.getComponentName(), validPolicy.getComponentName(), JsonPresentationFields.CI_COMPONENT_NAME);
+        logImmutableFieldUpdateWarning(receivedPolicy.getDerivedFrom(), validPolicy.getDerivedFrom(), JsonPresentationFields.DERIVED_FROM);
+        logImmutableFieldUpdateWarning(receivedPolicy.getDescription(), validPolicy.getDescription(), JsonPresentationFields.DESCRIPTION);
+        logImmutableFieldUpdateWarning(receivedPolicy.getInvariantName(), validPolicy.getInvariantName(), JsonPresentationFields.CI_INVARIANT_NAME);
+        logImmutableFieldUpdateWarning(receivedPolicy.getInvariantUUID(), validPolicy.getInvariantUUID(), JsonPresentationFields.INVARIANT_UUID);
+        logImmutableFieldUpdateWarning(receivedPolicy.getPolicyTypeName(), validPolicy.getPolicyTypeName(), JsonPresentationFields.TYPE);
+        logImmutableFieldUpdateWarning(receivedPolicy.getPolicyTypeUid(), validPolicy.getPolicyTypeUid(), JsonPresentationFields.TYPE_UNIQUE_ID);
+        logImmutableFieldUpdateWarning(receivedPolicy.getPolicyUUID(), validPolicy.getPolicyUUID(), JsonPresentationFields.UUID);
+        logImmutableFieldUpdateWarning(receivedPolicy.getVersion(), validPolicy.getVersion(), JsonPresentationFields.VERSION);
+        logImmutableFieldUpdateWarning(receivedPolicy.getIsFromCsar().toString(), validPolicy.getIsFromCsar().toString(), JsonPresentationFields.IS_FROM_CSAR);
     }
 
     private static boolean isUpdatedField(String oldField, String newField) {
         boolean isUpdatedField = false;
-        if (StringUtils.isEmpty(oldField) && StringUtils.isNotEmpty(newField)) {
+        if (isEmpty(oldField) && isNotEmpty(newField)) {
             isUpdatedField = true;
         }
-        if (StringUtils.isNotEmpty(oldField) && StringUtils.isNotEmpty(newField) && !oldField.equals(newField)) {
+        else if (isNotEmpty(oldField) && isNotEmpty(newField) && !oldField.equals(newField)) {
             isUpdatedField = true;
         }
         return isUpdatedField;
     }
 
     private static void logImmutableFieldUpdateWarning(String oldValue, String newValue, JsonPresentationFields field) {
-        log.warn("Update of the field {} of a policy not allowed. The change will be ignored. The old value is {} , the new value is {}. ", field, oldValue, newValue);
+        if (isUpdatedField(oldValue, newValue)) {
+            log.warn("#logImmutableFieldUpdateWarning - Update of the field {} of a policy not allowed. The change will be ignored. The old value is {} , the new value is {}. ", field, oldValue, newValue);
+        }
     }
 
     private static Either<PolicyDefinition, ActionStatus> validateUpdatePolicyName(PolicyDefinition receivedPolicy, PolicyDefinition validPolicy, Map<String, PolicyDefinition> policies) {
         Either<PolicyDefinition, ActionStatus> result = null;
         Optional<PolicyDefinition> sameNamePolicy = Optional.empty();
-        if (StringUtils.isEmpty(receivedPolicy.getName()) || !ValidationUtils.POLICY_NAME_PATTERN.matcher(receivedPolicy
+        if (isEmpty(receivedPolicy.getName()) || !ValidationUtils.POLICY_NAME_PATTERN.matcher(receivedPolicy
                 .getName()).matches()) {
-            log.error("Failed to validate the name {} of the policy {}. ", receivedPolicy.getName(), receivedPolicy.getUniqueId());
+            log.error("#validateUpdatePolicyName - Failed to validate the name {} of the policy {}. ", receivedPolicy.getName(), receivedPolicy.getUniqueId());
             result = Either.right(ActionStatus.INVALID_POLICY_NAME);
         }
-        if (result == null && MapUtils.isNotEmpty(policies)) {
+        if (result == null && isNotEmpty(policies)) {
             sameNamePolicy = policies.values()
                                      .stream()
                                      .filter(p -> p.getName().equals(receivedPolicy.getName()))
                                      .findFirst();
         }
         if (sameNamePolicy.isPresent()) {
-            log.error("Failed to validate the name {} of the policy {}. The policy {} with the same name already exists. ", receivedPolicy
+            log.error("#validateUpdatePolicyName - Failed to validate the name {} of the policy {}. The policy {} with the same name already exists. ", receivedPolicy
                     .getName(), receivedPolicy.getUniqueId(), sameNamePolicy.get().getUniqueId());
             result = Either.right(ActionStatus.POLICY_NAME_ALREADY_EXIST);
         }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/PropertyValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/PropertyValidator.java
new file mode 100644
index 0000000000..94751593fa
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/PropertyValidator.java
@@ -0,0 +1,141 @@
+package org.openecomp.sdc.be.components.validation;
+
+import fj.data.Either;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
+import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
+import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
+import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+public class PropertyValidator {
+
+    private final PropertyOperation propertyOperation;
+    private final ComponentsUtils componentsUtils;
+    private final ApplicationDataTypeCache applicationDataTypeCache;
+    private final ExceptionUtils exceptionUtils;
+    private static final Logger log = LoggerFactory.getLogger(ResourceBusinessLogic.class);
+
+    public PropertyValidator(PropertyOperation propertyOperation, ComponentsUtils componentsUtils,
+                             ApplicationDataTypeCache applicationDataTypeCache, ExceptionUtils exceptionUtils) {
+        this.exceptionUtils = exceptionUtils;
+        this.propertyOperation = propertyOperation;
+        this.componentsUtils = componentsUtils;
+        this.applicationDataTypeCache = applicationDataTypeCache;
+    }
+
+    public void thinPropertiesValidator(List<PropertyDefinition> properties,
+                                        List<PropertyDefinition> dbAnnotationTypeDefinitionProperties,
+                                        Map<String, DataTypeDefinition> allDataTypes){
+        for (PropertyDefinition property : properties) {
+            PropertyDefinition annotationTypeSpecificProperty = isPropertyInsideAnnotationTypeProperties(
+                    dbAnnotationTypeDefinitionProperties, property);
+            if(annotationTypeSpecificProperty!=null){
+                verifyPropertyIsOfDefinedType(property, annotationTypeSpecificProperty, allDataTypes);
+            }
+        }
+    }
+
+    private void verifyPropertyIsOfDefinedType(PropertyDefinition property,
+                                               PropertyDefinition typeSpecificProperty,
+                                               Map<String, DataTypeDefinition> allDataTypes) {
+            propertyOperation.validateAndUpdatePropertyValue(typeSpecificProperty.getType(),
+                    property.getValue(), typeSpecificProperty.getSchemaType(), allDataTypes)
+                    .left()
+                    .on( error ->
+                    exceptionUtils.rollBackAndThrow(
+                            ActionStatus.INVALID_PROPERTY_TYPE, property.getType(), property.getName())
+            );
+    }
+
+    private PropertyDefinition isPropertyInsideAnnotationTypeProperties(
+            List<PropertyDefinition> dbAnnotationTypeDefinitionProperties, PropertyDefinition property) {
+        Optional<PropertyDefinition> optionalResult = dbAnnotationTypeDefinitionProperties.stream()
+                .filter(prop -> prop.getName()
+                        .equals(property.getName()))
+                .findFirst();
+        if (optionalResult.isPresent()){
+            return optionalResult.get();
+        }
+        ResponseFormat responseFormat = componentsUtils.getResponseFormat(
+                ActionStatus.PROPERTY_NOT_FOUND, property.getType(), property.getName());
+        exceptionUtils.rollBackAndThrow(responseFormat);
+        return null;
+    }
+
+    public Either<Boolean, ResponseFormat> iterateOverProperties(List<PropertyDefinition> properties){
+        Either<Boolean, ResponseFormat> eitherResult = Either.left(true);
+        String type = null;
+        String innerType = null;
+        for (PropertyDefinition property : properties) {
+            if (!propertyOperation.isPropertyTypeValid(property)) {
+                log.info("Invalid type for property {}", property);
+                ResponseFormat responseFormat = componentsUtils.getResponseFormat(
+                        ActionStatus.INVALID_PROPERTY_TYPE, property.getType(), property.getName());
+                eitherResult = Either.right(responseFormat);
+                break;
+            }
+
+            Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = applicationDataTypeCache.getAll();
+            if (allDataTypes.isRight()) {
+                TitanOperationStatus status = allDataTypes.right().value();
+                BeEcompErrorManager.getInstance().logInternalFlowError("AddPropertyToGroup", "Failed to validate property. Status is " + status, BeEcompErrorManager.ErrorSeverity.ERROR);
+                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(status))));
+            }
+
+            type = property.getType();
+
+            if (type.equals(ToscaPropertyType.LIST.getType()) || type.equals(ToscaPropertyType.MAP.getType())) {
+                ResponseFormat responseFormat = validateMapOrListPropertyType(property, allDataTypes.left().value());
+                if(responseFormat != null)
+                    break;
+            }
+
+            if (!propertyOperation.isPropertyDefaultValueValid(property, allDataTypes.left().value())) {
+                log.info("Invalid default value for property {}", property);
+                ResponseFormat responseFormat;
+                if (type.equals(ToscaPropertyType.LIST.getType()) || type.equals(ToscaPropertyType.MAP.getType())) {
+                    responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_COMPLEX_DEFAULT_VALUE,
+                            property.getName(), type, innerType, property.getDefaultValue());
+                } else {
+                    responseFormat = componentsUtils.getResponseFormat(ActionStatus.INVALID_DEFAULT_VALUE,
+                            property.getName(), type, property.getDefaultValue());
+                }
+                eitherResult = Either.right(responseFormat);
+                break;
+
+            }
+        }
+        return eitherResult;
+    }
+
+    private ResponseFormat validateMapOrListPropertyType(PropertyDefinition property, Map<String, DataTypeDefinition> allDataTypes) {
+        ResponseFormat responseFormat = null;
+        ImmutablePair<String, Boolean> propertyInnerTypeValid = propertyOperation
+                .isPropertyInnerTypeValid(property, allDataTypes);
+        String propertyInnerType = propertyInnerTypeValid.getLeft();
+        if (!propertyInnerTypeValid.getRight().booleanValue()) {
+            log.info("Invalid inner type for property {}", property);
+            responseFormat = componentsUtils.getResponseFormat(
+                    ActionStatus.INVALID_PROPERTY_INNER_TYPE, propertyInnerType, property.getName());
+        }
+        return responseFormat;
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidation.java
index c9ae17c3be..fa35b64cf3 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidation.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ServiceDistributionValidation.java
@@ -1,10 +1,6 @@
 package org.openecomp.sdc.be.components.validation;
 
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Resource;
-
+import fj.data.Either;
 import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.components.distribution.engine.IDistributionEngine;
 import org.openecomp.sdc.be.components.impl.ActivationRequestInformation;
@@ -19,18 +15,19 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.OperationalEnvironmentEntry;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Created by chaya on 10/18/2017.
  */
 @org.springframework.stereotype.Component("serviceDistributionValidation")
 public class ServiceDistributionValidation {
-    private static final Logger log = LoggerFactory.getLogger(ServiceDistributionValidation.class);
+    private static final Logger log = Logger.getLogger(ServiceDistributionValidation.class);
     @Resource
     private ComponentsUtils componentsUtils;
     @Resource
@@ -109,8 +106,7 @@ public class ServiceDistributionValidation {
         }
     }
     private void validateUserExists(String userId) {
-        userValidations.validateUserExists(userId, "activate Distribution", false)
-                .left().on(responseFormat ->  ValidationUtils.throwValidationException(responseFormat, "user {} not exist", userId));
+        userValidations.validateUserExists(userId, "activate Distribution", false);
     }
 
     private void validateDistributionServiceLifeCycleState(Service serviceToActivate) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/UserValidations.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/UserValidations.java
index ba96a9ef41..18fe51d3d4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/UserValidations.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/UserValidations.java
@@ -1,25 +1,22 @@
 package org.openecomp.sdc.be.components.validation;
 
-import java.util.List;
-
+import fj.data.Either;
 import org.apache.commons.lang3.StringUtils;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.user.IUserBusinessLogic;
 import org.openecomp.sdc.be.user.Role;
-import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import fj.data.Either;
+import java.util.List;
 
 @org.springframework.stereotype.Component
 public class UserValidations {
 
-	private static final Logger log = LoggerFactory.getLogger(UserValidations.class);
+    private static final Logger log = Logger.getLogger(UserValidations.class);
 	private final IUserBusinessLogic userAdmin;
 	private final ComponentsUtils componentsUtils;
 
@@ -28,36 +25,32 @@ public class UserValidations {
 		this.componentsUtils = componentsUtils;
 	}
 
-	public Either<User, ResponseFormat> validateUserExists(String userId, String ecompErrorContext,
-			boolean inTransaction) {
-		Either<User, ActionStatus> eitherCreator = userAdmin.getUser(userId, inTransaction);
-		if (eitherCreator.isRight() || eitherCreator.left().value() == null) {
-			ResponseFormat responseFormat;
-			if (eitherCreator.right().value().equals(ActionStatus.USER_NOT_FOUND)) {
-				log.debug("validateUserExists - not authorized user, userId {}", userId);
-				responseFormat = componentsUtils.getResponseFormat(ActionStatus.AUTH_FAILED);
-			} else {
-				log.debug("validateUserExists - failed to authorize user, userId {}", userId);
-				responseFormat = componentsUtils.getResponseFormat(eitherCreator.right().value());
-			}
-			log.debug("User is not listed. userId {}", userId);
-			BeEcompErrorManager.getInstance().logBeUserMissingError(ecompErrorContext, userId);
-			return Either.right(responseFormat);
-		}
-		return Either.left(eitherCreator.left().value());
-	}
+	public User validateUserExists(String userId, String ecompErrorContext, boolean inTransaction) {
+        Either<User, ActionStatus> eitherCreator = userAdmin.getUser(userId, inTransaction);
+        if (eitherCreator.isRight() || eitherCreator.left().value() == null) {
+            ActionStatus status;
+            if (eitherCreator.right().value().equals(ActionStatus.USER_NOT_FOUND)) {
+                log.debug("validateUserExists - not authorized user, userId {}", userId);
+                status = ActionStatus.AUTH_FAILED;
+            } else {
+                log.debug("validateUserExists - failed to authorize user, userId {}", userId);
+                status = eitherCreator.right().value();
+            }
+            log.debug("User is not listed. userId {}", userId);
+            BeEcompErrorManager.getInstance().logBeUserMissingError(ecompErrorContext, userId);
+            throw new ComponentException(status);
+        }
+        return eitherCreator.left().value();
+    }
 
-	public Either<Boolean, ResponseFormat> validateUserRole(User user, List<Role> roles) {
+    public void validateUserRole(User user, List<Role> roles) {
 		Role userRole = Role.valueOf(user.getRole());
 		if (roles != null) {
 			if (!roles.contains(userRole)) {
 				log.debug("user is not in appropriate role to perform action");
-				ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION);
-				return Either.right(responseFormat);
+                throw new ComponentException(ActionStatus.RESTRICTED_OPERATION);
 			}
-			return Either.left(Boolean.TRUE);
 		}
-		return Either.left(Boolean.FALSE);
 	}
 
 	public Either<User, ActionStatus> validateUserExistsActionStatus(String userId, String ecompErrorContext) {
@@ -76,27 +69,22 @@ public class UserValidations {
 		return Either.left(eitherCreator.left().value());
 	}
 
-	public Either<User, ResponseFormat> validateUserNotEmpty(User user, String ecompErrorContext) {
+    public User validateUserNotEmpty(User user, String ecompErrorContext) {
 		String userId = user.getUserId();
-
 		if (StringUtils.isEmpty(userId)) {
 			log.debug("User header is missing ");
 			BeEcompErrorManager.getInstance().logBeUserMissingError(ecompErrorContext, user.getUserId());
-			ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.MISSING_INFORMATION);
-			return Either.right(responseFormat);
+            throw new ComponentException(ActionStatus.MISSING_INFORMATION);
 		}
-		return Either.left(user);
+        return user;
 	}
 
-	public Either<User, ResponseFormat> validateUserExists(User user, String ecompErrorContext, boolean inTransaction) {
+    public User validateUserExists(User user, String ecompErrorContext, boolean inTransaction) {
 		return validateUserExists(user.getUserId(), ecompErrorContext, inTransaction);
 	}
 
-	public void validateUserExist(String userId, String ecompErrorContext, Wrapper<ResponseFormat> errorWrapper) {
-		Either<User, ResponseFormat> resp = validateUserExists(userId, ecompErrorContext, false);
-		if (resp.isRight()) {
-			errorWrapper.setInnerElement(resp.right().value());
-		}
+    public void validateUserExist(String userId, String ecompErrorContext) {
+        validateUserExists(userId, ecompErrorContext, false);
 	}
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ValidationUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ValidationUtils.java
index 07505a2adb..a1d5a86f10 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ValidationUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/validation/ValidationUtils.java
@@ -1,15 +1,14 @@
 package org.openecomp.sdc.be.components.validation;
 
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ValidationUtils {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ValidationUtils.class);
+    private static final Logger log = Logger.getLogger(ValidationUtils.class);
 
     public static  <T> T throwValidationException(ResponseFormat responseFormat, String logMessage, Object ... logParams){
-        LOGGER.error(logMessage, logParams);
+        log.error(logMessage, logParams);
         throw new ValidationException(responseFormat);
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ForwardingPaths.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ForwardingPaths.java
index 967232ac86..6f5c60f634 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ForwardingPaths.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ForwardingPaths.java
@@ -1,11 +1,8 @@
 package org.openecomp.sdc.be.datamodel;
 
-import java.io.Serializable;
 import java.util.Set;
 
-public class ForwardingPaths implements Serializable{
-
-  private static final long serialVersionUID=1L;
+public class ForwardingPaths {
 
   public ForwardingPaths() {
   }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPair.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPair.java
index a033cec86f..18a8995437 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPair.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPair.java
@@ -5,7 +5,8 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-public class NameIdPair extends HashMap<String, Object> implements java.io.Serializable {
+public class NameIdPair extends HashMap<String, Object> {
+
     public static final String OPTIONS = "options";
     public static final String NAME = "name";
     public static final String ID = "id";
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPairWrapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPairWrapper.java
index e46e57705e..e05d127ba2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPairWrapper.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/NameIdPairWrapper.java
@@ -1,9 +1,8 @@
 package org.openecomp.sdc.be.datamodel;
 
-import java.io.Serializable;
 import java.util.HashMap;
 
-public class NameIdPairWrapper extends HashMap<String, Object> implements Serializable {
+public class NameIdPairWrapper extends HashMap<String, Object> {
     public static final String ID = "id";
     public static final String DATA = "data";
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ServiceRelations.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ServiceRelations.java
index d05ddafed9..f44515e5b8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ServiceRelations.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/ServiceRelations.java
@@ -1,17 +1,13 @@
 package org.openecomp.sdc.be.datamodel;
 
-import java.io.Serializable;
 import java.util.Set;
 
-public class ServiceRelations extends java.util.HashSet<NameIdPairWrapper> implements Serializable {
-
-
+public class ServiceRelations extends java.util.HashSet<NameIdPairWrapper> {
 
     public ServiceRelations() {
     }
 
     public ServiceRelations(Set<NameIdPairWrapper> relations) {
-        super();
         addAll(relations);
     }
 
@@ -23,7 +19,4 @@ public class ServiceRelations extends java.util.HashSet<NameIdPairWrapper> imple
         clear();
         this.addAll(relations);
     }
-
-
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/api/CategoryTypeEnum.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/api/CategoryTypeEnum.java
index 855f20aba2..33aee95cd7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/api/CategoryTypeEnum.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/api/CategoryTypeEnum.java
@@ -20,9 +20,7 @@
 
 package org.openecomp.sdc.be.datamodel.api;
 
-import java.io.Serializable;
-
-public enum CategoryTypeEnum implements Serializable {
+public enum CategoryTypeEnum {
 
     CATEGORY("category"), SUBCATEGORY("subcategory"), GROUPING("grouping");
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java
index 83103309de..9479c80246 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ArtifactUtils.java
@@ -20,13 +20,6 @@
 
 package org.openecomp.sdc.be.datamodel.utils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
 import org.apache.commons.codec.binary.Base64;
 import org.openecomp.sdc.be.info.ArtifactTemplateInfo;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
@@ -34,6 +27,14 @@ import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.util.ValidationUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
 public class ArtifactUtils {
 
     public static ArtifactDefinition findMasterArtifact(Map<String, ArtifactDefinition> deplymentArtifact, List<ArtifactDefinition> artifacts, List<String> artifactsList) {
@@ -68,7 +69,7 @@ public class ArtifactUtils {
                                                                  ArtifactGroupTypeEnum artifactGroupType, String label, String displayName, String description,
                                                                  byte[] artifactContentent, List<ArtifactTemplateInfo> updatedRequiredArtifacts, boolean isFromCsar) {
 
-        Map<String, Object> json = new HashMap<String, Object>();
+        Map<String, Object> json = new HashMap<>();
         if (artifactId != null && !artifactId.isEmpty())
             json.put(Constants.ARTIFACT_ID, artifactId);
 
@@ -77,11 +78,7 @@ public class ArtifactUtils {
         json.put(Constants.ARTIFACT_DESCRIPTION, description);
         json.put(Constants.IS_FROM_CSAR, isFromCsar);
 
-        String encodedPayload = new String(artifactContentent);
-
-
-        encodedPayload = Base64.encodeBase64String(artifactContentent);
-        // }
+        String encodedPayload = Base64.encodeBase64String(artifactContentent);
 
         json.put(Constants.ARTIFACT_PAYLOAD_DATA, encodedPayload);
         json.put(Constants.ARTIFACT_DISPLAY_NAME, displayName);
@@ -90,21 +87,22 @@ public class ArtifactUtils {
         json.put(Constants.REQUIRED_ARTIFACTS,
                 (updatedRequiredArtifacts == null || updatedRequiredArtifacts.isEmpty()) ? new ArrayList<>()
                         : updatedRequiredArtifacts.stream()
-                                .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
+                                                  .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
                                         || e.getType().equals(ArtifactTypeEnum.HEAT_NESTED.getType()))
-                                .map(e -> e.getFileName()).collect(Collectors.toList()));
+                                                  .map(ArtifactTemplateInfo::getFileName).collect(Collectors.toList()));
         return json;
     }
 
     public static Map<String, Object> buildJsonForArtifact(ArtifactTemplateInfo artifactTemplateInfo,
-            byte[] artifactContentent, int atrifactLabelCounter) {
+			byte[] artifactContentent, int atrifactLabelCounter, boolean isFromcsar) {
 
-        Map<String, Object> json = new HashMap<String, Object>();
+        Map<String, Object> json = new HashMap<>();
         String artifactName = artifactTemplateInfo.getFileName();
 
         json.put(Constants.ARTIFACT_NAME, artifactTemplateInfo.getFileName());
         json.put(Constants.ARTIFACT_TYPE, artifactTemplateInfo.getType());
         json.put(Constants.ARTIFACT_DESCRIPTION, "created from csar");
+		json.put(Constants.IS_FROM_CSAR, isFromcsar);
 
         String encodedPayload = Base64.encodeBase64String(artifactContentent);
 
@@ -120,9 +118,9 @@ public class ArtifactUtils {
         json.put(Constants.REQUIRED_ARTIFACTS,
                 (requiredArtifacts == null || requiredArtifacts.isEmpty()) ? new ArrayList<>()
                         : requiredArtifacts.stream()
-                                .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
+                                           .filter(e -> e.getType().equals(ArtifactTypeEnum.HEAT_ARTIFACT.getType())
                                         || e.getType().equals(ArtifactTypeEnum.HEAT_NESTED.getType()))
-                                .map(e -> e.getFileName()).collect(Collectors.toList()));
+                                           .map(ArtifactTemplateInfo::getFileName).collect(Collectors.toList()));
         return json;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverter.java
index 2db551643c..d7d2c6b7ef 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/InterfaceUIDataConverter.java
@@ -16,9 +16,6 @@
 
 package org.openecomp.sdc.be.datamodel.utils;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationParamDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
@@ -26,6 +23,9 @@ import org.openecomp.sdc.be.datatypes.elements.OperationInputDefinition;
 import org.openecomp.sdc.be.datatypes.elements.OperationOutputDefinition;
 import org.openecomp.sdc.be.model.Operation;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class InterfaceUIDataConverter {
 
   private InterfaceUIDataConverter () {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
index 26da552f07..a3731dd9b9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/UiComponentDataConverter.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,187 +20,254 @@
 
 package org.openecomp.sdc.be.datamodel.utils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
+import org.openecomp.sdc.be.components.impl.GroupTypeBusinessLogic;
+import org.openecomp.sdc.be.components.impl.PolicyTypeBusinessLogic;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.components.ServiceMetadataDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentFieldsEnum;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
-import org.openecomp.sdc.be.ui.model.UiComponentMetadata;
-import org.openecomp.sdc.be.ui.model.UiResourceDataTransfer;
-import org.openecomp.sdc.be.ui.model.UiResourceMetadata;
-import org.openecomp.sdc.be.ui.model.UiServiceDataTransfer;
-import org.openecomp.sdc.be.ui.model.UiServiceMetadata;
-
-public class UiComponentDataConverter {
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.ui.model.*;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-    private static void setUiTranferDataByFieldName(UiComponentDataTransfer dataTransfer, Component component, String fieldName) {
+import java.util.*;
 
-            switch (ComponentFieldsEnum.findByValue(fieldName)) {
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
 
-                case INPUTS:
-                    if(component.getInputs() == null){
-                        dataTransfer.setInputs(new ArrayList<>());
-                    } else {
-                        dataTransfer.setInputs(component.getInputs());
-                    }
-                    break;
+@org.springframework.stereotype.Component("uiComponentDataConverter")
+public class UiComponentDataConverter {
 
-                case COMPONENT_INSTANCE_RELATION:
-                    if(component.getComponentInstancesRelations() == null){
-                        dataTransfer.setComponentInstancesRelations(new ArrayList<>());
-                    } else {
-                        dataTransfer.setComponentInstancesRelations(component.getComponentInstancesRelations());
-                    }
+    private static final Logger log = Logger.getLogger(UiComponentDataConverter.class);
+    public static final String INVALID_INPUT_GIVEN_TO_DATA_CONVERTER = "Invalid input given to data converter: {}";
+    private final GroupTypeBusinessLogic groupTypeBusinessLogic;
+    private final PolicyTypeBusinessLogic policyTypeBusinessLogic;
 
-                    break;
+    public UiComponentDataConverter(GroupTypeBusinessLogic groupTypeBusinessLogic, PolicyTypeBusinessLogic policyTypeBusinessLogic) {
+        this.groupTypeBusinessLogic = groupTypeBusinessLogic;
+        this.policyTypeBusinessLogic = policyTypeBusinessLogic;
+    }
 
-                case GROUPS:
-                    if(component.getGroups() == null){
-                        dataTransfer.setGroups(new ArrayList<>());
-                    } else {
-                        dataTransfer.setGroups(component.getGroups());
-                    }
-                    break;
+    private void setUiTranferDataByFieldName(UiComponentDataTransfer dataTransfer, Component component, String fieldName) {
+        ComponentFieldsEnum field = ComponentFieldsEnum.findByValue(fieldName);
+        if (field == null) {
+            log.error(INVALID_INPUT_GIVEN_TO_DATA_CONVERTER, fieldName);
+            return;
+        }
+        switch (field) {
+            case INPUTS:
+                setInputs(dataTransfer, component);
+                break;
+            case COMPONENT_INSTANCE_RELATION:
+                setComponentInstanceRelation(dataTransfer, component);
+                break;
+            case GROUPS:
+                setGroups(dataTransfer, component);
+                break;
+            case NON_EXCLUDED_GROUPS:
+                setNonExcludedGroups(dataTransfer, component);
+                break;
+            case COMPONENT_INSTANCES:
+                setComponentInstances(dataTransfer, component);
+                break;
+            case COMPONENT_INSTANCES_PROPERTIES:
+                setComponentInstanceProperties(dataTransfer, component);
+                break;
+            case CAPABILITIES:
+                setCapabilities(dataTransfer, component);
+                break;
+            case POLICIES:
+                dataTransfer.setPolicies(component.resolvePoliciesList());
+                break;
+            case NON_EXCLUDED_POLICIES:
+                setNonExcludedPolicies(dataTransfer, component);
+                break;
+            case REQUIREMENTS:
+                setRequirements(dataTransfer, component);
+                break;
+            case DEPLOYMENT_ARTIFACTS:
+                setDeploymentArtifacts(dataTransfer, component);
+                break;
+            case TOSCA_ARTIFACTS:
+                setToscaArtifacts(dataTransfer, component);
+                break;
+            case ARTIFACTS:
+                setArtifacts(dataTransfer, component);
+                break;
+            case COMPONENT_INSTANCES_ATTRIBUTES:
+                setComponentInstanceAttributes(dataTransfer, component);
+                break;
+            case COMPONENT_INSTANCE_INPUTS:
+                setComponentInstanceInputs(dataTransfer, component);
+                break;
+            default:
+                break;
+        }
+    }
 
-                case COMPONENT_INSTANCES:
-                    if(component.getComponentInstances() == null) {
-                        dataTransfer.setComponentInstances(new ArrayList<>());
-                    } else {
-                        dataTransfer.setComponentInstances(component.getComponentInstances());
-                    }
-                    break;
+    private void setComponentInstanceRelation(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getComponentInstancesRelations() == null) {
+            dataTransfer.setComponentInstancesRelations(new ArrayList<>());
+        } else {
+            dataTransfer.setComponentInstancesRelations(component.getComponentInstancesRelations());
+        }
+    }
 
-                case COMPONENT_INSTANCES_PROPERTIES:
-                    if(component.getComponentInstancesProperties() == null) {
-                        dataTransfer.setComponentInstancesProperties(new HashMap<>());
-                    } else {
-                        dataTransfer.setComponentInstancesProperties(component.getComponentInstancesProperties());
-                    }
-                    break;
+    private void setInputs(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getInputs() == null) {
+            dataTransfer.setInputs(new ArrayList<>());
+        } else {
+            dataTransfer.setInputs(component.getInputs());
+        }
+    }
 
-                case CAPABILITIES:
-                    if(component.getCapabilities() == null) {
-                        dataTransfer.setCapabilities(new HashMap<>());
-                    } else {
-                        dataTransfer.setCapabilities(component.getCapabilities());
-                    }
-                    break;
+    private void setComponentInstanceInputs(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getComponentInstancesInputs() == null) {
+            dataTransfer.setComponentInstancesInputs(new HashMap<>());
+        } else {
+            dataTransfer.setComponentInstancesInputs(component.getComponentInstancesInputs());
+        }
+    }
 
-                case POLICIES:
-                    dataTransfer.setPolicies(component.resolvePoliciesList());
-                    break;
+    private void setComponentInstanceAttributes(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getComponentInstancesAttributes() == null) {
+            dataTransfer.setComponentInstancesAttributes(new HashMap<>());
+        } else {
+            dataTransfer.setComponentInstancesAttributes(component.getComponentInstancesAttributes());
+        }
+    }
 
-                case REQUIREMENTS:
-                    if(component.getRequirements() == null) {
-                        dataTransfer.setRequirements(new HashMap<>());
-                    } else {
-                        dataTransfer.setRequirements(component.getRequirements());
-                    }
-                    break;
+    private void setArtifacts(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getArtifacts() == null) {
+            dataTransfer.setArtifacts(new HashMap<>());
+        } else {
+            dataTransfer.setArtifacts(component.getArtifacts());
+        }
+    }
 
-                case DEPLOYMENT_ARTIFACTS:
-                    if(component.getDeploymentArtifacts() == null) {
-                        dataTransfer.setDeploymentArtifacts(new HashMap<>());
-                    } else {
-                        dataTransfer.setDeploymentArtifacts(component.getDeploymentArtifacts());
-                    }
-                    break;
+    private void setToscaArtifacts(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getToscaArtifacts() == null) {
+            dataTransfer.setToscaArtifacts(new HashMap<>());
+        } else {
+            dataTransfer.setToscaArtifacts(component.getToscaArtifacts());
+        }
+    }
 
-                case TOSCA_ARTIFACTS:
-                    if(component.getToscaArtifacts() == null) {
-                        dataTransfer.setToscaArtifacts(new HashMap<>());
-                    } else {
-                        dataTransfer.setToscaArtifacts(component.getToscaArtifacts());
-                    }
-                    break;
+    private void setDeploymentArtifacts(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getDeploymentArtifacts() == null) {
+            dataTransfer.setDeploymentArtifacts(new HashMap<>());
+        } else {
+            dataTransfer.setDeploymentArtifacts(component.getDeploymentArtifacts());
+        }
+    }
 
-                case ARTIFACTS:
-                    if(component.getArtifacts() == null) {
-                        dataTransfer.setArtifacts(new HashMap<>());
-                    } else {
-                        dataTransfer.setArtifacts(component.getArtifacts());
-                    }
-                    break;
+    private void setRequirements(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getRequirements() == null) {
+            dataTransfer.setRequirements(new HashMap<>());
+        } else {
+            dataTransfer.setRequirements(component.getRequirements());
+        }
+    }
 
-                case COMPONENT_INSTANCES_ATTRIBUTES:
-                    if(component.getComponentInstancesAttributes() == null) {
-                        dataTransfer.setComponentInstancesAttributes(new HashMap<>());
-                    } else {
-                        dataTransfer.setComponentInstancesAttributes(component.getComponentInstancesAttributes());
-                    }
-                    break;
+    private void setCapabilities(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getCapabilities() == null) {
+            dataTransfer.setCapabilities(new HashMap<>());
+        } else {
+            dataTransfer.setCapabilities(getFilteredCapabilities(component));
+        }
+    }
 
-                case COMPONENT_INSTANCE_INPUTS:
-                    if(component.getComponentInstancesInputs() == null) {
-                        dataTransfer.setComponentInstancesInputs(new HashMap<>());
-                    } else {
-                        dataTransfer.setComponentInstancesInputs(component.getComponentInstancesInputs());
-                    }
+    private Map<String,List<CapabilityDefinition>> getFilteredCapabilities(Component component) {
+        if(component.getComponentType() != ComponentTypeEnum.SERVICE){
+            return component.getCapabilities().values()
+                    .stream()
+                    .flatMap(Collection::stream)
+                    .filter(c -> c.getOwnerType() != CapabilityDataDefinition.OwnerType.GROUP)
+                    .collect(groupingBy(CapabilityDefinition::getType, toList()));
+        }
+        return component.getCapabilities();
+    }
 
-                    break;
+    private void setComponentInstanceProperties(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getComponentInstancesProperties() == null) {
+            dataTransfer.setComponentInstancesProperties(new HashMap<>());
+        } else {
+            dataTransfer.setComponentInstancesProperties(component.getComponentInstancesProperties());
+        }
+    }
 
+    private void setComponentInstances(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getComponentInstances() == null) {
+            dataTransfer.setComponentInstances(new ArrayList<>());
+        } else {
+            dataTransfer.setComponentInstances(component.getComponentInstances());
+        }
+    }
 
-                default:
-                    break;
-            }
+    private void setGroups(UiComponentDataTransfer dataTransfer, Component component) {
+        if (component.getGroups() == null) {
+            dataTransfer.setGroups(new ArrayList<>());
+        } else {
+            dataTransfer.setGroups(component.getGroups());
+        }
+    }
 
+    private void setNonExcludedGroups(UiComponentDataTransfer dataTransfer, Component component) {
+        List<GroupDefinition> groups = component.getGroups();
+        if (groups == null) {
+            dataTransfer.setGroups(new ArrayList<>());
+        } else {
+            Set<String> nonExcludedGroupTypes = groupTypeBusinessLogic.getExcludedGroupTypes(component.getActualComponentType());
+            List<GroupDefinition> nonExcludedGroups = groups.stream()
+                    .filter(gd -> !nonExcludedGroupTypes.contains(gd.getType()))
+                    .collect(toList());
+            dataTransfer.setGroups(nonExcludedGroups);
+        }
     }
 
+    private void setNonExcludedPolicies(UiComponentDataTransfer dataTransfer, Component component) {
+        List<PolicyDefinition> policyDefinitions = component.resolvePoliciesList();
+        Set<String> nonExcludedPolicyTypes = policyTypeBusinessLogic.getExcludedPolicyTypes(component.getActualComponentType());
+        List<PolicyDefinition> nonExcludedPolicies = policyDefinitions.stream()
+                .filter(pd -> !nonExcludedPolicyTypes.contains(pd.getPolicyTypeName()))
+                .collect(toList());
+        dataTransfer.setPolicies(nonExcludedPolicies);
+    }
 
-    public static UiComponentDataTransfer getUiDataTransferFromResourceByParams(Resource resource, List<String> paramsToReturn) {
+    public UiComponentDataTransfer getUiDataTransferFromResourceByParams(Resource resource, List<String> paramsToReturn) {
         UiResourceDataTransfer dataTransfer = new UiResourceDataTransfer();
 
-        for(String fieldName: paramsToReturn){
+        for (String fieldName : paramsToReturn) {
 
-            switch (ComponentFieldsEnum.findByValue(fieldName)) {
+            ComponentFieldsEnum field = ComponentFieldsEnum.findByValue(fieldName);
+            if (field == null) {
+                log.error(INVALID_INPUT_GIVEN_TO_DATA_CONVERTER, fieldName);
+                continue;
+            }
+            switch (field) {
 
                 case PROPERTIES:
-                    if(resource.getProperties() == null) {
-                        dataTransfer.setProperties(new ArrayList<>());
-                    } else {
-                        dataTransfer.setProperties(resource.getProperties());
-                    }
+                    setProperties(resource, dataTransfer);
                     break;
 
                 case INTERFACES:
-                    if(resource.getInterfaces() == null) {
-                        dataTransfer.setInterfaces(new HashMap<>());
-                    } else {
-                        dataTransfer.setInterfaces(resource.getInterfaces());
-                    }
+                    setInterfaces(resource, dataTransfer);
                     break;
 
                 case DERIVED_FROM:
-                    if(resource.getDerivedFrom() == null) {
-                        dataTransfer.setDerivedFrom(new ArrayList<>());
-                    } else {
-                        dataTransfer.setDerivedFrom(resource.getDerivedFrom());
-                    }
+                    setDerivedFrom(resource, dataTransfer);
                     break;
 
                 case ATTRIBUTES:
-                    if(resource.getAttributes() == null) {
-                        dataTransfer.setAttributes(new ArrayList<>());
-                    } else {
-                        dataTransfer.setAttributes(resource.getAttributes());
-                    }
+                    setAttributes(resource, dataTransfer);
                     break;
 
                 case ADDITIONAL_INFORMATION:
-                    if(resource.getAdditionalInformation() == null) {
-                        dataTransfer.setAdditionalInformation(new ArrayList<>());
-                    } else {
-                        dataTransfer.setAdditionalInformation(resource.getAdditionalInformation());
-                    }
+                    setAdditionalInfo(resource, dataTransfer);
                     break;
                 case METADATA:
-                    UiResourceMetadata metadata = new UiResourceMetadata(resource.getCategories(),  resource.getDerivedFrom(), (ResourceMetadataDataDefinition) resource.getComponentMetadataDefinition().getMetadataDataDefinition());
+                    UiResourceMetadata metadata = new UiResourceMetadata(resource.getCategories(), resource.getDerivedFrom(), (ResourceMetadataDataDefinition) resource.getComponentMetadataDefinition().getMetadataDataDefinition());
                     dataTransfer.setMetadata(metadata);
                     break;
 
@@ -212,52 +279,100 @@ public class UiComponentDataConverter {
         return dataTransfer;
     }
 
-    public static UiComponentDataTransfer getUiDataTransferFromServiceByParams(Service service, List<String> paramsToReturn) {
-        UiServiceDataTransfer dataTransfer = new UiServiceDataTransfer();
+    private void setProperties(Resource resource, UiResourceDataTransfer dataTransfer) {
+        if (resource.getProperties() == null) {
+            dataTransfer.setProperties(new ArrayList<>());
+        } else {
+            dataTransfer.setProperties(resource.getProperties());
+        }
+    }
+
+    private void setInterfaces(Resource resource, UiResourceDataTransfer dataTransfer) {
+        if (resource.getInterfaces() == null) {
+            dataTransfer.setInterfaces(new HashMap<>());
+        } else {
+            dataTransfer.setInterfaces(resource.getInterfaces());
+        }
+    }
+
+    private void setDerivedFrom(Resource resource, UiResourceDataTransfer dataTransfer) {
+        if (resource.getDerivedFrom() == null) {
+            dataTransfer.setDerivedFrom(new ArrayList<>());
+        } else {
+            dataTransfer.setDerivedFrom(resource.getDerivedFrom());
+        }
+    }
 
-        for(String fieldName: paramsToReturn){
+    private void setAttributes(Resource resource, UiResourceDataTransfer dataTransfer) {
+        if (resource.getAttributes() == null) {
+            dataTransfer.setAttributes(new ArrayList<>());
+        } else {
+            dataTransfer.setAttributes(resource.getAttributes());
+        }
+    }
 
-            switch (ComponentFieldsEnum.findByValue(fieldName)) {
+    private void setAdditionalInfo(Resource resource, UiResourceDataTransfer dataTransfer) {
+        if (resource.getAdditionalInformation() == null) {
+            dataTransfer.setAdditionalInformation(new ArrayList<>());
+        } else {
+            dataTransfer.setAdditionalInformation(resource.getAdditionalInformation());
+        }
+    }
 
+    public UiComponentDataTransfer getUiDataTransferFromServiceByParams(Service service, List<String> paramsToReturn) {
+        UiServiceDataTransfer dataTransfer = new UiServiceDataTransfer();
+        for (String fieldName : paramsToReturn) {
+            ComponentFieldsEnum field = ComponentFieldsEnum.findByValue(fieldName);
+            if (field == null) {
+                log.error(INVALID_INPUT_GIVEN_TO_DATA_CONVERTER, fieldName);
+                continue;
+            }
+            switch (field) {
                 case SERVICE_API_ARTIFACTS:
-                    if(service.getServiceApiArtifacts() == null) {
-                        dataTransfer.setServiceApiArtifacts(new org.openecomp.sdc.be.ui.model.SerializedHashMap<>());
-                    } else {
-                        dataTransfer.setServiceApiArtifacts(service.getServiceApiArtifacts());
-                    }
+                    setServiceApiArtifacts(service, dataTransfer);
 
                     break;
                 case FORWARDING_PATHS:
-                    if(service.getForwardingPaths() == null) {
-                        dataTransfer.setForwardingPaths(new org.openecomp.sdc.be.ui.model.SerializedHashMap<>());
-                    } else {
-                        dataTransfer.setForwardingPaths(service.getForwardingPaths());
-                    }
-
+                    setForwardingPaths(service, dataTransfer);
                     break;
                 case METADATA:
-                    UiServiceMetadata metadata = new UiServiceMetadata(service.getCategories(),  (ServiceMetadataDataDefinition) service.getComponentMetadataDefinition().getMetadataDataDefinition());
+                    UiServiceMetadata metadata = new UiServiceMetadata(service.getCategories(), (ServiceMetadataDataDefinition) service.getComponentMetadataDefinition().getMetadataDataDefinition());
                     dataTransfer.setMetadata(metadata);
                     break;
                 default:
                     setUiTranferDataByFieldName(dataTransfer, service, fieldName);
-                }
+            }
         }
-
         return dataTransfer;
     }
 
+    private void setServiceApiArtifacts(Service service, UiServiceDataTransfer dataTransfer) {
+        if (service.getServiceApiArtifacts() == null) {
+            dataTransfer.setServiceApiArtifacts(new org.openecomp.sdc.be.ui.model.SerializedHashMap<>());
+        } else {
+            dataTransfer.setServiceApiArtifacts(service.getServiceApiArtifacts());
+        }
+    }
+
+    private void setForwardingPaths(Service service, UiServiceDataTransfer dataTransfer) {
+        if (service.getForwardingPaths() == null) {
+            dataTransfer.setForwardingPaths(new org.openecomp.sdc.be.ui.model.SerializedHashMap<>());
+        } else {
+            dataTransfer.setForwardingPaths(service.getForwardingPaths());
+        }
+    }
+
 
     public static UiComponentMetadata convertToUiComponentMetadata(Component component) {
 
         UiComponentMetadata uiComponentMetadata = null;
         switch (component.getComponentType()) {
             case RESOURCE:
-                Resource resource = (Resource)component;
-                uiComponentMetadata = new UiResourceMetadata(component.getCategories(),  resource.getDerivedFrom(), (ResourceMetadataDataDefinition) resource.getComponentMetadataDefinition().getMetadataDataDefinition());
+                Resource resource = (Resource) component;
+                uiComponentMetadata = new UiResourceMetadata(component.getCategories(), resource.getDerivedFrom(), (ResourceMetadataDataDefinition) resource.getComponentMetadataDefinition().getMetadataDataDefinition());
                 break;
             case SERVICE:
-                uiComponentMetadata = new UiServiceMetadata(component.getCategories(),  (ServiceMetadataDataDefinition) component.getComponentMetadataDefinition().getMetadataDataDefinition());
+                uiComponentMetadata = new UiServiceMetadata(component.getCategories(), (ServiceMetadataDataDefinition) component.getComponentMetadataDefinition().getMetadataDataDefinition());
                 break;
             default:
                 break;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/AuditHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/AuditHandler.java
index 0aa8d5afa6..c7e145b8be 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/AuditHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/AuditHandler.java
@@ -25,6 +25,7 @@ import org.openecomp.sdc.be.components.distribution.engine.SubscriberTypeEnum;
 import org.openecomp.sdc.be.distribution.api.client.RegistrationRequest;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
 
 public class AuditHandler {
     ComponentsUtils componentsUtils;
@@ -39,12 +40,12 @@ public class AuditHandler {
     }
 
 
-    public void auditRegisterACL(CambriaErrorResponse registerResponse, SubscriberTypeEnum subscriberRole , String topicName) {
-        componentsUtils.auditTopicACLKeys(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL, registrationRequest.getDistrEnvName(), topicName, subscriberRole.name(), registrationRequest.getApiPublicKey(), String.valueOf(registerResponse.getHttpCode()));
+    public void auditRegisterACL(CambriaErrorResponse registerResponse, SubscriberTypeEnum subscriberRole , DistributionTopicData distributionTopicData) {
+        componentsUtils.auditDistributionEngine(AuditingActionEnum.ADD_KEY_TO_TOPIC_ACL, registrationRequest.getDistrEnvName(), distributionTopicData, subscriberRole.name(), registrationRequest.getApiPublicKey(), String.valueOf(registerResponse.getHttpCode()));
     }
 
-    public void auditUnRegisterACL(CambriaErrorResponse registerResponse, SubscriberTypeEnum subscriberRole, String topicName) {
-        componentsUtils.auditTopicACLKeys(AuditingActionEnum.REMOVE_KEY_FROM_TOPIC_ACL, registrationRequest.getDistrEnvName(), topicName, subscriberRole.name(), registrationRequest.getApiPublicKey(), String.valueOf(registerResponse.getHttpCode()));
+    public void auditUnRegisterACL(CambriaErrorResponse registerResponse, SubscriberTypeEnum subscriberRole, DistributionTopicData distributionTopicData) {
+        componentsUtils.auditDistributionEngine(AuditingActionEnum.REMOVE_KEY_FROM_TOPIC_ACL, registrationRequest.getDistrEnvName(), distributionTopicData, subscriberRole.name(), registrationRequest.getApiPublicKey(), String.valueOf(registerResponse.getHttpCode()));
     }
 
     public void auditRegisterRequest(CambriaErrorResponse registerResponse) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/DistributionBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/DistributionBusinessLogic.java
index 20378e0b86..afad7d0b5f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/DistributionBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/DistributionBusinessLogic.java
@@ -20,48 +20,37 @@
 
 package org.openecomp.sdc.be.distribution;
 
-import static org.apache.commons.lang.BooleanUtils.isTrue;
-import static org.openecomp.sdc.be.components.distribution.engine.DistributionEngineInitTask.buildTopicName;
-import static org.openecomp.sdc.be.config.ConfigurationManager.getConfigurationManager;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.ws.rs.core.Response;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.apache.http.HttpStatus;
-import org.openecomp.sdc.be.components.distribution.engine.CambriaErrorResponse;
-import org.openecomp.sdc.be.components.distribution.engine.CambriaHandler;
-import org.openecomp.sdc.be.components.distribution.engine.DistributionEngineInitTask;
-import org.openecomp.sdc.be.components.distribution.engine.IDistributionEngine;
-import org.openecomp.sdc.be.components.distribution.engine.SubscriberTypeEnum;
+import org.openecomp.sdc.be.components.distribution.engine.*;
 import org.openecomp.sdc.be.components.impl.ResponseFormatManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.distribution.api.client.CambriaOperationStatus;
-import org.openecomp.sdc.be.distribution.api.client.RegistrationRequest;
-import org.openecomp.sdc.be.distribution.api.client.ServerListResponse;
-import org.openecomp.sdc.be.distribution.api.client.TopicRegistrationResponse;
-import org.openecomp.sdc.be.distribution.api.client.TopicUnregistrationResponse;
+import org.openecomp.sdc.be.distribution.api.client.*;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionTopicData;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import javax.annotation.Resource;
+import javax.ws.rs.core.Response;
+import java.util.List;
 
-import fj.data.Either;
+import static org.apache.commons.lang.BooleanUtils.isTrue;
+import static org.openecomp.sdc.be.components.distribution.engine.DistributionEngineInitTask.buildTopicName;
+import static org.openecomp.sdc.be.config.ConfigurationManager.getConfigurationManager;
 
 @Component("distributionBusinessLogic")
 public class DistributionBusinessLogic {
     public static final String REGISTER_IN_DISTRIBUTION_ENGINE = "registerInDistributionEngine";
     public static final String UN_REGISTER_IN_DISTRIBUTION_ENGINE = "unregisterInDistributionEngine";
     private Gson gson = new GsonBuilder().setPrettyPrinting().create();
-    private static final Logger LOGGER = LoggerFactory.getLogger(DistributionBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(DistributionBusinessLogic.class);
     @Resource
     private IDistributionEngine distributionEngine;
 
@@ -105,7 +94,10 @@ public class DistributionBusinessLogic {
             registerResponse = registerDistributionClientToTopic(responseWrapper, registrationRequest,
                     SubscriberTypeEnum.PRODUCER, statusTopicName);
 
-            auditHandler.auditRegisterACL(registerResponse, SubscriberTypeEnum.PRODUCER, statusTopicName);
+            auditHandler.auditRegisterACL(registerResponse, SubscriberTypeEnum.PRODUCER,
+                    DistributionTopicData.newBuilder()
+                        .statusTopic(statusTopicName)
+                        .build());
             boolean isRegisteredAsProducerOnStatusSuccess = responseWrapper.isEmpty();
 
             // Story [347698] Distribution Client Get Indication from
@@ -115,7 +107,10 @@ public class DistributionBusinessLogic {
             if (isRegisteredAsProducerOnStatusSuccess && isTrue(registrationRequest.getIsConsumerToSdcDistrStatusTopic())) {
                 registerResponse = registerDistributionClientToTopic(responseWrapper, registrationRequest,
                         SubscriberTypeEnum.CONSUMER, statusTopicName);
-                auditHandler.auditRegisterACL(registerResponse, SubscriberTypeEnum.CONSUMER, statusTopicName);
+                auditHandler.auditRegisterACL(registerResponse, SubscriberTypeEnum.CONSUMER,
+                        DistributionTopicData.newBuilder()
+                                .statusTopic(statusTopicName)
+                                .build());
                 registeredAsConsumerOnStatus = responseWrapper.isEmpty();
 
             }
@@ -125,19 +120,28 @@ public class DistributionBusinessLogic {
                         registrationRequest.getDistrEnvName());
                 registerResponse = registerDistributionClientToTopic(responseWrapper, registrationRequest,
                         SubscriberTypeEnum.CONSUMER, notificationTopicName);
-                auditHandler.auditRegisterACL(registerResponse, SubscriberTypeEnum.CONSUMER, notificationTopicName);
+                auditHandler.auditRegisterACL(registerResponse, SubscriberTypeEnum.CONSUMER,
+                        DistributionTopicData.newBuilder()
+                            .notificationTopic(notificationTopicName)
+                            .build());
             }
             // Unregister Rollback
             if (!responseWrapper.isEmpty()) {
                 if (isRegisteredAsProducerOnStatusSuccess) {
                     CambriaErrorResponse unRegisterResponse = unRegisterDistributionClientFromTopic(registrationRequest,
                             SubscriberTypeEnum.PRODUCER, statusTopicName);
-                    auditHandler.auditUnRegisterACL(unRegisterResponse, SubscriberTypeEnum.PRODUCER, statusTopicName);
+                    auditHandler.auditUnRegisterACL(unRegisterResponse, SubscriberTypeEnum.PRODUCER,
+                            DistributionTopicData.newBuilder()
+                                    .statusTopic(statusTopicName)
+                                    .build());
                 }
                 if (registeredAsConsumerOnStatus) {
                     CambriaErrorResponse unRegisterResponse = unRegisterDistributionClientFromTopic(registrationRequest,
                             SubscriberTypeEnum.CONSUMER, statusTopicName);
-                    auditHandler.auditUnRegisterACL(unRegisterResponse, SubscriberTypeEnum.CONSUMER, statusTopicName);
+                    auditHandler.auditUnRegisterACL(unRegisterResponse, SubscriberTypeEnum.CONSUMER,
+                            DistributionTopicData.newBuilder()
+                            .statusTopic(statusTopicName)
+                            .build());
                 }
             }
 
@@ -147,7 +151,7 @@ public class DistributionBusinessLogic {
             }
 
         } catch (Exception e) {
-            LOGGER.error("registration to topic failed", e);
+            log.error("registration to topic failed", e);
             BeEcompErrorManager.getInstance().logBeDistributionEngineSystemError(REGISTER_IN_DISTRIBUTION_ENGINE,
                     "registration of subscriber to topic");
             Response errorResponse = buildErrorResponse(
@@ -166,14 +170,18 @@ public class DistributionBusinessLogic {
             CambriaErrorResponse unregisterClientProducerTopicResponse = unRegisterDistributionClientFromTopic(
                     unRegistrationRequest, SubscriberTypeEnum.PRODUCER, statusTopicName);
             auditHandler.auditUnRegisterACL(unregisterClientProducerTopicResponse, SubscriberTypeEnum.PRODUCER,
-                    statusTopicName);
+                    DistributionTopicData.newBuilder()
+                            .statusTopic(statusTopicName)
+                            .build());
             updateResponseWrapper(cambriaResponseWrapper, unregisterClientProducerTopicResponse);
 
             String notificationTopicName = getNotificationTopicName(unRegistrationRequest.getDistrEnvName());
             CambriaErrorResponse unregisterClientConsumerTopicResponse = unRegisterDistributionClientFromTopic(
                     unRegistrationRequest, SubscriberTypeEnum.CONSUMER, notificationTopicName);
             auditHandler.auditUnRegisterACL(unregisterClientConsumerTopicResponse, SubscriberTypeEnum.CONSUMER,
-                    notificationTopicName);
+                    DistributionTopicData.newBuilder()
+                            .notificationTopic(notificationTopicName)
+                            .build());
             updateResponseWrapper(cambriaResponseWrapper, unregisterClientConsumerTopicResponse);
 
             // Success unregister both topics
@@ -192,7 +200,7 @@ public class DistributionBusinessLogic {
                         Response.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).entity(unregisterResponse).build());
             }
         } catch (Exception e) {
-            LOGGER.error("unregistered to topic failed", e);
+            log.error("unregistered to topic failed", e);
             Response errorResponse = buildErrorResponse(
                     getResponseFormatManager().getResponseFormat(ActionStatus.GENERAL_ERROR));
             responseWrapper.setInnerElement(errorResponse);
@@ -233,7 +241,7 @@ public class DistributionBusinessLogic {
                 .getDistributionEngineConfiguration();
         initRequestEnvEndPoints(unRegistrationRequest, config);
 
-        LOGGER.debug("unregistering client as {} , from topic: {}, using DistEnvPoints: {}", subscriberType, topicName, unRegistrationRequest.getDistEnvEndPoints());
+        log.debug("unregistering client as {} , from topic: {}, using DistEnvPoints: {}", subscriberType, topicName, unRegistrationRequest.getDistEnvEndPoints());
         return getCambriaHandler().unRegisterFromTopic(unRegistrationRequest.getDistEnvEndPoints(), config.getUebPublicKey(),
                 config.getUebSecretKey(), unRegistrationRequest.getApiPublicKey(), subscriberType, topicName);
     }
@@ -267,7 +275,7 @@ public class DistributionBusinessLogic {
         else {
             errorMsg = "registration of subscriber to topic:" + topicName + " as producer failed";
         }
-        LOGGER.debug("registering client as {} , from topic: {}, using DistEnvPoints: {}", subscriberType, topicName, registrationRequest.getDistEnvEndPoints());
+        log.debug("registering client as {} , from topic: {}, using DistEnvPoints: {}", subscriberType, topicName, registrationRequest.getDistEnvEndPoints());
         CambriaErrorResponse registerToTopic = getCambriaHandler().registerToTopic(registrationRequest.getDistEnvEndPoints(),
                 config.getUebPublicKey(), config.getUebSecretKey(), registrationRequest.getApiPublicKey(),
                 subscriberType, topicName);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java
index a3a6f273ce..ed1bc3eeb8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java
@@ -20,42 +20,29 @@
 
 package org.openecomp.sdc.be.distribution.servlet;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
 import org.openecomp.sdc.be.servlets.BeGenericServlet;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * This Servlet serves external users to download artifacts.
@@ -70,7 +57,9 @@ import io.swagger.annotations.ApiResponses;
 @Singleton
 public class DistributionCatalogServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(DistributionCatalogServlet.class);
+    private static final String DOWNLOAD_ARTIFACT_FAILED_WITH_EXCEPTION = "download artifact failed with exception";
+	private static final String MISSING_X_ECOMP_INSTANCE_ID_HEADER = "Missing X-ECOMP-InstanceID header";
+	private static final Logger log = Logger.getLogger(DistributionCatalogServlet.class);
     @Context
     private HttpServletRequest request;
 
@@ -115,7 +104,7 @@ public class DistributionCatalogServlet extends BeGenericServlet {
         Response response = null;
         String requestURI = request.getRequestURI();
         if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
-            log.debug("Missing X-ECOMP-InstanceID header");
+            log.debug(MISSING_X_ECOMP_INSTANCE_ID_HEADER);
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
             getComponentsUtils().auditDistributionDownload(responseFormat, new DistributionData(instanceIdHeader, requestURI));
             return buildErrorResponse(responseFormat);
@@ -143,7 +132,7 @@ public class DistributionCatalogServlet extends BeGenericServlet {
 
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("download Murano package artifact for service - external API");
-            log.debug("download artifact failed with exception", e);
+            log.debug(DOWNLOAD_ARTIFACT_FAILED_WITH_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
     }
@@ -192,7 +181,7 @@ public class DistributionCatalogServlet extends BeGenericServlet {
         String requestURI = request.getRequestURI();
 
         if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
-            log.debug("Missing X-ECOMP-InstanceID header");
+            log.debug(MISSING_X_ECOMP_INSTANCE_ID_HEADER);
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
             getComponentsUtils().auditDistributionDownload(responseFormat, new DistributionData(instanceIdHeader, requestURI));
             return buildErrorResponse(responseFormat);
@@ -220,7 +209,7 @@ public class DistributionCatalogServlet extends BeGenericServlet {
 
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("download interface artifact for resource - external API");
-            log.debug("download artifact failed with exception", e);
+            log.debug(DOWNLOAD_ARTIFACT_FAILED_WITH_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
     }
@@ -267,7 +256,7 @@ public class DistributionCatalogServlet extends BeGenericServlet {
         String requestURI = request.getRequestURI();
 
         if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
-            log.debug("Missing X-ECOMP-InstanceID header");
+            log.debug(MISSING_X_ECOMP_INSTANCE_ID_HEADER);
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
             getComponentsUtils().auditDistributionDownload(responseFormat, new DistributionData(instanceIdHeader, requestURI));
             return buildErrorResponse(responseFormat);
@@ -295,7 +284,7 @@ public class DistributionCatalogServlet extends BeGenericServlet {
 
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("download interface artifact for resource - external API");
-            log.debug("download artifact failed with exception", e);
+            log.debug(DOWNLOAD_ARTIFACT_FAILED_WITH_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java
index ca6227cd6a..61620bb90e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java
@@ -20,20 +20,9 @@
 
 package org.openecomp.sdc.be.distribution.servlet;
 
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.distribution.AuditHandler;
@@ -49,23 +38,19 @@ import org.openecomp.sdc.be.servlets.BeGenericServlet;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.HttpUtil;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import io.swagger.annotations.ResponseHeader;
+import javax.annotation.Resource;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 /**
  * This Servlet serves external users for distribution purposes.
@@ -80,7 +65,8 @@ import io.swagger.annotations.ResponseHeader;
 @Singleton
 public class DistributionServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(DistributionServlet.class);
+    private static final String START_HANDLE_REQUEST_OF = "Start handle request of {}";
+	private static final Logger log = Logger.getLogger(DistributionServlet.class);
     @Resource
     private DistributionBusinessLogic distributionLogic;
     @Context
@@ -118,14 +104,14 @@ public class DistributionServlet extends BeGenericServlet {
 
         init(request);
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         Response response = null;
         ResponseFormat responseFormat = null;
 
         if (instanceId == null) {
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
             response = buildErrorResponse(responseFormat);
-            getComponentsUtils().auditMissingInstanceId(AuditingActionEnum.GET_UEB_CLUSTER, responseFormat.getStatus().toString(), responseFormat.getFormattedMessage());
+            getComponentsUtils().auditGetUebCluster(null, responseFormat.getStatus().toString(), responseFormat.getFormattedMessage());
             return response;
         }
 
@@ -140,14 +126,14 @@ public class DistributionServlet extends BeGenericServlet {
                 response = buildOkResponse(responseFormat, actionResponse.left().value());
             }
 
-            getComponentsUtils().auditGetUebCluster(AuditingActionEnum.GET_UEB_CLUSTER, instanceId, null, responseFormat.getStatus().toString(), responseFormat.getFormattedMessage());
+            getComponentsUtils().auditGetUebCluster(instanceId, responseFormat.getStatus().toString(), responseFormat.getFormattedMessage());
             return response;
 
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("failed to get ueb serbver list from cofiguration");
             log.debug("failed to get ueb serbver list from cofiguration", e);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
-            getComponentsUtils().auditGetUebCluster(AuditingActionEnum.GET_UEB_CLUSTER, instanceId, null, responseFormat.getStatus().toString(), responseFormat.getFormattedMessage());
+            getComponentsUtils().auditGetUebCluster(instanceId, responseFormat.getStatus().toString(), responseFormat.getFormattedMessage());
             response = buildErrorResponse(responseFormat);
             return response;
         }
@@ -191,7 +177,7 @@ public class DistributionServlet extends BeGenericServlet {
             @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
             @ApiParam( hidden = true) String requestJson) {
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         init(request);
 
         Wrapper<Response> responseWrapper = new Wrapper<>();
@@ -203,7 +189,7 @@ public class DistributionServlet extends BeGenericServlet {
             validateJson(responseWrapper, registrationRequestWrapper, requestJson);
         }
         if (responseWrapper.isEmpty()) {
-            validateEnv(responseWrapper, registrationRequestWrapper.getInnerElement().getDistrEnvName());
+            validateEnv(responseWrapper);
         }
 
         if (responseWrapper.isEmpty()) {
@@ -244,11 +230,12 @@ public class DistributionServlet extends BeGenericServlet {
             @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept) {
         init(request);
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         Response response = null;
 
         Wrapper<Response> responseWrapper = new Wrapper<>();
 
+        //TODO check if in use
         validateHeaders(responseWrapper, request, AuditingActionEnum.GET_VALID_ARTIFACT_TYPES);
         if (responseWrapper.isEmpty()) {
             response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), ArtifactTypeEnum.values());
@@ -298,7 +285,7 @@ public class DistributionServlet extends BeGenericServlet {
             @ApiParam( hidden = true) String requestJson) {
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         init(request);
 
         Wrapper<Response> responseWrapper = new Wrapper<>();
@@ -310,7 +297,7 @@ public class DistributionServlet extends BeGenericServlet {
             validateJson(responseWrapper, unRegistrationRequestWrapper, requestJson);
         }
         if (responseWrapper.isEmpty()) {
-            validateEnv(responseWrapper, unRegistrationRequestWrapper.getInnerElement().getDistrEnvName());
+            validateEnv(responseWrapper);
         }
         if (responseWrapper.isEmpty()) {
             distributionLogic.handleUnRegistration(responseWrapper, unRegistrationRequestWrapper.getInnerElement(), buildAuditHandler(request, unRegistrationRequestWrapper.getInnerElement()));
@@ -321,7 +308,7 @@ public class DistributionServlet extends BeGenericServlet {
         return responseWrapper.getInnerElement();
     }
 
-    private void validateEnv(Wrapper<Response> responseWrapper, String distrEnvName) {
+    private void validateEnv(Wrapper<Response> responseWrapper) {
 
         // DE194021
         StorageOperationStatus environmentStatus = distributionLogic.getDistributionEngine().isEnvironmentAvailable();
@@ -347,9 +334,8 @@ public class DistributionServlet extends BeGenericServlet {
         if (request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER) == null) {
             Response missingHeaderResponse = buildErrorResponse(distributionLogic.getResponseFormatManager().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID));
             responseWrapper.setInnerElement(missingHeaderResponse);
-            // Audit
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
-            getComponentsUtils().auditMissingInstanceId(auditingAction, responseFormat.getStatus().toString(), responseFormat.getFormattedMessage());
+            getComponentsUtils().auditMissingInstanceIdAsDistributionEngineEvent(auditingAction, responseFormat.getStatus().toString());
 
         }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java
index 8aee1fbb0e..757c3a48d4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/EcompIntImpl.java
@@ -20,11 +20,7 @@
 
 package org.openecomp.sdc.be.ecomp;
 
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import fj.data.Either;
 import org.openecomp.portalsdk.core.onboarding.crossapi.IPortalRestAPIService;
 import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
@@ -38,17 +34,39 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
-import fj.data.Either;
+import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedList;
+import java.util.List;
 
 
 public class EcompIntImpl implements IPortalRestAPIService {
-    private static final Logger log = LoggerFactory.getLogger(EcompIntImpl.class);
+	private static final String FAILED_TO_CONVERT_ROLES = "Failed to convert Roles";
+	private static final String FAILED_TO_GET_ROLES = "Failed to get Roles";
+	private static final String GET_USER_ROLES = "GetUserRoles";
+	private static final String ERROR_FAILED_TO_GET_ROLES = "Error: Failed to get Roles";
+	private static final String PUSH_USER_ROLE = "PushUserRole";
+	private static final String FAILED_TO_FETCH_ROLES = "Failed to fetch roles";
+	private static final String FAILED_TO_CONVERT_USER2 = "Failed to convert User {}";
+	private static final String GET_USERS = "GetUsers";
+	private static final String FAILED_TO_GET_USERS = "Failed to get Users";
+	private static final String GET_USER = "GetUser";
+	private static final String FAILED_TO_GET_USER = "Failed to get User";
+	private static final String FAILED_TO_UPDATE_USER_CREDENTIALS = "Failed to updateUserCredentials";
+	private static final String FAILED_TO_EDIT_USER = "Failed to edit user";
+	private static final String EDIT_USER = "EditUser";
+	private static final String RECEIVED_NULL_FOR_ARGUMENT_LOGIN_ID = "Received null for argument loginId";
+	private static final String NULL_POINTER_RETURNED_FROM_USER_CONVERTER = "NULL pointer returned from user converter";
+	private static final String FAILED_TO_CREATE_USER = "Failed to create user {}";
+	private static final String FAILED_TO_CONVERT_USER = "Failed to convert user";
+	private static final String JH0003 = "jh0003";
+	private static final String PUSH_USER = "PushUser";
+	private static final String RECEIVED_NULL_FOR_ARGUMENT_USER = "Received null for argument user";
+	private static final Logger log = Logger.getLogger(EcompIntImpl.class.getName());
 
     public EcompIntImpl() {
         log.debug("EcompIntImpl Class Instantiated");
@@ -59,26 +77,26 @@ public class EcompIntImpl implements IPortalRestAPIService {
         log.debug("Start handle request of ECOMP pushUser");
         try {
             if (user == null) {
-                BeEcompErrorManager.getInstance().logInvalidInputError("PushUser", "Recieved null for argument user", ErrorSeverity.INFO);
-                log.debug("Recieved null for argument user");
-                throw new PortalAPIException("Recieved null for argument user");
+                BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER, RECEIVED_NULL_FOR_ARGUMENT_USER, ErrorSeverity.INFO);
+                log.debug(RECEIVED_NULL_FOR_ARGUMENT_USER);
+                throw new PortalAPIException(RECEIVED_NULL_FOR_ARGUMENT_USER);
             }
 
             UserBusinessLogic userBusinessLogic = getUserBusinessLogic();
 
-            final String modifierAttId = "jh0003";
+            final String modifierAttId = JH0003;
             User modifier = new User();
             modifier.setUserId(modifierAttId);
             log.debug("modifier id is {}", modifierAttId);
 
             Either<User, String> newASDCUser = EcompUserConverter.convertEcompUserToUser(user);
             if (newASDCUser.isRight()) {
-                BeEcompErrorManager.getInstance().logInvalidInputError("PushUser", "Failed to convert user", ErrorSeverity.INFO);
-                log.debug("Failed to create user {}", user);
+                BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER, FAILED_TO_CONVERT_USER, ErrorSeverity.INFO);
+                log.debug(FAILED_TO_CREATE_USER, user);
                 throw new PortalAPIException("Failed to create user " + newASDCUser.right().value());
             } else if (newASDCUser.left().value() == null) {
-                BeEcompErrorManager.getInstance().logInvalidInputError("PushUser", "NULL pointer returned from user converter", ErrorSeverity.INFO);
-                log.debug("Failed to create user {}", user);
+                BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER, NULL_POINTER_RETURNED_FROM_USER_CONVERTER, ErrorSeverity.INFO);
+                log.debug(FAILED_TO_CREATE_USER, user);
                 throw new PortalAPIException("Failed to create user " + newASDCUser.right().value());
             }
 
@@ -90,17 +108,17 @@ public class EcompIntImpl implements IPortalRestAPIService {
 
             if (createUserResponse.isRight()) {
                 if (!createUserResponse.right().value().getMessageId().equals(ALREADY_EXISTS_RESPONSE_ID)) {
-                    log.debug("Failed to create user {}", user);
-                    BeEcompErrorManager.getInstance().logInvalidInputError("PushUser", "Failed to create user", ErrorSeverity.ERROR);
-                    throw new PortalAPIException("Failed to create user" + createUserResponse.right());
+                    log.debug(FAILED_TO_CREATE_USER, user);
+                    BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER, FAILED_TO_CREATE_USER, ErrorSeverity.ERROR);
+                    throw new PortalAPIException(FAILED_TO_CREATE_USER + createUserResponse.right());
                 }
                 log.debug("User already exist {}", user);
             }
             log.debug("User created {}", user);
         } catch (Exception e) {
-            log.debug("Failed to create user {}", user, e);
-            BeEcompErrorManager.getInstance().logInvalidInputError("PushUser", "Failed to create user", ErrorSeverity.ERROR);
-            throw new PortalAPIException("Failed to create user", e);
+            log.debug(FAILED_TO_CREATE_USER, user, e);
+            BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER, FAILED_TO_CREATE_USER, ErrorSeverity.ERROR);
+            throw new PortalAPIException(FAILED_TO_CREATE_USER, e);
         }
     }
 
@@ -117,20 +135,20 @@ public class EcompIntImpl implements IPortalRestAPIService {
 
         try {
             if (user == null) {
-                log.debug("Recieved null for argument user");
-                BeEcompErrorManager.getInstance().logInvalidInputError("EditUser", "Recieved null for argument user", ErrorSeverity.INFO);
-                throw new PortalAPIException("Recieved null for argument user");
+                log.debug(RECEIVED_NULL_FOR_ARGUMENT_USER);
+                BeEcompErrorManager.getInstance().logInvalidInputError(EDIT_USER, RECEIVED_NULL_FOR_ARGUMENT_USER, ErrorSeverity.INFO);
+                throw new PortalAPIException(RECEIVED_NULL_FOR_ARGUMENT_USER);
             } else if (loginId == null) {
-                log.debug("Recieved null for argument loginId");
-                BeEcompErrorManager.getInstance().logInvalidInputError("EditUser", "Recieved null for argument loginId", ErrorSeverity.INFO);
-                throw new PortalAPIException("Recieved null for argument loginId");
+                log.debug(RECEIVED_NULL_FOR_ARGUMENT_LOGIN_ID);
+                BeEcompErrorManager.getInstance().logInvalidInputError(EDIT_USER, RECEIVED_NULL_FOR_ARGUMENT_LOGIN_ID, ErrorSeverity.INFO);
+                throw new PortalAPIException(RECEIVED_NULL_FOR_ARGUMENT_LOGIN_ID);
             }
 
             UserBusinessLogic userBusinessLogic = getUserBusinessLogic();
 
             if (user.getLoginId() != null && !user.getLoginId().equals(loginId)) {
                 log.debug("loginId and user loginId not equal");
-                BeEcompErrorManager.getInstance().logInvalidInputError("EditUser", "loginId and user loginId not equal", ErrorSeverity.INFO);
+                BeEcompErrorManager.getInstance().logInvalidInputError(EDIT_USER, "loginId and user loginId not equal", ErrorSeverity.INFO);
                 throw new PortalAPIException("loginId not equals to the user loginId field");
             } else if (user.getLoginId() == null) {
                 user.setLoginId(loginId);
@@ -138,25 +156,25 @@ public class EcompIntImpl implements IPortalRestAPIService {
 
             Either<User, String> asdcUser = EcompUserConverter.convertEcompUserToUser(user);
             if (asdcUser.isRight()) {
-                log.debug("Failed to convert user");
-                BeEcompErrorManager.getInstance().logInvalidInputError("EditUser", "Failed to convert user", ErrorSeverity.INFO);
+                log.debug(FAILED_TO_CONVERT_USER);
+                BeEcompErrorManager.getInstance().logInvalidInputError(EDIT_USER, FAILED_TO_CONVERT_USER, ErrorSeverity.INFO);
                 throw new PortalAPIException(asdcUser.right().value());
             } else if (asdcUser.left().value() == null) {
-                log.debug("NULL pointer returned from user converter");
-                BeEcompErrorManager.getInstance().logInvalidInputError("EditUser", "NULL pointer returned from user converter", ErrorSeverity.INFO);
-                throw new PortalAPIException("Failed to edit user");
+                log.debug(NULL_POINTER_RETURNED_FROM_USER_CONVERTER);
+                BeEcompErrorManager.getInstance().logInvalidInputError(EDIT_USER, NULL_POINTER_RETURNED_FROM_USER_CONVERTER, ErrorSeverity.INFO);
+                throw new PortalAPIException(FAILED_TO_EDIT_USER);
             }
 
             Either<User, ResponseFormat> updateUserCredentialsResponse = userBusinessLogic.updateUserCredentials(asdcUser.left().value());
 
             if (updateUserCredentialsResponse.isRight()) {
-                log.debug("Failed to updateUserCredentials");
-                BeEcompErrorManager.getInstance().logInvalidInputError("EditUser", "Failed to updateUserCredentials", ErrorSeverity.ERROR);
-                throw new PortalAPIException("Failed to edit user" + updateUserCredentialsResponse.right().value());
+                log.debug(FAILED_TO_UPDATE_USER_CREDENTIALS);
+                BeEcompErrorManager.getInstance().logInvalidInputError(EDIT_USER, FAILED_TO_UPDATE_USER_CREDENTIALS, ErrorSeverity.ERROR);
+                throw new PortalAPIException(FAILED_TO_EDIT_USER + updateUserCredentialsResponse.right().value());
             }
         } catch (Exception e) {
-            log.debug("Failed to updateUserCredentials");
-            throw new PortalAPIException("Failed to edit user", e);
+            log.debug(FAILED_TO_UPDATE_USER_CREDENTIALS);
+            throw new PortalAPIException(FAILED_TO_EDIT_USER, e);
         }
 
     }
@@ -168,9 +186,9 @@ public class EcompIntImpl implements IPortalRestAPIService {
         try {
 
             if (loginId == null) {
-                log.debug("Recieved null for argument loginId");
-                BeEcompErrorManager.getInstance().logInvalidInputError("GetUser", "Recieved null for argument loginId", ErrorSeverity.INFO);
-                throw new PortalAPIException("Recieved null for argument loginId");
+                log.debug(RECEIVED_NULL_FOR_ARGUMENT_LOGIN_ID);
+                BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER, RECEIVED_NULL_FOR_ARGUMENT_LOGIN_ID, ErrorSeverity.INFO);
+                throw new PortalAPIException(RECEIVED_NULL_FOR_ARGUMENT_LOGIN_ID);
             }
 
             UserBusinessLogic userBusinessLogic = getUserBusinessLogic();
@@ -178,28 +196,28 @@ public class EcompIntImpl implements IPortalRestAPIService {
             Either<User, ActionStatus> getUserResponse = userBusinessLogic.getUser(loginId, false);
 
             if (getUserResponse.isRight()) {
-                log.debug("Failed to get User");
-                BeEcompErrorManager.getInstance().logInvalidInputError("GetUser", "Failed to get User", ErrorSeverity.INFO);
-                throw new PortalAPIException("Failed to get User" + getUserResponse.right());
+                log.debug(FAILED_TO_GET_USER);
+                BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER, FAILED_TO_GET_USER, ErrorSeverity.INFO);
+                throw new PortalAPIException(FAILED_TO_GET_USER + getUserResponse.right());
             } else {
                 if (getUserResponse.left().value() != null) {
                     Either<EcompUser, String> ecompUser = EcompUserConverter.convertUserToEcompUser(getUserResponse.left().value());
                     if (ecompUser.isLeft() && ecompUser.left().value() != null) {
                         return ecompUser.left().value();
                     } else {
-                        log.debug("Failed to get User");
-                        BeEcompErrorManager.getInstance().logInvalidInputError("GetUser", "Failed to get User", ErrorSeverity.INFO);
+                        log.debug(FAILED_TO_GET_USER);
+                        BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER, FAILED_TO_GET_USER, ErrorSeverity.INFO);
                         throw new PortalAPIException(ecompUser.right().value());
                     }
                 } else {
-                    log.debug("Failed to get User");
-                    BeEcompErrorManager.getInstance().logInvalidInputError("GetUser", "Failed to get User", ErrorSeverity.INFO);
-                    throw new PortalAPIException("Failed to get User" + getUserResponse.right());
+                    log.debug(FAILED_TO_GET_USER);
+                    BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER, FAILED_TO_GET_USER, ErrorSeverity.INFO);
+                    throw new PortalAPIException(FAILED_TO_GET_USER + getUserResponse.right());
                 }
             }
         } catch (Exception e) {
-            log.debug("Failed to get User");
-            throw new PortalAPIException("Failed to get User", e);
+            log.debug(FAILED_TO_GET_USER);
+            throw new PortalAPIException(FAILED_TO_GET_USER, e);
         }
     }
 
@@ -210,41 +228,39 @@ public class EcompIntImpl implements IPortalRestAPIService {
         try {
             UserBusinessLogic userBusinessLogic = getUserBusinessLogic();
 
-            final String modifierAttId = "jh0003";
-
-            Either<List<User>, ResponseFormat> getUsersResponse = userBusinessLogic.getUsersList(modifierAttId, null, null);
+            Either<List<User>, ResponseFormat> getUsersResponse = userBusinessLogic.getUsersList(JH0003, null, null);
 
             if (getUsersResponse.isRight()) {
-                log.debug("Failed to get Users");
-                BeEcompErrorManager.getInstance().logInvalidInputError("GetUsers", "Failed to get users", ErrorSeverity.INFO);
-                throw new PortalAPIException("Failed to get Users" + getUsersResponse.right());
+                log.debug(FAILED_TO_GET_USERS);
+                BeEcompErrorManager.getInstance().logInvalidInputError(GET_USERS, FAILED_TO_GET_USERS, ErrorSeverity.INFO);
+                throw new PortalAPIException(FAILED_TO_GET_USERS + getUsersResponse.right());
             } else {
                 if (getUsersResponse.left().value() != null) {
                     List<EcompUser> ecompUserList = new LinkedList<>();
                     for (User user : getUsersResponse.left().value()) {
                         Either<EcompUser, String> ecompUser = EcompUserConverter.convertUserToEcompUser(user);
                         if (ecompUser.isRight()) {
-                            log.debug("Failed to convert User {}", user);
-                            BeEcompErrorManager.getInstance().logInvalidInputError("GetUsers", "Failed to convert User" + user.toString(), ErrorSeverity.WARNING);
+                            log.debug(FAILED_TO_CONVERT_USER2, user);
+                            BeEcompErrorManager.getInstance().logInvalidInputError(GET_USERS, "Failed to convert User" + user.toString(), ErrorSeverity.WARNING);
                             continue;
                         } else if (ecompUser.left().value() == null) {
-                            log.debug("Failed to convert User {}", user);
-                            BeEcompErrorManager.getInstance().logInvalidInputError("GetUsers", "Failed to convert User" + user.toString(), ErrorSeverity.WARNING);
+                            log.debug(FAILED_TO_CONVERT_USER2, user);
+                            BeEcompErrorManager.getInstance().logInvalidInputError(GET_USERS, "Failed to convert User" + user.toString(), ErrorSeverity.WARNING);
                             continue;
                         }
                         ecompUserList.add(ecompUser.left().value());
                     }
                     return ecompUserList;
                 } else {
-                    log.debug("Failed to get users");
-                    BeEcompErrorManager.getInstance().logInvalidInputError("GetUsers", "Failed to get users", ErrorSeverity.INFO);
-                    throw new PortalAPIException("Failed to get Users" + getUsersResponse.right());
+                    log.debug(FAILED_TO_GET_USERS);
+                    BeEcompErrorManager.getInstance().logInvalidInputError(GET_USERS, FAILED_TO_GET_USERS, ErrorSeverity.INFO);
+                    throw new PortalAPIException(FAILED_TO_GET_USERS + getUsersResponse.right());
                 }
             }
         } catch (Exception e) {
-            log.debug("Failed to get users");
-            BeEcompErrorManager.getInstance().logInvalidInputError("GetUsers", "Failed to get users", ErrorSeverity.INFO);
-            throw new PortalAPIException("Failed to get Users", e);
+            log.debug(FAILED_TO_GET_USERS);
+            BeEcompErrorManager.getInstance().logInvalidInputError(GET_USERS, FAILED_TO_GET_USERS, ErrorSeverity.INFO);
+            throw new PortalAPIException(FAILED_TO_GET_USERS, e);
         }
     }
 
@@ -266,8 +282,8 @@ public class EcompIntImpl implements IPortalRestAPIService {
 
             return ecompRolesList;
         } catch (Exception e) {
-            log.debug("Failed to fetch roles");
-            BeEcompErrorManager.getInstance().logInvalidInputError("GetAvailableRoles", "Failed to fetch roles", ErrorSeverity.INFO);
+            log.debug(FAILED_TO_FETCH_ROLES);
+            BeEcompErrorManager.getInstance().logInvalidInputError("GetAvailableRoles", FAILED_TO_FETCH_ROLES, ErrorSeverity.INFO);
             throw new PortalAPIException("Roles fetching failed", e);
         }
 
@@ -280,7 +296,7 @@ public class EcompIntImpl implements IPortalRestAPIService {
     public void pushUserRole(String loginId, List<EcompRole> roles) throws PortalAPIException {
         log.debug("Start handle request of ECOMP pushUserRole");
 
-        final String modifierAttId = "jh0003";
+        final String modifierAttId = JH0003;
         User modifier = new User();
         modifier.setUserId(modifierAttId);
         log.debug("modifier id is {}", modifierAttId);
@@ -298,17 +314,17 @@ public class EcompIntImpl implements IPortalRestAPIService {
             Either<User, ResponseFormat> updateUserRoleResponse = userBusinessLogic.updateUserRole(modifier, loginId, updatedRole);
             if (updateUserRoleResponse.isRight()) {
                 log.debug("Error: Failed to update role");
-                BeEcompErrorManager.getInstance().logInvalidInputError("PushUserRole", "Failed to update role", ErrorSeverity.INFO);
+                BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER_ROLE, "Failed to update role", ErrorSeverity.INFO);
                 throw new PortalAPIException("Failed to update role" + updateUserRoleResponse.right().value().toString());
             }
         } else {
             log.debug("Error: No roles in List");
-            BeEcompErrorManager.getInstance().logInvalidInputError("PushUserRole", "Failed to fetch roles", ErrorSeverity.INFO);
+            BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER_ROLE, FAILED_TO_FETCH_ROLES, ErrorSeverity.INFO);
             //in this cases we want to deactivate the user
             Either<User, ResponseFormat> deActivateUserResponse = userBusinessLogic.deActivateUser(modifier, loginId);
             if (deActivateUserResponse.isRight()) {
                 log.debug("Error: Failed to deactivate user {}",loginId);
-                BeEcompErrorManager.getInstance().logInvalidInputError("PushUserRole", "Failed to deactivate user", ErrorSeverity.INFO);
+                BeEcompErrorManager.getInstance().logInvalidInputError(PUSH_USER_ROLE, "Failed to deactivate user", ErrorSeverity.INFO);
                 throw new PortalAPIException(deActivateUserResponse.right().value().getFormattedMessage());
             }
         }
@@ -324,33 +340,33 @@ public class EcompIntImpl implements IPortalRestAPIService {
             Either<User, ActionStatus> getUserResponse = userBusinessLogic.getUser(loginId, false);
 
             if (getUserResponse.isRight()) {
-                log.debug("Error: Failed to get Roles");
-                BeEcompErrorManager.getInstance().logInvalidInputError("GetUserRoles", "Failed to get Roles", ErrorSeverity.INFO);
-                throw new PortalAPIException("Failed to get Roles" + getUserResponse.right());
+                log.debug(ERROR_FAILED_TO_GET_ROLES);
+                BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER_ROLES, FAILED_TO_GET_ROLES, ErrorSeverity.INFO);
+                throw new PortalAPIException(FAILED_TO_GET_ROLES + getUserResponse.right());
             } else {
                 if (getUserResponse.left().value() != null) {
                     Either<EcompUser, String> ecompUser = EcompUserConverter.convertUserToEcompUser(getUserResponse.left().value());
                     if (ecompUser.isRight()) {
                         log.debug("Error: Failed to convert Roles");
-                        BeEcompErrorManager.getInstance().logInvalidInputError("GetUserRoles", "Failed to convert Roles", ErrorSeverity.ERROR);
+                        BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER_ROLES, FAILED_TO_CONVERT_ROLES, ErrorSeverity.ERROR);
                         throw new PortalAPIException(ecompUser.right().value());
                     } else if (ecompUser.left().value() == null) {
                         log.debug("Error: Failed to convert Roles");
-                        BeEcompErrorManager.getInstance().logInvalidInputError("GetUserRoles", "Failed to convert Roles", ErrorSeverity.ERROR);
+                        BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER_ROLES, FAILED_TO_CONVERT_ROLES, ErrorSeverity.ERROR);
                         throw new PortalAPIException();
                     }
 
                     return new LinkedList<>(ecompUser.left().value().getRoles());
                 } else {
-                    log.debug("Error: Failed to get Roles");
-                    BeEcompErrorManager.getInstance().logInvalidInputError("GetUserRoles", "Failed to get Roles", ErrorSeverity.ERROR);
-                    throw new PortalAPIException("Failed to get Roles" + getUserResponse.right());
+                    log.debug(ERROR_FAILED_TO_GET_ROLES);
+                    BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER_ROLES, FAILED_TO_GET_ROLES, ErrorSeverity.ERROR);
+                    throw new PortalAPIException(FAILED_TO_GET_ROLES + getUserResponse.right());
                 }
             }
         } catch (Exception e) {
-            log.debug("Error: Failed to get Roles");
-            BeEcompErrorManager.getInstance().logInvalidInputError("GetUserRoles", "Failed to get Roles", ErrorSeverity.INFO);
-            throw new PortalAPIException("Failed to get Roles", e);
+            log.debug(ERROR_FAILED_TO_GET_ROLES);
+            BeEcompErrorManager.getInstance().logInvalidInputError(GET_USER_ROLES, FAILED_TO_GET_ROLES, ErrorSeverity.INFO);
+            throw new PortalAPIException(FAILED_TO_GET_ROLES, e);
         }
     }
 
@@ -373,8 +389,7 @@ public class EcompIntImpl implements IPortalRestAPIService {
 
     private UserBusinessLogic getUserBusinessLogic() {
         ApplicationContext ctx = ContextLoader.getCurrentWebApplicationContext();
-        UserBusinessLogic userBusinessLogic = (UserBusinessLogic) ctx.getBean("userBusinessLogic");
-        return userBusinessLogic;
+        return (UserBusinessLogic) ctx.getBean("userBusinessLogic");
     }
 
     /**
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java
index 5d27723c09..78bb5e67e1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/AssetMetadataConverter.java
@@ -20,43 +20,27 @@
 
 package org.openecomp.sdc.be.ecomp.converters;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
+import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.distribution.servlet.DistributionCatalogServlet;
-import org.openecomp.sdc.be.externalapi.servlet.representation.ArtifactMetadata;
-import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata;
-import org.openecomp.sdc.be.externalapi.servlet.representation.ResourceAssetDetailedMetadata;
-import org.openecomp.sdc.be.externalapi.servlet.representation.ResourceAssetMetadata;
-import org.openecomp.sdc.be.externalapi.servlet.representation.ResourceInstanceMetadata;
-import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceAssetDetailedMetadata;
-import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceAssetMetadata;
+import org.openecomp.sdc.be.externalapi.servlet.representation.*;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import fj.data.Either;
+import java.util.*;
 
 @org.springframework.stereotype.Component("asset-metadata-utils")
 public class AssetMetadataConverter {
-    private static final Logger log = LoggerFactory.getLogger(DistributionCatalogServlet.class);
+    private static final Logger log = Logger.getLogger(DistributionCatalogServlet.class);
 
     @Autowired
     private ComponentsUtils componentsUtils;
@@ -110,11 +94,6 @@ public class AssetMetadataConverter {
 
             return generateServiceMetadata(serverBaseURL, detailed, curr);
 
-        // For future US's that include product
-        /*
-         * case PRODUCT: if (component instanceof Product) { List<ProductAssetMetadata> retResList = new LinkedList<>(); for (Component curr : componentList) { retResList.add(convertToProductAssetMetadata((Product) curr, serverBaseURL)); } return
-         * Either.left(retResList);
-         */
         default:
 
             ResponseFormat responseFormat = componentsUtils.getResponseFormatAdditionalProperty(ActionStatus.COMPONENT_INVALID_CATEGORY);
@@ -168,7 +147,7 @@ public class AssetMetadataConverter {
         metaData = convertToServiceAssetMetadata((ServiceAssetMetadata) metaData, (Service) curr, serverBaseURL, detailed);
 
         if (detailed) {
-            Either<ServiceAssetDetailedMetadata, StorageOperationStatus> converted = convertToServiceDetailedMetadata((ServiceAssetDetailedMetadata) metaData, (Service) curr, serverBaseURL);
+            Either<ServiceAssetDetailedMetadata, StorageOperationStatus> converted = convertToServiceDetailedMetadata((ServiceAssetDetailedMetadata) metaData, (Service) curr);
             if (converted.isRight()) {
                 ActionStatus storageResponse = componentsUtils.convertFromStorageResponse(converted.right().value(), ComponentTypeEnum.RESOURCE);
                 ResponseFormat responseFormat = componentsUtils.getResponseFormat(storageResponse);
@@ -237,7 +216,7 @@ public class AssetMetadataConverter {
         }
 
         Map<String, ArtifactDefinition> deploymentArtifacts = resource.getDeploymentArtifacts();
-        assetToPopulate = populateResourceWithArtifacts(assetToPopulate, resource, serverBaseURL, deploymentArtifacts);
+        assetToPopulate = populateResourceWithArtifacts(assetToPopulate, resource, deploymentArtifacts);
 
         assetToPopulate.setLastUpdaterFullName(resource.getLastUpdaterFullName());
         assetToPopulate.setToscaResourceName(resource.getToscaResourceName());
@@ -245,7 +224,7 @@ public class AssetMetadataConverter {
         return Either.left(assetToPopulate);
     }
 
-    private <T extends ServiceAssetDetailedMetadata> Either<T, StorageOperationStatus> convertToServiceDetailedMetadata(T assetToPopulate, Service service, String serverBaseURL) {
+    private <T extends ServiceAssetDetailedMetadata> Either<T, StorageOperationStatus> convertToServiceDetailedMetadata(T assetToPopulate, Service service) {
 
         List<ComponentInstance> componentInstances = service.getComponentInstances();
 
@@ -266,7 +245,7 @@ public class AssetMetadataConverter {
         return Either.left(assetToPopulate);
     }
 
-    private <T extends ResourceAssetDetailedMetadata> T populateResourceWithArtifacts(T asset, Resource resource, String serverBaseURL, Map<String, ArtifactDefinition> artifacts) {
+    private <T extends ResourceAssetDetailedMetadata> T populateResourceWithArtifacts(T asset, Resource resource, Map<String, ArtifactDefinition> artifacts) {
 
         List<ArtifactMetadata> artifactMetaList = populateAssetWithArtifacts(resource, artifacts);
 
@@ -373,18 +352,4 @@ public class AssetMetadataConverter {
         return Either.left(retList);
     }
 
-    // For future US to support Product
-    /*
-     * private ProductAssetMetadata convertToProductAssetMetadata(Product product, String serverBaseURL) { ProductAssetMetadata retProdAsset = new ProductAssetMetadata();
-     *
-     * retProdAsset = convertToAsset(retProdAsset, product, serverBaseURL); retProdAsset.setLifecycleState(product.getLifecycleState().name()); retProdAsset.setLastUpdaterUserId(product.getLastUpdaterUserId());
-     * retProdAsset.setActive(product.getIsActive()); retProdAsset.setContacts(product.getContacts());
-     *
-     * List<CategoryDefinition> categories = product.getCategories(); List<ProductCategoryGroupMetadata> categoryMetadataList = new LinkedList<>();
-     *
-     * if (categories == null || categories.isEmpty()) { return retProdAsset; } else { for (CategoryDefinition categoryDefinition : categories) { String categoryName = categoryDefinition.getName(); List<SubCategoryDefinition> subcategories =
-     * categoryDefinition.getSubcategories(); for (SubCategoryDefinition subCategoryDefinition : subcategories) { String subCategoryName = subCategoryDefinition.getName(); List<GroupDefinition> groups = product.getGroups(); for (GroupDefinition
-     * groupDefinition : groups) { String groupName = groupDefinition.getName(); categoryMetadataList.add(new ProductCategoryGroupMetadata(categoryName, subCategoryName, groupName)); } } } retProdAsset.setProductGroupings(categoryMetadataList);
-     * return retProdAsset; } }
-     */
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverter.java
index 6b0c85bb3e..aebc9170f1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverter.java
@@ -22,12 +22,11 @@ package org.openecomp.sdc.be.ecomp.converters;
 
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
 import org.openecomp.sdc.be.user.Role;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
 public final class EcompRoleConverter {
 
-    private static final Logger log = LoggerFactory.getLogger(EcompRoleConverter.class);
+    private static final Logger log = Logger.getLogger(EcompRoleConverter.class);
 
     private EcompRoleConverter() {
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java
index 0f9c9be293..0297abeacb 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/ecomp/converters/EcompUserConverter.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,8 +20,6 @@
 
 package org.openecomp.sdc.be.ecomp.converters;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.Sets;
 import fj.data.Either;
 import org.openecomp.portalsdk.core.restful.domain.EcompRole;
 import org.openecomp.portalsdk.core.restful.domain.EcompUser;
@@ -29,8 +27,9 @@ import org.openecomp.sdc.be.dao.utils.UserStatusEnum;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.user.Role;
 
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Objects;
+import java.util.Set;
 
 public final class EcompUserConverter {
 
@@ -38,41 +37,12 @@ public final class EcompUserConverter {
     }
 
     public static Either<EcompUser, String> convertUserToEcompUser(User asdcUser) {
-        return (Objects.nonNull(asdcUser)) ? Either.left(convertToEcompUser(asdcUser)) : Either.right("User is null");
-    }
-
-
-    public static Either<User, String> convertEcompUserToUser(EcompUser ecompUser) {
-        return (Objects.nonNull(ecompUser)) ? Either.left(convertToUser(ecompUser)) : Either.right("EcompUser is null");
-    }
-
-    private static User convertToUser(EcompUser ecompUser) {
-        User convertedUser = new User();
-
-        convertedUser.setFirstName(ecompUser.getFirstName());
-        convertedUser.setLastName(ecompUser.getLastName());
-        convertedUser.setUserId((!isLoginIdEmpty(ecompUser) ? ecompUser.getLoginId() : ecompUser.getOrgUserId()));
-
-        convertedUser.setEmail(ecompUser.getEmail());
-
-        if (Objects.nonNull(ecompUser.getRoles())) {
-            Iterator<EcompRole> iter = ecompUser.getRoles().iterator();
+        EcompUser convertedUser = new EcompUser();
 
-            if (iter.hasNext()) {
-                String updatedRole = EcompRoleConverter.convertEcompRoleToRole(iter.next());
-                convertedUser.setRole(updatedRole);
-            }
+        if (asdcUser == null) {
+            return Either.right("User is null");
         }
 
-        convertedUser.setStatus((ecompUser.isActive()) ? UserStatusEnum.ACTIVE : UserStatusEnum.INACTIVE);
-
-
-        return convertedUser;
-    }
-
-    private static EcompUser convertToEcompUser(User asdcUser) {
-        EcompUser convertedUser = new EcompUser();
-
         convertedUser.setFirstName(asdcUser.getFirstName());
         convertedUser.setLastName(asdcUser.getLastName());
         convertedUser.setLoginId(asdcUser.getUserId());
@@ -85,33 +55,55 @@ public final class EcompUserConverter {
             convertedUser.setActive(false);
         }
 
-        EcompRole convertedRole = getEcompRole(asdcUser);
+        EcompRole convertedRole = new EcompRole();
+        for (Role role : Role.values()) {
+            if (role.name().equals(asdcUser.getRole()) || role.toString().equals(asdcUser.getRole())) {
+                convertedRole.setName(role.name());
+                convertedRole.setId(new Long(role.ordinal()));
+                break;
+            }
+        }
 
-        convertedUser.setRoles(Sets.newHashSet(convertedRole));
+        Set<EcompRole> convertedRoleSet = new HashSet<>();
+        convertedRoleSet.add(convertedRole);
+        convertedUser.setRoles(convertedRoleSet);
 
-        return convertedUser;
+        return Either.left(convertedUser);
     }
 
+    public static Either<User, String> convertEcompUserToUser(EcompUser ecompUser) {
+        User convertedUser = new User();
 
-    private static boolean isLoginIdEmpty(EcompUser user) {
-        return Strings.isNullOrEmpty(user.getLoginId());
-    }
+        if (ecompUser == null) {
+            return Either.right("EcompUser is null");
+        }
 
-    private static EcompRole getEcompRole(User asdcUser) {
-        EcompRole convertedRole = new EcompRole();
-        for (Role role : Role.values()) {
-            if (isRolesNamesEqual(asdcUser, role)) {
-                convertedRole.setName(role.name());
-                convertedRole.setId((long) role.ordinal());
-                break;
+        convertedUser.setFirstName(ecompUser.getFirstName());
+        convertedUser.setLastName(ecompUser.getLastName());
+
+        if (ecompUser.getLoginId() != null && !ecompUser.getLoginId().isEmpty()) {
+            convertedUser.setUserId(ecompUser.getLoginId());
+        } else {
+            convertedUser.setUserId(ecompUser.getOrgUserId());
+        }
+
+        convertedUser.setEmail(ecompUser.getEmail());
+
+        if (ecompUser.getRoles() != null) {
+            Iterator<EcompRole> iter = ecompUser.getRoles().iterator();
+
+            if (iter.hasNext()) {
+                String updatedRole = EcompRoleConverter.convertEcompRoleToRole(iter.next());
+                convertedUser.setRole(updatedRole);
             }
         }
-        return convertedRole;
-    }
 
-    private static boolean isRolesNamesEqual(User asdcUser, Role role) {
-        String asdcUserRole = asdcUser.getRole();
-        return role.name().equals(asdcUserRole) || role.toString().equals(asdcUserRole);
-    }
+        if (ecompUser.isActive()) {
+            convertedUser.setStatus(UserStatusEnum.ACTIVE);
+        } else {
+            convertedUser.setStatus(UserStatusEnum.INACTIVE);
+        }
 
-}
+        return Either.left(convertedUser);
+    }
+}
\ No newline at end of file
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java
index 0c31539baa..f3cf5944b4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java
@@ -31,14 +31,17 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
 import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
 import org.openecomp.sdc.be.servlets.RepresentationUtils;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
 import org.openecomp.sdc.common.datastructure.Wrapper;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.exception.ResponseFormat;
@@ -60,6 +63,7 @@ import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -122,8 +126,8 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.RESOURCE;
         String componentTypeValue = componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifactUUID);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentTypeValue);
+        ArtifactDefinition artifactDefinition = null;
 
         if (responseWrapper.isEmpty() && (instanceIdHeader == null || instanceIdHeader.isEmpty())) {
             log.debug("updateArtifact: Missing X-ECOMP-InstanceID header");
@@ -140,13 +144,14 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
                 Either<ArtifactDefinition, ResponseFormat> uploadArtifactEither = artifactsLogic.updateArtifactOnInterfaceOperationByResourceUUID(data, request, componentType, uuid, artifactUUID, operationUUID,
-                        additionalParams, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.UPDATE));
+                        resourceCommonInfo, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.UPDATE));
                 if (uploadArtifactEither.isRight()) {
                     log.debug("failed to update artifact");
                     responseFormat = uploadArtifactEither.right().value();
                     responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
                 } else {
-                    Object representation = RepresentationUtils.toRepresentation(uploadArtifactEither.left().value());
+                    artifactDefinition=uploadArtifactEither.left().value();
+                    Object representation = RepresentationUtils.toRepresentation(artifactDefinition);
                     Map<String, String> headers = new HashMap<>();
                     headers.put(Constants.MD5_HEADER, GeneralUtility.calculateMD5Base64EncodedByString((String) representation));
                     responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
@@ -159,7 +164,8 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             log.debug(message, e);
             responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
         } finally {
-            getComponentsUtils().auditExternalUpdateArtifact(responseFormat, componentTypeValue, request, additionalParams);
+            getComponentsUtils().auditExternalCrudApi(responseFormat, AuditingActionEnum.ARTIFACT_UPLOAD_BY_API,
+                    resourceCommonInfo, request, artifactDefinition, null);
         }
         return responseWrapper.getInnerElement();
     }
@@ -211,7 +217,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
             @ApiParam( hidden = true) String data) {
 
-        init(log);
+        init();
 
         Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
         String requestURI = request.getRequestURI();
@@ -219,7 +225,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentTypeValue);
 
         if (componentType == null) {
             log.debug("uploadArtifact: assetType parameter {} is not valid", assetType);
@@ -232,35 +238,41 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             validateHttpCspUserIdHeader(userId, responseWrapper);
         }
         Response response = null;
+        ArtifactDefinition artifactDefinition = null;
         try {
             if (responseWrapper.isEmpty()) {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
                 Either<ArtifactDefinition, ResponseFormat> uploadArtifactEither = artifactsLogic.uploadArtifactToComponentByUUID(data, request, componentType, uuid,
-                        additionalParams, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.CREATE));
+                        resourceCommonInfo, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.CREATE));
                 if (uploadArtifactEither.isRight()) {
                     log.debug("failed to upload artifact");
                     responseWrapper.setInnerElement(uploadArtifactEither.right().value());
                 } else {
-                    Object representation = RepresentationUtils.toRepresentation(uploadArtifactEither.left().value());
+                    artifactDefinition = uploadArtifactEither.left().value();
+                    Object representation = RepresentationUtils.toRepresentation(artifactDefinition);
                     Map<String, String> headers = new HashMap<>();
                     headers.put(Constants.MD5_HEADER, GeneralUtility.calculateMD5Base64EncodedByString((String) representation));
                     responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.OK));
                     response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation, headers);
                 }
             }
-            if( response == null ){
-                response = buildErrorResponse(responseWrapper.getInnerElement());
-            }
-            return response;
-        } catch (Exception e) {
+        } catch (IOException e) {
             final String message = "failed to upload artifact to a resource or service";
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
             log.debug(message, e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-        } finally {
-            getComponentsUtils().auditExternalUploadArtifact(responseWrapper.getInnerElement(), componentTypeValue, request, additionalParams);
+            responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+            response = buildErrorResponse(responseWrapper.getInnerElement());
+        }   catch (ComponentException e){
+            responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(e));
+        }finally {
+            if( response == null ){
+                response = buildErrorResponse(responseWrapper.getInnerElement());
+            }
+            getComponentsUtils().auditExternalCrudApi(responseWrapper.getInnerElement(), AuditingActionEnum.ARTIFACT_UPLOAD_BY_API,
+                    resourceCommonInfo, request, artifactDefinition, null);
         }
+        return response;
     }
 
     /**
@@ -311,8 +323,9 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceInstanceName);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(resourceInstanceName, componentTypeValue);
+        ArtifactDefinition artifactDefinition = null;
+
         if (componentType == null) {
             log.debug("uploadArtifact: assetType parameter {} is not valid", assetType);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -333,7 +346,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
                 Either<ArtifactDefinition, ResponseFormat> uploadArtifactEither = artifactsLogic.uploadArtifactToRiByUUID(data, request, componentType, uuid, resourceInstanceName,
-                        additionalParams, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.CREATE));
+                        artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.CREATE));
                 if (uploadArtifactEither.isRight()) {
                     log.debug("failed to upload artifact");
                     responseFormat = uploadArtifactEither.right().value();
@@ -346,13 +359,17 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                     responseWrapper.setInnerElement(buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation, headers));
                 }
             }
-        }catch (Exception e) {
+        }catch (IOException e) {
             final String message = "failed to upload artifact to a resource instance";
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
             log.debug(message, e);
-            responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
-        } finally {
-            getComponentsUtils().auditExternalUploadArtifact(responseFormat, componentTypeValue, request, additionalParams);
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
+            responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
+        }catch (ComponentException e){
+            responseFormat = getComponentsUtils().getResponseFormat(e);
+        }finally {
+            getComponentsUtils().auditExternalCrudApi(responseFormat, AuditingActionEnum.ARTIFACT_UPLOAD_BY_API,
+                    resourceCommonInfo, request, artifactDefinition, null);
         }
         return responseWrapper.getInnerElement();
     }
@@ -411,8 +428,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifactUUID);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentTypeValue);
         if (componentType == null) {
             log.debug("updateArtifact: assetType parameter {} is not valid", assetType);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -428,12 +444,13 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_USER_ID);
             responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
         }
+        ArtifactDefinition artifactDefinition = null;
         try {
             if (responseWrapper.isEmpty()) {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
                 Either<ArtifactDefinition, ResponseFormat> uploadArtifactEither = artifactsLogic.updateArtifactOnComponentByUUID(data, request, componentType, uuid, artifactUUID,
-                        additionalParams, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.UPDATE));
+                        resourceCommonInfo, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.UPDATE));
                 if (uploadArtifactEither.isRight()) {
                     log.debug("failed to update artifact");
                     responseFormat = uploadArtifactEither.right().value();
@@ -446,13 +463,18 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                     responseWrapper.setInnerElement(buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation, headers));
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             final String message = "failed to update artifact on a resource or service";
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
             log.debug(message, e);
-            responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
-        } finally {
-            getComponentsUtils().auditExternalUpdateArtifact(responseFormat, componentTypeValue, request, additionalParams);
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
+            responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
+        }  catch (ComponentException e){
+            responseFormat = getComponentsUtils().getResponseFormat(e);
+        }
+        finally{
+            getComponentsUtils().auditExternalCrudApi(responseFormat, AuditingActionEnum.ARTIFACT_UPDATE_BY_API, resourceCommonInfo,
+                    request, artifactDefinition, artifactUUID);
         }
         return responseWrapper.getInnerElement();
     }
@@ -506,9 +528,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceInstanceName);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifactUUID);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(resourceInstanceName, componentTypeValue);
         if (componentType == null) {
             log.debug("updateArtifactOnResourceInstance: assetType parameter {} is not valid", assetType);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -524,12 +544,13 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_USER_ID);
             responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
         }
+        ArtifactDefinition artifactDefinition = null;
         try {
             if (responseWrapper.isEmpty()) {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
                 Either<ArtifactDefinition, ResponseFormat> uploadArtifactEither = artifactsLogic.updateArtifactOnRiByUUID(data, request, componentType, uuid, resourceInstanceName, artifactUUID,
-                        additionalParams, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.UPDATE));
+                         artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.UPDATE));
                 if (uploadArtifactEither.isRight()) {
                     log.debug("failed to update artifact");
                     responseFormat = uploadArtifactEither.right().value();
@@ -542,13 +563,18 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                     responseWrapper.setInnerElement(buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation, headers));
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             final String message = "failed to update artifact on resource instance";
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
             log.debug(message, e);
-            responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
-        } finally {
-            getComponentsUtils().auditExternalUpdateArtifact(responseFormat, componentTypeValue, request, additionalParams);
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
+            responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
+        }  catch (ComponentException e){
+            responseFormat = getComponentsUtils().getResponseFormat(e);
+        }
+        finally{
+            getComponentsUtils().auditExternalCrudApi(responseFormat, AuditingActionEnum.ARTIFACT_UPDATE_BY_API, resourceCommonInfo,
+                    request, artifactDefinition, artifactUUID);
         }
         return responseWrapper.getInnerElement();
     }
@@ -596,8 +622,8 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifactUUID);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentTypeValue);
+        ArtifactDefinition artifactDefinition = null;
         if (componentType == null) {
             log.debug("deleteArtifact: assetType parameter {} is not valid", assetType);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -618,7 +644,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
                 Either<ArtifactDefinition, ResponseFormat> uploadArtifactEither = artifactsLogic.deleteArtifactOnComponentByUUID(request, componentType, uuid, artifactUUID,
-                        additionalParams, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.DELETE));
+                        resourceCommonInfo, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.DELETE));
                 if (uploadArtifactEither.isRight()) {
                     log.debug("failed to delete artifact");
                     responseFormat = uploadArtifactEither.right().value();
@@ -631,13 +657,18 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                     responseWrapper.setInnerElement(buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation, headers));
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             final String message = "failed to delete an artifact of a resource or service";
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
             log.debug(message, e);
-            responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
-        } finally {
-            getComponentsUtils().auditExternalDeleteArtifact(responseFormat, componentTypeValue, request, additionalParams);
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
+            responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
+        }  catch (ComponentException e){
+            responseFormat = getComponentsUtils().getResponseFormat(e);
+        }
+        finally{
+            getComponentsUtils().auditExternalCrudApi(responseFormat, AuditingActionEnum.ARTIFACT_DELETE_BY_API, resourceCommonInfo,
+                    request, artifactDefinition, artifactUUID);
         }
         return responseWrapper.getInnerElement();
     }
@@ -686,9 +717,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceInstanceName);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifactUUID);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(resourceInstanceName, componentTypeValue);
         if (componentType == null) {
             log.debug("deleteArtifactOnResourceInsatnce: assetType parameter {} is not valid", assetType);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -704,12 +733,13 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_USER_ID);
             responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
         }
+        ArtifactDefinition artifactDefinition = null;
         try {
             if (responseWrapper.isEmpty()) {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
                 Either<ArtifactDefinition, ResponseFormat> uploadArtifactEither = artifactsLogic.deleteArtifactOnRiByUUID(request, componentType, uuid, resourceInstanceName, artifactUUID,
-                        additionalParams, artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.DELETE));
+                         artifactsLogic.new ArtifactOperationInfo(true, false, ArtifactOperationEnum.DELETE));
                 if (uploadArtifactEither.isRight()) {
                     log.debug("failed to delete artifact");
                     responseFormat = uploadArtifactEither.right().value();
@@ -722,13 +752,18 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                     responseWrapper.setInnerElement(buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation, headers));
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             final String message = "failed to delete an artifact of a resource instance";
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
             log.debug(message, e);
-            responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
-        } finally {
-            getComponentsUtils().auditExternalDeleteArtifact(responseFormat, componentTypeValue, request, additionalParams);
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
+            responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
+        }  catch (ComponentException e){
+            responseFormat = getComponentsUtils().getResponseFormat(e);
+        }
+        finally{
+            getComponentsUtils().auditExternalCrudApi(responseFormat, AuditingActionEnum.ARTIFACT_DELETE_BY_API, resourceCommonInfo,
+                    request, artifactDefinition, artifactUUID);
         }
         return responseWrapper.getInnerElement();
     }
@@ -771,8 +806,6 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifactUUID);
         if (componentType == null) {
             log.debug("downloadComponentArtifact: assetType parameter {} is not valid", assetType);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -783,11 +816,12 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
             responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
         }
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentTypeValue);
         try {
             if (responseWrapper.isEmpty()) {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
-                Either<byte[], ResponseFormat> downloadComponentArtifactEither = artifactsLogic.downloadComponentArtifactByUUIDs(componentType, uuid, artifactUUID, additionalParams);
+                Either<byte[], ResponseFormat> downloadComponentArtifactEither = artifactsLogic.downloadComponentArtifactByUUIDs(componentType, uuid, artifactUUID, resourceCommonInfo);
                 if (downloadComponentArtifactEither.isRight()) {
                     responseFormat = downloadComponentArtifactEither.right().value();
                     responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
@@ -800,13 +834,12 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                     responseWrapper.setInnerElement(buildOkResponse(responseFormat, is, headers));
                 }
             }
-        } catch (Exception e) {
-            final String message = "failed to download an artifact of a resource or service";
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
-            log.debug(message, e);
-            responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
-        } finally {
-            getComponentsUtils().auditExternalDownloadArtifact(responseFormat, componentTypeValue, request, additionalParams);
+        }  catch (ComponentException e){
+            responseFormat = getComponentsUtils().getResponseFormat(e);
+        }
+        finally{
+            getComponentsUtils().auditExternalDownloadArtifact(responseFormat, resourceCommonInfo,
+                    new DistributionData(instanceIdHeader, requestURI), requestId, artifactUUID, userId);
         }
         return responseWrapper.getInnerElement();
     }
@@ -851,9 +884,6 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
         log.debug("{} {}", startLog, url);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         String componentTypeValue = componentType == null ? null : componentType.getValue();
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceInstanceName);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_CURR_ARTIFACT_UUID, artifactUUID);
         if (componentType == null) {
             log.debug("downloadResourceInstanceArtifact: assetType parameter {} is not valid", assetType);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
@@ -868,7 +898,7 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
             if (responseWrapper.isEmpty()) {
                 ServletContext context = request.getSession().getServletContext();
                 ArtifactsBusinessLogic artifactsLogic = getArtifactBL(context);
-                Either<byte[], ResponseFormat> downloadResourceArtifactEither = artifactsLogic.downloadResourceInstanceArtifactByUUIDs(componentType, uuid, resourceInstanceName, artifactUUID, additionalParams);
+                Either<byte[], ResponseFormat> downloadResourceArtifactEither = artifactsLogic.downloadResourceInstanceArtifactByUUIDs(componentType, uuid, resourceInstanceName, artifactUUID);
                 if (downloadResourceArtifactEither.isRight()) {
                     responseFormat = downloadResourceArtifactEither.right().value();
                     responseWrapper.setInnerElement(buildErrorResponse(responseFormat));
@@ -881,13 +911,12 @@ public class ArtifactExternalServlet extends AbstractValidationsServlet {
                     responseWrapper.setInnerElement(buildOkResponse(responseFormat, is, headers));
                 }
             }
-        } catch (Exception e) {
-            final String message = "failed to download an artifact of a resource instance";
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
-            log.debug(message, e);
-            responseWrapper.setInnerElement(buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR)));
-        } finally {
-            getComponentsUtils().auditExternalDownloadArtifact(responseFormat, componentTypeValue, request, additionalParams);
+        }  catch (ComponentException e){
+            responseFormat = getComponentsUtils().getResponseFormat(e);
+        }
+        finally{
+            getComponentsUtils().auditExternalDownloadArtifact(responseFormat, new ResourceCommonInfo(resourceInstanceName, componentTypeValue),
+                    new DistributionData(instanceIdHeader, requestURI), requestId, artifactUUID, userId);
         }
         return responseWrapper.getInnerElement();
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java
index 92862b5bd8..01306126ff 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java
@@ -20,26 +20,9 @@
 
 package org.openecomp.sdc.be.externalapi.servlet;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ElementBusinessLogic;
@@ -52,23 +35,28 @@ import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
 import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
 import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
 import org.openecomp.sdc.be.servlets.RepresentationUtils;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * This Servlet serves external users for retrieving component metadata.
@@ -86,7 +74,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
     @Context
     private HttpServletRequest request;
 
-    private static final Logger log = LoggerFactory.getLogger(AssetsDataServlet.class);
+    private static final Logger log = Logger.getLogger(AssetsDataServlet.class);
 
     /**
      *
@@ -133,15 +121,14 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
 
         AuditingActionEnum auditingActionEnum = query == null ? AuditingActionEnum.GET_ASSET_LIST : AuditingActionEnum.GET_FILTERED_ASSET_LIST;
 
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, query == null ? requestURI : requestURI + "?" + query);
+        String resourceUrl = query == null ? requestURI : requestURI + "?" + query;
+        DistributionData distributionData = new DistributionData(instanceIdHeader, resourceUrl);
 
         // Mandatory
         if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
             log.debug("getAssetList: Missing X-ECOMP-InstanceID header");
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
-            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+            getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
             return buildErrorResponse(responseFormat);
         }
 
@@ -166,7 +153,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
                 if (resourceTypeEnum == null) {
                     log.debug("getAssetList: Asset Fetching Failed. Invalid resource type was received");
                     responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT);
-                    getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+                    getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
                     return buildErrorResponse(responseFormat);
                 }
                 filters.put(FilterKeyEnum.RESOURCE_TYPE, resourceTypeEnum.name());
@@ -177,7 +164,7 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
             if (assetTypeData.isRight()) {
                 log.debug("getAssetList: Asset Fetching Failed");
                 responseFormat = assetTypeData.right().value();
-                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+                getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
                 return buildErrorResponse(responseFormat);
             } else {
                 log.debug("getAssetList: Asset Fetching Success");
@@ -185,12 +172,12 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
                 if (resMetadata.isRight()) {
                     log.debug("getAssetList: Asset conversion Failed");
                     responseFormat = resMetadata.right().value();
-                    getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+                    getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
                     return buildErrorResponse(responseFormat);
                 }
                 Object result = RepresentationUtils.toRepresentation(resMetadata.left().value());
                 responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
-                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+                getComponentsUtils().auditExternalGetAssetList(responseFormat, auditingActionEnum, distributionData, requestId);
 
                 response = buildOkResponse(responseFormat, result);
                 return response;
@@ -239,18 +226,15 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
         String url = request.getMethod() + " " + requestURI;
         log.debug("Start handle request of {}", url);
 
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<>(AuditingFieldsKeysEnum.class);
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, requestURI);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, componentType.getValue());
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, uuid);
-
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentType.getValue());
+        DistributionData distributionData = new DistributionData(instanceIdHeader, requestURI);
         // Mandatory
         if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
             log.debug("getAssetList: Missing X-ECOMP-InstanceID header");
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
-            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                    resourceCommonInfo, requestId, uuid);
             return buildErrorResponse(responseFormat);
         }
 
@@ -264,26 +248,30 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
             if (assetTypeData.isRight()) {
                 log.debug("getAssetList: Asset Fetching Failed");
                 responseFormat = assetTypeData.right().value();
-                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                        resourceCommonInfo, requestId, uuid);
 
                 return buildErrorResponse(responseFormat);
-            } else {
-                log.debug("getAssetList: Asset Fetching Success");
-                additionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, assetTypeData.left().value().iterator().next().getName());
-                Either<List<? extends AssetMetadata>, ResponseFormat> resMetadata = assetMetadataUtils.convertToAssetMetadata(assetTypeData.left().value(), requestURI, true);
-                if (resMetadata.isRight()) {
-                    log.debug("getAssetList: Asset conversion Failed");
-                    responseFormat = resMetadata.right().value();
-                    getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-                    return buildErrorResponse(responseFormat);
-                }
-                Object result = RepresentationUtils.toRepresentation(resMetadata.left().value().iterator().next());
-                responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
-                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
-
-                response = buildOkResponse(responseFormat, result);
-                return response;
             }
+            resourceCommonInfo.setResourceName(assetTypeData.left().value().iterator().next().getName());
+            log.debug("getAssetList: Asset Fetching Success");
+            Either<List<? extends AssetMetadata>, ResponseFormat> resMetadata = assetMetadataUtils.convertToAssetMetadata(assetTypeData.left().value(), requestURI, true);
+            if (resMetadata.isRight()) {
+                log.debug("getAssetList: Asset conversion Failed");
+                responseFormat = resMetadata.right().value();
+
+                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                        resourceCommonInfo, requestId, uuid);
+                return buildErrorResponse(responseFormat);
+            }
+            Object result = RepresentationUtils.toRepresentation(resMetadata.left().value().iterator().next());
+            responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                    resourceCommonInfo, requestId, uuid);
+
+            response = buildOkResponse(responseFormat, result);
+            return response;
+
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Fetch filtered list of assets");
             log.debug("getAssetList: Fetch list of assets failed with exception", e);
@@ -328,26 +316,27 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
         ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
         AuditingActionEnum auditingActionEnum = AuditingActionEnum.GET_TOSCA_MODEL;
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, url);
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, componentType.getValue());
-        additionalParam.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, uuid);
+
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentType.getValue());
+        DistributionData distributionData = new DistributionData(instanceIdHeader, url);
 
         if (instanceIdHeader == null || instanceIdHeader.isEmpty()) {
             log.debug("getToscaModel: Missing X-ECOMP-InstanceID header");
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID);
-            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                    resourceCommonInfo, requestId, uuid);
             return buildErrorResponse(responseFormat);
         }
 
         try {
             ComponentBusinessLogic componentBL = getComponentBL(componentType, context);
 
-            Either<ImmutablePair<String, byte[]>, ResponseFormat> csarArtifact = componentBL.getToscaModelByComponentUuid(componentType, uuid, additionalParam);
+
+            Either<ImmutablePair<String, byte[]>, ResponseFormat> csarArtifact = componentBL.getToscaModelByComponentUuid(componentType, uuid, resourceCommonInfo);
             if (csarArtifact.isRight()) {
                 responseFormat = csarArtifact.right().value();
-                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                        resourceCommonInfo, requestId, uuid);
                 response = buildErrorResponse(responseFormat);
             } else {
                 byte[] value = csarArtifact.left().value().getRight();
@@ -357,7 +346,8 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
                 headers.put(Constants.CONTENT_DISPOSITION_HEADER, getContentDispositionValue(csarArtifact.left().value().getLeft()));
                 headers.put(Constants.MD5_HEADER, contenetMD5);
                 responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.OK);
-                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+                getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                        resourceCommonInfo, requestId, uuid);
                 response = buildOkResponse(responseFormat, is, headers);
             }
             return response;
@@ -367,7 +357,8 @@ public class AssetsDataServlet extends AbstractValidationsServlet {
             log.debug("falied to get asset tosca model", e);
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
             response = buildErrorResponse(responseFormat);
-            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, additionalParam);
+            getComponentsUtils().auditExternalGetAsset(responseFormat, auditingActionEnum, distributionData,
+                    resourceCommonInfo, requestId, uuid);
             return response;
         }
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java
index bf8ad6d682..36c274c8fc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java
@@ -20,33 +20,18 @@
 
 package org.openecomp.sdc.be.externalapi.servlet;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.elasticsearch.common.Strings;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 import org.openecomp.sdc.be.components.impl.ElementBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ImportUtils;
 import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoBase;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
@@ -61,34 +46,34 @@ import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
 import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
+import org.openecomp.sdc.be.resources.data.auditing.model.ResourceCommonInfo;
 import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
 import org.openecomp.sdc.be.servlets.RepresentationUtils;
 import org.openecomp.sdc.be.utils.CommonBeUtils;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
@@ -99,7 +84,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
     @Context
     private HttpServletRequest request;
 
-    private static final Logger log = LoggerFactory.getLogger(CrudExternalServlet.class);
+    private static final Logger log = Logger.getLogger(CrudExternalServlet.class);
 
     /**
      * Creates a new Resource
@@ -148,7 +133,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
             @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
             @ApiParam( hidden = true) String data) {
 
-        init(log);
+        init();
 
         Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
         String requestURI = request.getRequestURI();
@@ -156,7 +141,8 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
         log.debug("Start handle request of {}", url);
         Resource resource = null;
         User modifier = null;
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(ComponentTypeEnum.RESOURCE.getValue());
+
         ServletContext context = request.getSession().getServletContext();
         ResourceBusinessLogic resourceBL = getResourceBL(context);
         try {
@@ -180,7 +166,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
                 JSONObject jsonObj = (JSONObject) parser.parse(data);
                 String resourceType = (String) jsonObj.get(FilterKeyEnum.RESOURCE_TYPE.getName());
                 if( StringUtils.isEmpty(resourceType) || !ResourceTypeEnum.containsName(resourceType) ){
-                    additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, (String) jsonObj.get("name"));
+                    resourceCommonInfo.setResourceName((String) jsonObj.get("name"));
                     responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
                 }
             }
@@ -217,36 +203,25 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
             }
             // Create the resource in the dataModel
             if (responseWrapper.isEmpty()) {
-                Either<Resource, ResponseFormat> eitherCreateResponse = resourceBL.createResource(resource, null,
+                resource = resourceBL.createResource(resource, null,
                         modifier, null, null);
-                if (eitherCreateResponse.isRight()) {
-                    responseWrapper.setInnerElement(eitherCreateResponse.right().value());
-                } else {
-                    resource = eitherCreateResponse.left().value();
-                }
-            }
-            Response response;
-            //Build Response and store it in the response Wrapper
-            if (responseWrapper.isEmpty()) {
-                response = buildCreatedResourceResponse(resource, context, responseWrapper);
-            }
-            else{
-                response = buildErrorResponse(responseWrapper.getInnerElement());
+                return buildCreatedResourceResponse(resource, context, responseWrapper);
+            } else {
+                return buildErrorResponse(responseWrapper.getInnerElement());
             }
-            return response;
-
-        } catch (Exception e) {
+        } catch (IOException|ParseException e) {
             final String message = "failed to create vfc monitoring template resource";
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
             log.debug(message, e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+            responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+            return buildErrorResponse(responseWrapper.getInnerElement());
+        } catch (ComponentException e){
+            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(e);
+            responseWrapper.setInnerElement(responseFormat);
+            return buildErrorResponse(responseFormat);
         }
         finally{
-            prepareAdditionalAudit(resource, additionalParams);
-
-            getComponentsUtils().auditExternalCrudApi(responseWrapper.getInnerElement(),
-                    ComponentTypeEnum.RESOURCE.getValue(), AuditingActionEnum.CREATE_RESOURCE_BY_API.getName(), request,
-                    additionalParams);
+            getComponentsUtils().auditCreateResourceExternalApi(responseWrapper.getInnerElement(), resourceCommonInfo, request, resource);
         }
     }
 
@@ -288,9 +263,8 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
             @ApiParam( hidden = true) String jsonChangeInfo) {
 
         Response response = null;
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
 
-        init(log);
+        init();
 
         String requestURI = request.getRequestURI();
         String url = request.getMethod() + " " + requestURI;
@@ -349,7 +323,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
                         changeInfo = new LifecycleChangeInfoWithAction(mapper.readValue(jsonChangeInfo, LifecycleChangeInfoBase.class).getUserRemarks());
                     }
                 }
-                catch (Exception e) {
+                catch (IOException e) {
                     BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
                     log.debug("failed to convert from json {}", jsonChangeInfo, e);
                     ResponseFormat responseFormat = getComponentsUtils().getInvalidContentErrorAndAudit(modifier, componentId, AuditingActionEnum.CHECKOUT_RESOURCE);
@@ -374,32 +348,20 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
             }
 
             return response;
-        } catch (Exception e) {
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Change Lifecycle State");
             log.debug("change lifecycle state failed with exception", e);
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
             responseWrapper.setInnerElement(responseFormat);
             return buildErrorResponse(responseFormat);
-        } finally{
-            auditChnageLifecycleAction(additionalParams, responseWrapper, componentType, component, responseObject, modifier, userId);
+        } catch (ComponentException e){
+            ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(e);
+            responseWrapper.setInnerElement(responseFormat);
+            return buildErrorResponse(responseFormat);
         }
-    }
-
-    private void prepareAdditionalAudit(Resource resource, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, StringUtils.EMPTY);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, StringUtils.EMPTY);
-
-        if( resource != null ){
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, ImportUtils.Constants.FIRST_NON_CERTIFIED_VERSION);
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resource.getName());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, resource.getUUID());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, resource.getInvariantUUID());
-        } else {
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, StringUtils.EMPTY);
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, StringUtils.EMPTY);
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, StringUtils.EMPTY);
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, StringUtils.EMPTY);
+        finally{
+            getComponentsUtils().auditChangeLifecycleAction(responseWrapper.getInnerElement(), componentType, requestId,
+                    component, responseObject, new DistributionData(instanceIdHeader, requestURI), modifier);
         }
     }
 
@@ -455,7 +417,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
                     addCategories(resource, category, subcategory, allResourceCategories, responseWrapper);
                 }
             }
-        } catch (Exception e) {
+        } catch (ParseException e) {
             log.debug("Exception occured in addCategories: {}", e.getMessage(), e);
             responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
@@ -502,50 +464,7 @@ public class CrudExternalServlet extends AbstractValidationsServlet {
 
 
 
-    private void auditChnageLifecycleAction(EnumMap<AuditingFieldsKeysEnum, Object> additionalParams,
-            Wrapper<ResponseFormat> responseWrapper, ComponentTypeEnum componentType, Component component,
-            Component responseObject, User modifier, String userId) {
-        if (modifier!=null){
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifier.getFullName());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId());
-        } else {
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, "");
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, userId);
-        }
-
-        if (component!=null){
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, component.getName());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, component.getVersion());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, component.getLifecycleState().name());
-        } else {
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, "");
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, "");
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, "");
-        }
-
-        if (responseObject!=null){
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, responseObject.getVersion());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, responseObject.getUUID());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, responseObject.getInvariantUUID());
-            additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,responseObject.getLifecycleState().name());
-        } else {
-            if (component!=null){
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, component.getVersion());
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, component.getUUID());
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, component.getInvariantUUID());
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,component.getLifecycleState().name());
-            } else {
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, "");
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, "");
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, "");
-                additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,"");
-            }
-        }
 
-        getComponentsUtils().auditExternalCrudApi(responseWrapper.getInnerElement(),
-                componentType.getValue(), AuditingActionEnum.CHANGE_LIFECYCLE_BY_API.getName(), request,
-                additionalParams);
-    }
 
     private Wrapper<ResponseFormat> runValidations(final String assetType) {
         Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefsServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefsServlet.java
index a459e3d7e0..cede761386 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefsServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefsServlet.java
@@ -1,45 +1,29 @@
 package org.openecomp.sdc.be.externalapi.servlet;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.components.impl.ExternalRefsBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.dto.ExternalRefDTO;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
-import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.be.servlets.BeGenericServlet;
 import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Controller;
 
-import fj.data.Either;
-
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.List;
+import java.util.Map;
 
 @Path("/v1/catalog")
 @Controller
-public class ExternalRefsServlet extends AbstractValidationsServlet {
+public class ExternalRefsServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ExternalRefsServlet.class);
-
-    private ExternalRefsBusinessLogic businessLogic;
+    private static final Logger log = Logger.getLogger(ExternalRefsServlet.class);
+    private final ComponentsUtils componentsUtils;
+    private final ExternalRefsBusinessLogic businessLogic;
 
     public ExternalRefsServlet(ExternalRefsBusinessLogic businessLogic, ComponentsUtils componentsUtils){
         this.businessLogic = businessLogic;
@@ -50,16 +34,15 @@ public class ExternalRefsServlet extends AbstractValidationsServlet {
     @Path("/{assetType}/{uuid}/version/{version}/resourceInstances/{componentInstanceName}/externalReferences/{objectType}")
     @Produces(MediaType.APPLICATION_JSON)
     public Response getComponentInstanceExternalRef(
-            @Context final HttpServletRequest request,
             @PathParam("assetType") String assetType,
             @PathParam("uuid") String uuid,
             @PathParam("version") String version,
             @PathParam("componentInstanceName") String componentInstanceName,
-            @PathParam("objectType") String objectType, @HeaderParam("USER_ID") String userId) {
+            @PathParam("objectType") String objectType, @HeaderParam("USER_ID") String userId, @HeaderParam("X-ECOMP-InstanceID") String xEcompInstanceId) {
 
         log.debug("GET component instance external interfaces {} {} {} {}", assetType, uuid, componentInstanceName, objectType);
 
-        Response r = authorizeAndValidateRequest(request, userId);
+        Response r = validateRequest(xEcompInstanceId);
         if (r != null){
             return r;
         }
@@ -76,15 +59,14 @@ public class ExternalRefsServlet extends AbstractValidationsServlet {
     @Path("/{assetType}/{uuid}/version/{version}/externalReferences/{objectType}")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, List<String>> getAssetExternalRefByObjectType(
-            @Context final HttpServletRequest request,
             @PathParam("assetType") String assetType,
             @PathParam("uuid") String uuid,
             @PathParam("version") String version,
-            @PathParam("objectType") String objectType, @HeaderParam("USER_ID") String userId) {
+            @PathParam("objectType") String objectType, @HeaderParam("USER_ID") String userId, @HeaderParam("X-ECOMP-InstanceID") String xEcompInstanceId) {
 
         log.debug("GET asset external references {} {} {}", assetType, uuid, objectType);
 
-        Response r = authorizeAndValidateRequest(request, userId);
+        Response r = validateRequest(xEcompInstanceId);
         if (r != null){
             throw new WebApplicationException(r);
         }
@@ -102,20 +84,19 @@ public class ExternalRefsServlet extends AbstractValidationsServlet {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public Response addComponentInstanceExternalRef(
-            @Context final HttpServletRequest request,
             @PathParam("assetType") String assetType,
             @PathParam("uuid") String uuid,
             @PathParam("componentInstanceName") String componentInstanceName,
-            @PathParam("objectType") String objectType, ExternalRefDTO ref, @HeaderParam("USER_ID") String userId) {
+            @PathParam("objectType") String objectType, ExternalRefDTO ref, @HeaderParam("USER_ID") String userId, @HeaderParam("X-ECOMP-InstanceID") String xEcompInstanceId) {
 
         log.debug("POST component instance external interfaces {} {} {} {} {}", assetType, uuid, componentInstanceName, objectType, ref);
 
-        Response r = authorizeAndValidateRequest(request, userId);
+        Response r = validateRequest(xEcompInstanceId);
         if (r != null){
             return r;
         }
 
-        Either<String, ActionStatus> addResult = this.businessLogic.addExternalReference(uuid, componentInstanceName, objectType, ref);
+        Either<String, ActionStatus> addResult = this.businessLogic.addExternalReference(ComponentTypeEnum.findByParamName(assetType), userId, uuid, componentInstanceName, objectType, ref);
         if (addResult.isLeft()) {
             return Response.status(Response.Status.CREATED)
                     .entity(ref)
@@ -130,21 +111,20 @@ public class ExternalRefsServlet extends AbstractValidationsServlet {
     @Path("/{assetType}/{uuid}/resourceInstances/{componentInstanceName}/externalReferences/{objectType}/{reference}")
     @Produces(MediaType.APPLICATION_JSON)
     public Response deleteComponentInstanceReference(
-            @Context final HttpServletRequest request,
             @PathParam("assetType") String assetType,
             @PathParam("uuid") String uuid,
             @PathParam("componentInstanceName") String componentInstanceName,
             @PathParam("objectType") String objectType,
-            @PathParam("reference") String reference, @HeaderParam("USER_ID") String userId) {
+            @PathParam("reference") String reference, @HeaderParam("USER_ID") String userId, @HeaderParam("X-ECOMP-InstanceID") String xEcompInstanceId) {
 
         log.debug("DELETE component instance external interfaces {} {} {} {}", assetType, uuid, componentInstanceName, objectType);
 
-        Response r = authorizeAndValidateRequest(request, userId);
+        Response r = validateRequest(xEcompInstanceId);
         if (r != null){
             return r;
         }
 
-        Either<String, ActionStatus> deleteStatus = this.businessLogic.deleteExternalReference(uuid, componentInstanceName, objectType, reference);
+        Either<String, ActionStatus> deleteStatus = this.businessLogic.deleteExternalReference(ComponentTypeEnum.findByParamName(assetType), userId, uuid, componentInstanceName, objectType, reference);
         if (deleteStatus.isLeft()){
             return this.buildOkResponse(new ExternalRefDTO(reference));
         } else {
@@ -157,23 +137,22 @@ public class ExternalRefsServlet extends AbstractValidationsServlet {
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     public Response updateComponentInstanceReference(
-            @Context final HttpServletRequest request,
             @PathParam("assetType") String assetType,
             @PathParam("uuid") String uuid,
             @PathParam("componentInstanceName") String componentInstanceName,
             @PathParam("objectType") String objectType,
             @PathParam("oldRefValue") String oldRefValue,
-            ExternalRefDTO newRefValueDTO, @HeaderParam("USER_ID") String userId) {
+            ExternalRefDTO newRefValueDTO, @HeaderParam("USER_ID") String userId, @HeaderParam("X-ECOMP-InstanceID") String xEcompInstanceId) {
 
         log.debug("PUT component instance external interfaces {} {} {} {}", assetType, uuid, componentInstanceName, objectType);
 
-        Response r = authorizeAndValidateRequest(request, userId);
+        Response r = validateRequest(xEcompInstanceId);
         if (r != null){
             return r;
         }
 
         String newRefValue = newRefValueDTO.getReferenceUUID();
-        Either<String, ActionStatus> updateResult = this.businessLogic.updateExternalReference(uuid, componentInstanceName, objectType, oldRefValue, newRefValue);
+        Either<String, ActionStatus> updateResult = this.businessLogic.updateExternalReference(ComponentTypeEnum.findByParamName(assetType), userId, uuid, componentInstanceName, objectType, oldRefValue, newRefValue);
         if (updateResult.isLeft()){
             return this.buildOkResponse(new ExternalRefDTO(newRefValue));
         } else {
@@ -182,23 +161,14 @@ public class ExternalRefsServlet extends AbstractValidationsServlet {
 
     }
 
-    private Response authorizeAndValidateRequest(final HttpServletRequest request, String userId) {
-        init(log);
-
+    private Response validateRequest(String xEcompInstanceIdHeader) {
         Wrapper<Response> responseWrapper = new Wrapper<>();
-        Wrapper<User> userWrapper = new Wrapper<>();
 
         //Validate X-ECOMP_INSTANCE_ID_HEADER
-        if (request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER) == null || request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER).isEmpty()){
+        if (xEcompInstanceIdHeader == null || xEcompInstanceIdHeader.isEmpty()){
             return this.buildExtRefErrorResponse(ActionStatus.MISSING_X_ECOMP_INSTANCE_ID, "", "", "", "", "");
         }
 
-        String method = request.getMethod();
-        if (responseWrapper.isEmpty() && !"GET".equals(method)) {
-            validateUserExist(responseWrapper, userWrapper, userId);
-            validateUserRole(responseWrapper, userWrapper.getInnerElement());
-        }
-
         return responseWrapper.getInnerElement();
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ServiceActivationServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ServiceActivationServlet.java
index e5f6dcd126..559854c9b4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ServiceActivationServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ServiceActivationServlet.java
@@ -1,47 +1,32 @@
 package org.openecomp.sdc.be.externalapi.servlet;
 
-import java.io.IOException;
-import java.util.EnumMap;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceDistributionReqInfo;
 import org.openecomp.sdc.be.externalapi.servlet.representation.ServiceDistributionRespInfo;
 import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
 import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
 import org.openecomp.sdc.be.servlets.RepresentationUtils;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
 
 /**
  * Created by chaya on 10/17/2017.
@@ -55,7 +40,7 @@ public class ServiceActivationServlet extends AbstractValidationsServlet {
     @Context
     private HttpServletRequest request;
 
-    private static final Logger log = LoggerFactory.getLogger(ServiceActivationServlet.class);
+    private static final Logger log = Logger.getLogger(ServiceActivationServlet.class);
 
     /**
      * Activates a service on a specific environment
@@ -95,23 +80,21 @@ public class ServiceActivationServlet extends AbstractValidationsServlet {
             @ApiParam(value = "The operational environment on which to activate the service on", required = true) @PathParam("opEnvId") final String opEnvId,
             String data) {
 
-        init(log);
+        init();
 
         ResponseFormat responseFormat = null;
         String requestURI = request.getRequestURI();
         String url = request.getMethod() + " " + requestURI;
-        EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, serviceUUID);
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
         log.debug("Start handle request of {}", url);
 
         ServletContext context = request.getSession().getServletContext();
+        User modifier = new User();
+
         try {
 
             Wrapper<ResponseFormat> responseWrapper = validateRequestHeaders(instanceIdHeader, userId);
 
             if (responseWrapper.isEmpty()) {
-                User modifier = new User();
                 modifier.setUserId(userId);
                 log.debug("modifier id is {}", userId);
 
@@ -139,7 +122,8 @@ public class ServiceActivationServlet extends AbstractValidationsServlet {
             responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
             return buildErrorResponse(responseFormat);
         } finally {
-            getComponentsUtils().auditExternalActivateService(responseFormat, ComponentTypeEnum.SERVICE.name(), request, additionalParams);
+            getComponentsUtils().auditExternalActivateService(responseFormat,
+                    new DistributionData(instanceIdHeader, requestURI), requestId, serviceUUID, modifier);
         }
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BasicAuthenticationFilter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BasicAuthenticationFilter.java
index a13cc51b3e..5166ef94d7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BasicAuthenticationFilter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BasicAuthenticationFilter.java
@@ -20,20 +20,9 @@
 
 package org.openecomp.sdc.be.filters;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.StringTokenizer;
-
-import javax.annotation.Priority;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
 import org.openecomp.sdc.be.components.impl.ConsumerBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -41,20 +30,35 @@ import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.model.ConsumerDefinition;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.enums.LogLevel;
+import org.openecomp.sdc.common.log.enums.Severity;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.log.wrappers.LoggerSdcAudit;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.openecomp.sdc.security.Passwords;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import fj.data.Either;
+import javax.annotation.Priority;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.Response.Status;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.StringTokenizer;
 
 @Priority(10)
 public class BasicAuthenticationFilter implements ContainerRequestFilter {
 
+	private static LoggerSdcAudit audit = new LoggerSdcAudit(BasicAuthenticationFilter.class);
+    private static final Logger log = Logger.getLogger(BasicAuthenticationFilter.class);
+    private static final String COMPONENT_UTILS_FAILED = "Authentication Filter Failed to get component utils.";
+    private static final String CONSUMER_BL_FAILED = "Authentication Filter Failed to get consumerBL.";
+
     @Context
     private HttpServletRequest sr;
 
@@ -62,150 +66,143 @@ public class BasicAuthenticationFilter implements ContainerRequestFilter {
 
     private String realm = "ASDC";
 
-    private static final Logger log = LoggerFactory.getLogger(BasicAuthenticationFilter.class);
 
     @Override
     public void filter(ContainerRequestContext requestContext) throws IOException {
 
+		audit.startLog(requestContext);
+
         String authHeader = requestContext.getHeaderString(Constants.AUTHORIZATION_HEADER);
         if (authHeader != null) {
             StringTokenizer st = new StringTokenizer(authHeader);
+            String failedToRetrieveAuthErrorMsg = "Authentication Filter Failed Couldn't retrieve authentication, no basic authentication.";
             if (st.hasMoreTokens()) {
                 String basic = st.nextToken();
 
-                if (basic.equalsIgnoreCase("Basic")) {
+                if ("Basic".equalsIgnoreCase(basic)) {
                     try {
                         String credentials = new String(Base64.decodeBase64(st.nextToken()), "UTF-8");
-                        log.debug("Credentials: {}" , credentials);
-                        checkUserCredentiles(requestContext, credentials);
+                        log.debug("Credentials: {}", credentials);
+                        checkUserCredentials(requestContext, credentials);
                     } catch (UnsupportedEncodingException e) {
                         log.error("Authentication Filter Failed Couldn't retrieve authentication", e);
                         authInvalidHeaderError(requestContext);
                     }
                 } else {
-                    log.error("Authentication Filter Failed Couldn't retrieve authentication, no basic autantication.");
+					log.error(failedToRetrieveAuthErrorMsg);
                     authInvalidHeaderError(requestContext);
                 }
             } else {
-                log.error("Authentication Filter Failed Couldn't retrieve authentication, no basic autantication.");
+				log.error(failedToRetrieveAuthErrorMsg);
                 authInvalidHeaderError(requestContext);
             }
 
         } else {
-            log.error("Authentication Filter Failed no autharization header");
+			log.error("Authentication Filter Failed no authorization header");
             authRequiredError(requestContext);
         }
     }
 
-    private void checkUserCredentiles(ContainerRequestContext requestContext, String credentials) {
-        int p = credentials.indexOf(":");
+	private void checkUserCredentials(ContainerRequestContext requestContext, String credentials) {
+        int p = credentials.indexOf(':');
         if (p != -1) {
-            String _username = credentials.substring(0, p).trim();
-            String _password = credentials.substring(p + 1).trim();
+            String userName = credentials.substring(0, p).trim();
+            String password = credentials.substring(p + 1).trim();
 
             ConsumerBusinessLogic consumerBL = getConsumerBusinessLogic();
             if (consumerBL == null) {
-                log.error("Authentication Filter Failed to get consumerBL.");
-                requestContext.abortWith(Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+				abortWith(requestContext, CONSUMER_BL_FAILED, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
             } else {
-                Either<ConsumerDefinition, ResponseFormat> result = consumerBL.getConsumer(_username);
-                validatePassword(requestContext, _username, _password, result);
+                Either<ConsumerDefinition, ResponseFormat> result = consumerBL.getConsumer(userName);
+                validatePassword(requestContext, userName, password, result);
             }
         } else {
-            log.error("Authentication Filter Failed Couldn't retrieve authentication, no basic autantication.");
+			log.error("Authentication Filter Failed Couldn't retrieve authentication, no basic authentication.");
             authInvalidHeaderError(requestContext);
 
         }
     }
 
-    private void validatePassword(ContainerRequestContext requestContext, String _username, String _password, Either<ConsumerDefinition, ResponseFormat> result) {
+    private void validatePassword(ContainerRequestContext requestContext, String userName, String password, Either<ConsumerDefinition, ResponseFormat> result) {
         if (result.isRight()) {
             Integer status = result.right().value().getStatus();
             if (status == Status.NOT_FOUND.getStatusCode()) {
                 log.error("Authentication Filter Failed Couldn't find user");
-                authUserNotFoundError(requestContext, _username);
+                authUserNotFoundError(requestContext, userName);
             } else {
-                log.error("Authentication Filter Failed to get consumerBL.");
-                requestContext.abortWith(Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+				abortWith(requestContext, CONSUMER_BL_FAILED, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
             }
         } else {
             ConsumerDefinition consumerCredentials = result.left().value();
-            if (!Passwords.isExpectedPassword(_password, consumerCredentials.getConsumerSalt(), consumerCredentials.getConsumerPassword())) {
-                log.error("Authentication Filter Failed invalide password");
-                authInvalidePasswordError(requestContext, _username);
+            if (!Passwords.isExpectedPassword(password, consumerCredentials.getConsumerSalt(), consumerCredentials.getConsumerPassword())) {
+				log.error("Authentication Filter Failed invalid password");
+				authInvalidPasswordError(requestContext, userName);
             } else {
-                authSuccesessful(requestContext, _username);
+				authSuccessful(requestContext, userName);
             }
         }
     }
 
-    private void authSuccesessful(ContainerRequestContext requestContext, String _username) {
+	private void authSuccessful(ContainerRequestContext requestContext, String userName) {
         ComponentsUtils componentUtils = getComponentsUtils();
         if (componentUtils == null) {
-            log.error("Authentication Filter Failed to get component utils.");
-            requestContext.abortWith(Response.status(Status.INTERNAL_SERVER_ERROR).build());
+			abortWith(requestContext, COMPONENT_UTILS_FAILED, Response.status(Status.INTERNAL_SERVER_ERROR).build());
         }
-        componentUtils.auditAuthEvent(requestContext.getUriInfo().getPath(), _username, AuthStatus.AUTH_SUCCESS.toString(), realm);
+        componentUtils.auditAuthEvent(requestContext.getUriInfo().getPath(), userName, AuthStatus.AUTH_SUCCESS.toString(), realm);
     }
 
-    private void authInvalidePasswordError(ContainerRequestContext requestContext, String _username) {
+	private void authInvalidPasswordError(ContainerRequestContext requestContext, String userName) {
         ComponentsUtils componentUtils = getComponentsUtils();
         if (componentUtils == null) {
-            log.error("Authentication Filter Failed to get component utils.");
-            requestContext.abortWith(Response.status(Status.INTERNAL_SERVER_ERROR).build());
+			abortWith(requestContext, COMPONENT_UTILS_FAILED, Response.status(Status.INTERNAL_SERVER_ERROR).build());
         }
-        componentUtils.auditAuthEvent(requestContext.getUriInfo().getPath(), _username, AuthStatus.AUTH_FAILED_INVALID_PASSWORD.toString(), realm);
+        componentUtils.auditAuthEvent(requestContext.getUriInfo().getPath(), userName, AuthStatus.AUTH_FAILED_INVALID_PASSWORD.toString(), realm);
         ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.AUTH_FAILED);
-        requestContext.abortWith(buildErrorResponse(responseFormat, false));
+		abortWith(requestContext, responseFormat.getFormattedMessage(), buildErrorResponse(responseFormat, false));
     }
 
-    private void authUserNotFoundError(ContainerRequestContext requestContext, String _username) {
+    private void authUserNotFoundError(ContainerRequestContext requestContext, String userName) {
         ComponentsUtils componentUtils = getComponentsUtils();
         if (componentUtils == null) {
-            log.error("Authentication Filter Failed to get component utils.");
-            requestContext.abortWith(Response.status(Status.INTERNAL_SERVER_ERROR).build());
+			abortWith(requestContext, COMPONENT_UTILS_FAILED, Response.status(Status.INTERNAL_SERVER_ERROR).build());
         }
-        getComponentsUtils().auditAuthEvent(requestContext.getUriInfo().getPath(), _username, AuthStatus.AUTH_FAILED_USER_NOT_FOUND.toString(), realm);
+        getComponentsUtils().auditAuthEvent(requestContext.getUriInfo().getPath(), userName, AuthStatus.AUTH_FAILED_USER_NOT_FOUND.toString(), realm);
         ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.AUTH_FAILED);
-        requestContext.abortWith(buildErrorResponse(responseFormat, false));
+		abortWith(requestContext, responseFormat.getFormattedMessage(), buildErrorResponse(responseFormat, false));
     }
 
     private void authInvalidHeaderError(ContainerRequestContext requestContext) {
         ComponentsUtils componentUtils = getComponentsUtils();
         if (componentUtils == null) {
-            log.error("Authentication Filter Failed to get component utils.");
-            requestContext.abortWith(Response.status(Status.INTERNAL_SERVER_ERROR).build());
+			abortWith(requestContext, COMPONENT_UTILS_FAILED, Response.status(Status.INTERNAL_SERVER_ERROR).build());
         }
         getComponentsUtils().auditAuthEvent(requestContext.getUriInfo().getPath(), "", AuthStatus.AUTH_FAILED_INVALID_AUTHENTICATION_HEADER.toString(), realm);
         ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.AUTH_FAILED_INVALIDE_HEADER);
-        requestContext.abortWith(buildErrorResponse(responseFormat, false));
+		abortWith(requestContext, responseFormat.getFormattedMessage(), buildErrorResponse(responseFormat, false));
     }
 
     private void authRequiredError(ContainerRequestContext requestContext) {
         ComponentsUtils componentUtils = getComponentsUtils();
         if (componentUtils == null) {
-            log.error("Authentication Filter Failed to get component utils.");
-            requestContext.abortWith(Response.status(Status.INTERNAL_SERVER_ERROR).build());
+			abortWith(requestContext, COMPONENT_UTILS_FAILED, Response.status(Status.INTERNAL_SERVER_ERROR).build());
         }
         getComponentsUtils().auditAuthEvent(requestContext.getUriInfo().getPath(), "", AuthStatus.AUTH_REQUIRED.toString(), realm);
         ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.AUTH_REQUIRED);
-        requestContext.abortWith(buildErrorResponse(responseFormat, true));
+		abortWith(requestContext, responseFormat.getFormattedMessage(), buildErrorResponse(responseFormat, true));
     }
 
     private ComponentsUtils getComponentsUtils() {
         ServletContext context = sr.getSession().getServletContext();
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        ComponentsUtils componentsUtils = webApplicationContext.getBean(ComponentsUtils.class);
-        return componentsUtils;
+        return webApplicationContext.getBean(ComponentsUtils.class);
     }
 
     private ConsumerBusinessLogic getConsumerBusinessLogic() {
         ServletContext context = sr.getSession().getServletContext();
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        ConsumerBusinessLogic consumerBusinessLogic = webApplicationContext.getBean(ConsumerBusinessLogic.class);
-        return consumerBusinessLogic;
+        return webApplicationContext.getBean(ConsumerBusinessLogic.class);
     }
 
     public enum AuthStatus {
@@ -217,8 +214,20 @@ public class BasicAuthenticationFilter implements ContainerRequestFilter {
         if (addWwwAuthenticationHeader) {
             responseBuilder = responseBuilder.header("WWW-Authenticate", "Basic realm=\"" + realm + "\"");
         }
-        Response response = responseBuilder.entity(gson.toJson(requestErrorWrapper.getRequestError())).build();
-        return response;
+		return responseBuilder.entity(gson.toJson(requestErrorWrapper.getRequestError())).build();
     }
 
+	private void abortWith(ContainerRequestContext requestContext, String message, Response response) {
+
+		audit.log(sr.getRemoteAddr(),
+				requestContext,
+				response.getStatusInfo(),
+				LogLevel.ERROR,
+				Severity.WARNING,
+				message);
+
+		log.error(message);
+		audit.clearMyData();
+		requestContext.abortWith(response);
+	}
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java
index 9a46514331..c60a8d6783 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/BeServletFilter.java
@@ -20,20 +20,7 @@
 
 package org.openecomp.sdc.be.filters;
 
-import java.io.IOException;
-import java.util.UUID;
-
-import javax.annotation.Priority;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
+import com.google.gson.GsonBuilder;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
@@ -42,14 +29,28 @@ import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.elements.LogFieldsMdcHandler;
+import org.openecomp.sdc.common.log.enums.LogLevel;
+import org.openecomp.sdc.common.log.enums.Severity;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.log.wrappers.LoggerSdcAudit;
 import org.openecomp.sdc.common.util.ThreadLocalsHolder;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.gson.GsonBuilder;
+import javax.annotation.Priority;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.util.UUID;
 
 @Provider
 @Priority(1)
@@ -57,8 +58,8 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
 
     @Context
     private HttpServletRequest sr;
-
-    private static final Logger log = LoggerFactory.getLogger(BeServletFilter.class);
+    private static final Logger log = Logger.getLogger(BeServletFilter.class);
+    private static LoggerSdcAudit audit = new LoggerSdcAudit(BeServletFilter.class);
 
     @Override
     public void filter(ContainerRequestContext requestContext) throws IOException {
@@ -66,6 +67,8 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
 
             MDC.clear();
 
+            audit.startLog(requestContext);
+
             // In case of 405 response code, this function is not entered, then
             // we'll process
             // the MDC fields and UUID during the response
@@ -109,28 +112,50 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
                 // we have no MDC fields since filter() wasn't executed during
                 // request
                 String uuid = processMdcFields(requestContext);
+
                 responseContext.getHeaders().add(Constants.X_ECOMP_REQUEST_ID_HEADER, uuid);
+                // call to start-log method to fill mandatory fields
+                audit.startLog(requestContext);
+            }
+
+            writeToTitan(responseContext);
+
+            //write to Audit log in case it's valuable action
+            // (e.g. ignoring healthCheck and any other unlogged urls as in yaml
+            if (isInfoLog()) {
+                audit.log(sr.getRemoteAddr(),
+                        requestContext,
+                        responseContext.getStatusInfo(),
+                        LogLevel.INFO,
+                        Severity.OK,
+                        LogFieldsMdcHandler.getInstance()
+                                .getAuditMessage());
             }
 
             outHttpResponse(responseContext);
 
-            log.debug("Close transaction from filter");
-            TitanDao titanDao = getTitanDao();
-            if ( titanDao != null ){
-                if (responseContext.getStatus() == Response.Status.OK.getStatusCode() || responseContext.getStatus() == Response.Status.CREATED.getStatusCode() ){
-                    titanDao.commit();
-                    log.debug("Doing commit from filter");
-                }else{
-                    titanDao.rollback();
-                    log.debug("Doing rollback from filter");
-                }
-            }
-            // Cleaning up
-            MDC.clear();
-            ThreadLocalsHolder.cleanup();
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Error during request filter");
             log.debug("Error during response filter: {} ", e);
+        } finally {
+            // Cleaning up
+            MDC.clear();
+            ThreadLocalsHolder.cleanup();
+        }
+    }
+
+    private void writeToTitan(ContainerResponseContext responseContext) {
+        log.debug("Close transaction from filter");
+        TitanDao titanDao = getTitanDao();
+        if (titanDao != null) {
+            if (responseContext.getStatus() == Response.Status.OK.getStatusCode() ||
+                    responseContext.getStatus() == Response.Status.CREATED.getStatusCode()) {
+                titanDao.commit();
+                log.debug("Doing commit from filter");
+            } else {
+                titanDao.rollback();
+                log.debug("Doing rollback from filter");
+            }
         }
     }
 
@@ -174,6 +199,7 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
         return webApplicationContext.getBean(ComponentsUtils.class);
     }
+
     private TitanDao getTitanDao() {
         ServletContext context = this.sr.getSession().getServletContext();
 
@@ -181,6 +207,7 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
         return webApplicationContext.getBean(TitanDao.class);
     }
+
     // Extracted for purpose of clear method name, for logback %M parameter
     private void inHttpRequest() {
         if (isInfoLog()) {
@@ -206,7 +233,6 @@ public class BeServletFilter implements ContainerRequestFilter, ContainerRespons
         if (requestURI != null && configuration.getUnLoggedUrls() != null) {
             logRequest = !configuration.getUnLoggedUrls().contains(requestURI);
         }
-
         return logRequest;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ComponentsAvailabilityFilter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ComponentsAvailabilityFilter.java
index c94915467c..31ba52749a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ComponentsAvailabilityFilter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/filters/ComponentsAvailabilityFilter.java
@@ -20,20 +20,8 @@
 
 package org.openecomp.sdc.be.filters;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Priority;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.openecomp.sdc.be.components.health.HealthCheckBusinessLogic;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
@@ -41,27 +29,43 @@ import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.api.HealthCheckInfo;
 import org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus;
+import org.openecomp.sdc.common.log.enums.LogLevel;
+import org.openecomp.sdc.common.log.enums.Severity;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.log.wrappers.LoggerSdcAudit;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import javax.annotation.Priority;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.Response.Status;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Priority(11)
 public class ComponentsAvailabilityFilter implements ContainerRequestFilter {
 
+	private static LoggerSdcAudit audit = new LoggerSdcAudit(ComponentsAvailabilityFilter.class);
+
     @Context
     protected HttpServletRequest sr;
     protected Gson gson = new GsonBuilder().setPrettyPrinting().create();
-    private static final Logger log = LoggerFactory.getLogger(ComponentsAvailabilityFilter.class);
+    private static final Logger log = Logger.getLogger(ComponentsAvailabilityFilter.class);
 
     @Override
     public void filter(ContainerRequestContext requestContext) throws IOException {
 
+		audit.startLog(requestContext);
+
         String requestUrl = requestContext.getUriInfo().getPath();
-        if (!requestUrl.equals("healthCheck")) {
+        if (!"healthCheck".equals(requestUrl)) {
             List<HealthCheckInfo> beHealthCheckInfos = getBeHealthCheckInfos(this.sr.getSession().getServletContext());
             ActionStatus status = getAggregateBeStatus(beHealthCheckInfos);
 
@@ -86,7 +90,7 @@ public class ComponentsAvailabilityFilter implements ContainerRequestFilter {
 
     protected List<HealthCheckInfo> getBeHealthCheckInfos(ServletContext servletContext) {
 
-        List<HealthCheckInfo> healthCheckInfos = new ArrayList<HealthCheckInfo>();
+        List<HealthCheckInfo> healthCheckInfos = new ArrayList<>();
         HealthCheckBusinessLogic healthCheckBusinessLogic = getHealthCheckBL(servletContext);
         healthCheckBusinessLogic.getTitanHealthCheck(healthCheckInfos); // Titan
         return healthCheckInfos;
@@ -96,27 +100,39 @@ public class ComponentsAvailabilityFilter implements ContainerRequestFilter {
         ServletContext context = sr.getSession().getServletContext();
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        ComponentsUtils componentsUtils = webApplicationContext.getBean(ComponentsUtils.class);
-        return componentsUtils;
+        return webApplicationContext.getBean(ComponentsUtils.class);
     }
 
     protected void availabilityError(ContainerRequestContext requestContext) {
         ComponentsUtils componentUtils = getComponentsUtils();
         if (componentUtils == null) {
-            log.error("Components Availability Filter Failed to get component utils.");
-            requestContext.abortWith(Response.status(Status.INTERNAL_SERVER_ERROR).build());
+			String message = "Components Availability Filter Failed to get component utils.";
+			abortWith(requestContext, message, Response.status(Status.INTERNAL_SERVER_ERROR).build());
         }
         ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
         ResponseBuilder responseBuilder = Response.status(responseFormat.getStatus());
         Response response = responseBuilder.entity(gson.toJson(responseFormat.getRequestError())).build();
-        requestContext.abortWith(response);
+		abortWith(requestContext, responseFormat.getRequestError().toString(), response);
     }
 
     private HealthCheckBusinessLogic getHealthCheckBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        HealthCheckBusinessLogic healthCheckBl = webApplicationContext.getBean(HealthCheckBusinessLogic.class);
-        return healthCheckBl;
+        return webApplicationContext.getBean(HealthCheckBusinessLogic.class);
     }
 
+
+	private void abortWith(ContainerRequestContext requestContext, String message, Response response) {
+
+		audit.log(sr.getRemoteAddr(),
+				requestContext,
+				response.getStatusInfo(),
+				LogLevel.ERROR,
+				Severity.OK,
+				message);
+
+		log.error(message);
+		audit.clearMyData();
+		requestContext.abortWith(response);
+	}
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java
index 41681a7c4f..909d4da994 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java
@@ -20,26 +20,28 @@
 
 package org.openecomp.sdc.be.impl;
 
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import fj.data.Either;
 import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.auditing.api.AuditEventFactory;
-import org.openecomp.sdc.be.auditing.impl.AuditAuthRequestEventFactory;
-import org.openecomp.sdc.be.auditing.impl.AuditBaseEventFactory;
-import org.openecomp.sdc.be.auditing.impl.AuditConsumerEventFactory;
-import org.openecomp.sdc.be.auditing.impl.AuditEcompOpEnvEventFactory;
-import org.openecomp.sdc.be.auditing.impl.AuditResourceEventFactoryMananger;
-import org.openecomp.sdc.be.auditing.impl.AuditingManager;
-import org.openecomp.sdc.be.auditing.impl.distribution.AuditDistribDownloadEventFactory;
+import org.openecomp.sdc.be.auditing.impl.*;
+import org.openecomp.sdc.be.auditing.impl.category.AuditCategoryEventFactory;
+import org.openecomp.sdc.be.auditing.impl.category.AuditGetCategoryHierarchyEventFactory;
+import org.openecomp.sdc.be.auditing.impl.distribution.*;
+import org.openecomp.sdc.be.auditing.impl.externalapi.*;
+import org.openecomp.sdc.be.auditing.impl.resourceadmin.AuditResourceEventFactoryManager;
+import org.openecomp.sdc.be.auditing.impl.usersadmin.AuditGetUsersListEventFactory;
 import org.openecomp.sdc.be.auditing.impl.usersadmin.AuditUserAccessEventFactory;
 import org.openecomp.sdc.be.auditing.impl.usersadmin.AuditUserAdminEventFactory;
+import org.openecomp.sdc.be.components.impl.ImportUtils;
 import org.openecomp.sdc.be.components.impl.ImportUtils.ResultStatusEnum;
 import org.openecomp.sdc.be.components.impl.ResponseFormatManager;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
@@ -48,45 +50,33 @@ import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
-import org.openecomp.sdc.be.model.CapabilityTypeDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ConsumerDefinition;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.GroupTypeDefinition;
-import org.openecomp.sdc.be.model.PolicyTypeDefinition;
-import org.openecomp.sdc.be.model.PropertyConstraint;
-import org.openecomp.sdc.be.model.RequirementDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintDeserialiser;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintJacksonDeserializer;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
-import org.openecomp.sdc.be.resources.data.auditing.model.CommonAuditData;
-import org.openecomp.sdc.be.resources.data.auditing.model.DistributionData;
-import org.openecomp.sdc.be.resources.data.auditing.model.ResourceAuditData;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingTypesConstants;
+import org.openecomp.sdc.be.resources.data.auditing.model.*;
 import org.openecomp.sdc.be.tosca.ToscaError;
 import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ThreadLocalsHolder;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
 
-import fj.data.Either;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.List;
 
 @org.springframework.stereotype.Component("componentUtils")
 public class ComponentsUtils {
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentsUtils.class);
+    private static final String CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE = "convert storage response {} to action response {}";
+	private static final String INSIDE_AUDITING_FOR_AUDIT_ACTION = "Inside auditing for audit action {}";
+	private static final String AUDIT_BEFORE_SENDING_RESPONSE = "audit before sending response";
+	private static final String CONVERT_JSON_TO_OBJECT = "convertJsonToObject";
+	private static final Logger log = Logger.getLogger(ComponentsUtils.class);
     private final AuditingManager auditingManager;
     private final ResponseFormatManager responseFormatManager;
 
@@ -101,7 +91,7 @@ public class ComponentsUtils {
 
     public <T> Either<T, ResponseFormat> convertJsonToObject(String data, User user, Class<T> clazz, AuditingActionEnum actionEnum) {
         if (data == null) {
-            BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
+            BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CONVERT_JSON_TO_OBJECT);
             log.debug("object is null after converting from json");
             ResponseFormat responseFormat = getInvalidContentErrorAndAudit(user, actionEnum);
             return Either.right(responseFormat);
@@ -111,7 +101,7 @@ public class ComponentsUtils {
             return Either.left(obj);
         } catch (Exception e) {
             // INVALID JSON
-            BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
+            BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CONVERT_JSON_TO_OBJECT);
             log.debug("failed to convert from json {}", data, e);
             ResponseFormat responseFormat = getInvalidContentErrorAndAudit(user, actionEnum);
             return Either.right(responseFormat);
@@ -138,13 +128,13 @@ public class ComponentsUtils {
 
             component = mapper.readValue(data, clazz);
             if (component == null) {
-                BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
+                BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CONVERT_JSON_TO_OBJECT);
                 log.debug("object is null after converting from json");
                 ResponseFormat responseFormat = getInvalidContentErrorAndAuditComponent(user, actionEnum, typeEnum);
                 return Either.right(responseFormat);
             }
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
+            BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CONVERT_JSON_TO_OBJECT);
             log.debug("failed to convert from json {}", data, e);
             ResponseFormat responseFormat = getInvalidContentErrorAndAuditComponent(user, actionEnum, typeEnum);
             return Either.right(responseFormat);
@@ -155,7 +145,7 @@ public class ComponentsUtils {
     public ResponseFormat getResponseFormat(ActionStatus actionStatus, String... params) {
         return responseFormatManager.getResponseFormat(actionStatus, params);
     }
-
+   
     public ResponseFormat getResponseFormat(StorageOperationStatus storageStatus, String... params) {
         return responseFormatManager.getResponseFormat(this.convertFromStorageResponse(storageStatus), params);
     }
@@ -205,15 +195,13 @@ public class ComponentsUtils {
         if (resourceName == null) {
             return getResponseFormat(actionStatus);
         }
-        ResponseFormat responseFormat;
 
-        switch (actionStatus) {
-            case RESOURCE_NOT_FOUND:
-                responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceName);
-                break;
-            default:
-                responseFormat = getResponseFormat(actionStatus);
-                break;
+        ResponseFormat responseFormat;
+        if (actionStatus == ActionStatus.RESOURCE_NOT_FOUND) {
+            responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceName);
+        }
+        else {
+            responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
     }
@@ -222,15 +210,13 @@ public class ComponentsUtils {
         if (capabilityType == null) {
             return getResponseFormat(actionStatus);
         }
-        ResponseFormat responseFormat;
 
-        switch (actionStatus) {
-            case CAPABILITY_TYPE_ALREADY_EXIST:
-                responseFormat = getResponseFormat(ActionStatus.CAPABILITY_TYPE_ALREADY_EXIST, capabilityType.getType());
-                break;
-            default:
-                responseFormat = getResponseFormat(actionStatus);
-                break;
+        ResponseFormat responseFormat;
+        if (actionStatus == ActionStatus.CAPABILITY_TYPE_ALREADY_EXIST) {
+            responseFormat = getResponseFormat(ActionStatus.CAPABILITY_TYPE_ALREADY_EXIST, capabilityType.getType());
+        }
+        else {
+            responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
     }
@@ -239,22 +225,21 @@ public class ComponentsUtils {
         if (obj == null) {
             return getResponseFormat(actionStatus);
         }
-        ResponseFormat responseFormat = null;
 
-        switch (actionStatus) {
-            case MISSING_CAPABILITY_TYPE:
-                if (obj instanceof List && org.apache.commons.collections.CollectionUtils.isNotEmpty((List) obj)) {
-                    List list = (List) obj;
-                    if (list.get(0) instanceof RequirementDefinition) {
-                        responseFormat = getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE, ((RequirementDefinition) list.get(0)).getName());    //Arbitray index, all we need is single object
-                        return responseFormat;
-                    }
+        ResponseFormat responseFormat = null;
+        if (actionStatus == ActionStatus.MISSING_CAPABILITY_TYPE) {
+            if (obj instanceof List && org.apache.commons.collections.CollectionUtils.isNotEmpty((List) obj)) {
+                List list = (List) obj;
+                if (list.get(0) instanceof RequirementDefinition) {
+                    responseFormat = getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE, ((RequirementDefinition) list
+                            .get(0)).getName());    //Arbitray index, all we need is single object
+                    return responseFormat;
                 }
-                log.debug("UNKNOWN TYPE : expecting obj as a non empty List<RequirmentsDefinitions>");
-                break;
-            default:
-                responseFormat = getResponseFormat(actionStatus);
-                break;
+            }
+            log.debug("UNKNOWN TYPE : expecting obj as a non empty List<RequirmentsDefinitions>");
+        }
+        else {
+            responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
     }
@@ -301,7 +286,7 @@ public class ComponentsUtils {
         return getResponseFormatByUser(actionStatus, user);
     }
 
-    public ResponseFormat getResponseFormatByDE(ActionStatus actionStatus, String serviceId, String envName) {
+    public ResponseFormat getResponseFormatByDE(ActionStatus actionStatus, String envName) {
         ResponseFormat responseFormat;
 
         switch (actionStatus) {
@@ -311,9 +296,6 @@ public class ComponentsUtils {
             case DISTRIBUTION_ENVIRONMENT_NOT_FOUND:
                 responseFormat = getResponseFormat(ActionStatus.DISTRIBUTION_ENVIRONMENT_NOT_FOUND, envName);
                 break;
-            case DISTRIBUTION_ARTIFACT_NOT_FOUND:
-                responseFormat = getResponseFormat(ActionStatus.DISTRIBUTION_ARTIFACT_NOT_FOUND, serviceId);
-                break;
             default:
                 responseFormat = getResponseFormat(actionStatus);
                 break;
@@ -338,26 +320,33 @@ public class ComponentsUtils {
 
     public ResponseFormat getInvalidContentErrorAndAudit(User user, String resourceName, AuditingActionEnum actionEnum) {
         ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
-        log.debug("audit before sending response");
+        log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
         auditResource(responseFormat, user, resourceName, actionEnum);
         return responseFormat;
     }
 
+    public ResponseFormat getInvalidContentErrorForConsumerAndAudit(User user, ConsumerDefinition consumer, AuditingActionEnum actionEnum) {
+        ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
+        log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
+        auditConsumerCredentialsEvent(actionEnum, consumer, responseFormat, user);
+        return responseFormat;
+    }
+
     public ResponseFormat getInvalidContentErrorAndAudit(User user, AuditingActionEnum actionEnum) {
         ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
-        log.debug("audit before sending response");
+        log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
         auditAdminUserAction(actionEnum, user, null, null, responseFormat);
         return responseFormat;
     }
 
     public ResponseFormat getInvalidContentErrorAndAuditComponent(User user, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum) {
         ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
-        log.debug("audit before sending response");
+        log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
         auditComponentAdmin(responseFormat, user, null,  actionEnum, typeEnum);
         return responseFormat;
     }
 
-    public void auditResource(ResponseFormat responseFormat, User modifier, Resource resource, AuditingActionEnum actionEnum, ResourceAuditData prevResFields) {
+    public void auditResource(ResponseFormat responseFormat, User modifier, Resource resource, AuditingActionEnum actionEnum, ResourceVersionInfo prevResFields) {
         auditResource(responseFormat, modifier, resource, resource.getName(), actionEnum, prevResFields, null, null);
     }
 
@@ -370,14 +359,14 @@ public class ComponentsUtils {
     }
 
     public void auditResource(ResponseFormat responseFormat, User modifier, Resource resource, String resourceName, AuditingActionEnum actionEnum) {
-        auditResource(responseFormat, modifier, resource, resourceName, actionEnum, ResourceAuditData.newBuilder().build(), null, null);
+        auditResource(responseFormat, modifier, resource, resourceName, actionEnum, ResourceVersionInfo.newBuilder().build(), null, null);
     }
 
     public void auditResource(ResponseFormat responseFormat, User modifier, Resource resource, String resourceName, AuditingActionEnum actionEnum,
-                              ResourceAuditData prevResFields, String currentArtifactUuid, String artifactData) {
+                              ResourceVersionInfo prevResFields, String currentArtifactUuid, ArtifactDefinition artifactDefinition) {
         if (actionEnum != null) {
             int status = responseFormat.getStatus();
-            String message = "";
+
             String uuid = null;
             String resourceCurrVersion = null;
             String resourceCurrState = null;
@@ -385,12 +374,11 @@ public class ComponentsUtils {
             String resourceType = ComponentTypeEnum.RESOURCE.getValue();
             String toscaNodeType = null;
 
-            log.trace("Inside auditing for audit action {}", actionEnum);
+            log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
 
-            if (responseFormat.getMessageId() != null) {
-                message = responseFormat.getMessageId() + ": ";
-            }
-            message += responseFormat.getFormattedMessage();
+            String message = getMessageString(responseFormat);
+
+            String artifactData = buildAuditingArtifactData(artifactDefinition);
 
             if (resource != null) {
                 resourceName = resource.getName();
@@ -406,7 +394,7 @@ public class ComponentsUtils {
                 toscaNodeType = resource.getToscaResourceName();
             }
 
-            AuditBaseEventFactory factory = AuditResourceEventFactoryMananger.createResourceEventFactory(
+            AuditEventFactory factory = AuditResourceEventFactoryManager.createResourceEventFactory(
                     actionEnum,
                     CommonAuditData.newBuilder()
                             .status(status)
@@ -414,149 +402,279 @@ public class ComponentsUtils {
                             .requestId(ThreadLocalsHolder.getUuid())
                             .serviceInstanceId(uuid)
                             .build(),
+                    new ResourceCommonInfo(resourceName, resourceType),
                     prevResFields,
-                    ResourceAuditData.newBuilder()
+                    ResourceVersionInfo.newBuilder()
                             .artifactUuid(currentArtifactUuid)
                             .state(resourceCurrState)
                             .version(resourceCurrVersion)
                             .build(),
-                    resourceType, resourceName, invariantUUID,
-                    modifier, artifactData, null, null, toscaNodeType);
+                    invariantUUID,
+                    modifier,
+                    artifactData, null, null, toscaNodeType);
 
             getAuditingManager().auditEvent(factory);
         }
     }
 
-    private void updateUserFields(User modifier, EnumMap<AuditingFieldsKeysEnum, Object> auditingFields) {
-        if (modifier != null) {
-            String firstName = modifier.getFirstName();
-            String lastName = modifier.getLastName();
-            if (firstName != null || lastName != null) {// to prevent "null
-                // null" names
-                auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, firstName + " " + lastName);
-            }
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId());
+    private String getMessageString(ResponseFormat responseFormat) {
+        String message = "";
+        if (responseFormat.getMessageId() != null) {
+            message = responseFormat.getMessageId() + ": ";
         }
+        message += responseFormat.getFormattedMessage();
+        return message;
     }
 
     public void auditDistributionDownload(ResponseFormat responseFormat, DistributionData distributionData) {
         log.trace("Inside auditing");
         int status = responseFormat.getStatus();
-        String message = "";
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
-        }
-        message += responseFormat.getFormattedMessage();
 
-        getAuditingManager().auditEvent(auditingFields);
-        AuditDistribDownloadEventFactory factory = new AuditDistribDownloadEventFactory(
+        String message = getMessageString(responseFormat);
+
+        AuditDistributionDownloadEventFactory factory = new AuditDistributionDownloadEventFactory(
                 CommonAuditData.newBuilder()
                         .status(status)
                         .description(message)
                         .requestId(ThreadLocalsHolder.getUuid())
                         .build(),
                         distributionData);
+                getAuditingManager().auditEvent(factory);
+    }
+
+    public void auditExternalGetAsset(ResponseFormat responseFormat, AuditingActionEnum actionEnum, DistributionData distributionData,
+                                      ResourceCommonInfo resourceCommonInfo, String requestId, String serviceInstanceId) {
+        log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
+
+        AuditEventFactory factory = new AuditAssetExternalApiEventFactory(actionEnum,
+                CommonAuditData.newBuilder()
+                        .status(responseFormat.getStatus())
+                        .description(getMessageString(responseFormat))
+                        .requestId(requestId)
+                        .serviceInstanceId(serviceInstanceId)
+                        .build(),
+                resourceCommonInfo, distributionData);
+
         getAuditingManager().auditEvent(factory);
     }
 
-    public void auditExternalGetAsset(ResponseFormat responseFormat, AuditingActionEnum actionEnum, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        log.trace("Inside auditing for audit action {}", actionEnum);
-        int status = responseFormat.getStatus();
-        String message = "";
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
+    public void auditExternalGetAssetList(ResponseFormat responseFormat, AuditingActionEnum actionEnum, DistributionData distributionData, String requestId) {
+        log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
+
+        AuditEventFactory factory = new AuditAssetListExternalApiEventFactory(actionEnum,
+                CommonAuditData.newBuilder()
+                        .status(responseFormat.getStatus())
+                        .description(getMessageString(responseFormat))
+                        .requestId(requestId)
+                         .build(),
+                distributionData);
+
+        getAuditingManager().auditEvent(factory);
+    }
+
+    public void auditChangeLifecycleAction(ResponseFormat responseFormat, ComponentTypeEnum componentType, String requestId,
+                                           Component component, Component responseObject, DistributionData distributionData, User modifier) {
+
+        String invariantUuid = "";
+        String serviceInstanceId = "";
+        ResourceVersionInfo currResourceVersionInfo = null;
+        ResourceVersionInfo prevResourceVersionInfo = null;
+        ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentType.getValue());
+
+        if (component != null) {
+            prevResourceVersionInfo = buildResourceVersionInfoFromComponent(component);
+            resourceCommonInfo.setResourceName(component.getName());
         }
-        message += responseFormat.getFormattedMessage();
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, message);
 
-        if (additionalParams != null) {
-            auditingFields.putAll(additionalParams);
+        if (responseObject != null){
+            currResourceVersionInfo = buildResourceVersionInfoFromComponent(responseObject);
+            invariantUuid = responseObject.getInvariantUUID();
+            serviceInstanceId = responseObject.getUUID();
+        }
+        else if (component != null){
+            currResourceVersionInfo = buildResourceVersionInfoFromComponent(component);
+            invariantUuid = component.getInvariantUUID();
+            serviceInstanceId = component.getUUID();
         }
 
-        getAuditingManager().auditEvent(auditingFields);
+        if (prevResourceVersionInfo == null) {
+            prevResourceVersionInfo = ResourceVersionInfo.newBuilder()
+                    .build();
+        }
+        if (currResourceVersionInfo == null) {
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
+                    .build();
+        }
+        AuditEventFactory factory = new AuditChangeLifecycleExternalApiEventFactory(
+                CommonAuditData.newBuilder()
+                    .serviceInstanceId(serviceInstanceId)
+                    .requestId(requestId)
+                    .description(getMessageString(responseFormat))
+                    .status(responseFormat.getStatus())
+                    .build(),
+                resourceCommonInfo, distributionData,
+                prevResourceVersionInfo, currResourceVersionInfo,
+                invariantUuid, modifier);
+
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditExternalCrudApi(ResponseFormat responseFormat, String componentType, String actionEnum, HttpServletRequest request, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        log.trace("Inside auditing for audit action {}", actionEnum);
-        String instanceIdHeader = request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER);
-        String requestURI = request.getRequestURI();
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        int status = 0;
-        String message = "";
-        if (responseFormat != null) {
-            status = responseFormat.getStatus();
-            if (responseFormat.getMessageId() != null) {
-                message = responseFormat.getMessageId() + ": ";
-            }
-            message += responseFormat.getFormattedMessage();
+    private ResourceVersionInfo buildResourceVersionInfoFromComponent(Component component) {
+        return ResourceVersionInfo.newBuilder()
+                .version(component.getVersion())
+                .state(component.getLifecycleState().name())
+                .build();
+    }
+
+    public void auditExternalCrudApi(ResponseFormat responseFormat, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, HttpServletRequest request,
+                                     ArtifactDefinition artifactDefinition, String artifactUuid) {
+        log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
+
+        ResourceVersionInfo currResourceVersionInfo;
+        User modifier = new User();
+        modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
+        String artifactData = "";
+        DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
+        String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);
+
+
+        if (artifactDefinition == null) {
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
+                    .artifactUuid(artifactUuid)
+                    .build();
         }
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, requestURI);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, componentType);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, message);
-
-        if (additionalParams != null) {
-            auditingFields.putAll(additionalParams);
-            if (!additionalParams.containsKey(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME)) {
-                auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, "");
-            }
+        else {
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
+                    .artifactUuid(artifactDefinition.getArtifactUUID())
+                    .version(artifactDefinition.getArtifactVersion())
+                    .build();
+            artifactData = buildAuditingArtifactData(artifactDefinition);
+            modifier.setUserId(artifactDefinition.getUserIdLastUpdater());
         }
+        AuditEventFactory factory = new AuditCrudExternalApiArtifactEventFactory(actionEnum,
+                CommonAuditData.newBuilder()
+                    .status(responseFormat.getStatus())
+                    .description(getMessageString(responseFormat))
+                    .requestId(requestId)
+                    .build(),
+                resourceCommonInfo, distributionData, ResourceVersionInfo.newBuilder().build(), currResourceVersionInfo,
+                null, modifier, artifactData);
 
-        getAuditingManager().auditEvent(auditingFields);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditExternalActivateService(ResponseFormat responseFormat, String componentType, HttpServletRequest request, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        auditExternalCrudApi(responseFormat, componentType, AuditingActionEnum.ACTIVATE_SERVICE_BY_API.getName(), request, additionalParams);
-    }public void auditExternalDownloadArtifact(ResponseFormat responseFormat, String componentType, HttpServletRequest request, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        auditExternalCrudApi(responseFormat, componentType, AuditingActionEnum.DOWNLOAD_ARTIFACT.getName(), request, additionalParams);
+    public boolean isExternalApiEvent(AuditingActionEnum auditingActionEnum){
+        return auditingActionEnum != null && auditingActionEnum.getAuditingEsType().equals(AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE);
     }
 
-    public void auditExternalUploadArtifact(ResponseFormat responseFormat, String componentType, HttpServletRequest request, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, request.getHeader(Constants.USER_ID_HEADER));
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID, "");
-        auditExternalCrudApi(responseFormat, componentType, AuditingActionEnum.ARTIFACT_UPLOAD_BY_API.getName(), request, additionalParams);
-    }
+    public void auditCreateResourceExternalApi(ResponseFormat responseFormat, ResourceCommonInfo resourceCommonInfo, HttpServletRequest request,
+                                               Resource resource) {
+
+        String invariantUuid = null;
+        String serviceInstanceId = null;
+
+        User modifier = new User();
+        modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
+        DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
+        String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);
+
+        ResourceVersionInfo currResourceVersionInfo;
+
+        if( resource != null ){
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
+                    .state(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name())
+                    .version(ImportUtils.Constants.FIRST_NON_CERTIFIED_VERSION)
+                    .build();
+            resourceCommonInfo.setResourceName(resource.getName());
+            invariantUuid = resource.getInvariantUUID();
+            serviceInstanceId = resource.getUUID();
+        }
+        else {
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
+                    .build();
+        }
+
+        AuditEventFactory factory = new AuditCreateResourceExternalApiEventFactory(
+                CommonAuditData.newBuilder()
+                        .status(responseFormat.getStatus())
+                        .description(getMessageString(responseFormat))
+                        .requestId(requestId)
+                        .serviceInstanceId(serviceInstanceId)
+                        .build(),
+                resourceCommonInfo, distributionData,
+                currResourceVersionInfo, invariantUuid, modifier);
 
-    public void auditExternalUpdateArtifact(ResponseFormat responseFormat, String componentType, HttpServletRequest request, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, request.getHeader(Constants.USER_ID_HEADER));
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID, "");
-        auditExternalCrudApi(responseFormat, componentType, AuditingActionEnum.ARTIFACT_UPDATE_BY_API.getName(), request, additionalParams);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditExternalDeleteArtifact(ResponseFormat responseFormat, String componentType, HttpServletRequest request, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, request.getHeader(Constants.USER_ID_HEADER));
-        additionalParams.put(AuditingFieldsKeysEnum.AUDIT_PREV_ARTIFACT_UUID, "");
-        auditExternalCrudApi(responseFormat, componentType, AuditingActionEnum.ARTIFACT_DELETE_BY_API.getName(), request, additionalParams);
+    public void auditExternalActivateService(ResponseFormat responseFormat, DistributionData distributionData, String requestId, String serviceInstanceUuid, User modifier) {
+        AuditEventFactory factory = new AuditActivateServiceExternalApiEventFactory(
+                CommonAuditData.newBuilder()
+                    .serviceInstanceId(serviceInstanceUuid)
+                    .description(getMessageString(responseFormat))
+                    .status(responseFormat.getStatus())
+                    .requestId(requestId)
+                    .build(),
+                new ResourceCommonInfo(ComponentTypeEnum.SERVICE.name()), distributionData, "", modifier);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditCategory(ResponseFormat responseFormat, User modifier, String categoryName, String subCategoryName, String groupingName, AuditingActionEnum actionEnum, String componentType) {
-        log.trace("Inside auditing for audit action {}", actionEnum);
-        int status = responseFormat.getStatus();
-        String message = "";
+    public void auditExternalDownloadArtifact(ResponseFormat responseFormat, ResourceCommonInfo resourceCommonInfo,
+                                              DistributionData distributionData, String requestId, String currArtifactUuid, String userId) {
+        User modifier = new User();
+        modifier.setUserId(userId);
 
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
+        AuditEventFactory factory = new AuditDownloadArtifactExternalApiEventFactory(
+                CommonAuditData.newBuilder()
+                        .description(getMessageString(responseFormat))
+                        .status(responseFormat.getStatus())
+                        .requestId(requestId)
+                        .build(),
+                resourceCommonInfo, distributionData,
+                ResourceVersionInfo.newBuilder()
+                        .artifactUuid(currArtifactUuid)
+                        .build(),
+                modifier);
+        getAuditingManager().auditEvent(factory);
+    }
+
+    private String buildAuditingArtifactData(ArtifactDefinition artifactDefinition) {
+        StringBuilder sb = new StringBuilder();
+        if (artifactDefinition != null) {
+            sb.append(artifactDefinition.getArtifactGroupType().getType())
+                    .append(",")
+                    .append("'")
+                    .append(artifactDefinition.getArtifactLabel())
+                    .append("'")
+                    .append(",")
+                    .append(artifactDefinition.getArtifactType())
+                    .append(",")
+                    .append(artifactDefinition.getArtifactName())
+                    .append(",")
+                    .append(artifactDefinition.getTimeout())
+                    .append(",")
+                    .append(artifactDefinition.getEsId());
+
+            sb.append(",");
+            sb.append(artifactDefinition.getArtifactVersion() != null ? artifactDefinition.getArtifactVersion() : " ");
+            sb.append(",");
+            sb.append(artifactDefinition.getArtifactUUID() != null ? artifactDefinition.getArtifactUUID() : " ");
         }
-        message += responseFormat.getFormattedMessage();
+        return sb.toString();
+    }
 
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        updateUserFields(modifier, auditingFields);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, componentType);
+    public void auditCategory(ResponseFormat responseFormat, User modifier, String categoryName, String subCategoryName, String groupingName, AuditingActionEnum actionEnum, String componentType) {
+        log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
 
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, message);
+        AuditEventFactory factory = new AuditCategoryEventFactory(actionEnum,
+                CommonAuditData.newBuilder()
+                        .description(getMessageString(responseFormat))
+                        .status(responseFormat.getStatus())
+                        .requestId(ThreadLocalsHolder.getUuid())
+                        .build(),
+                modifier, categoryName, subCategoryName, groupingName, componentType);
 
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_CATEGORY_NAME, categoryName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SUB_CATEGORY_NAME, subCategoryName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_GROUPING_NAME, groupingName);
-        getAuditingManager().auditEvent(auditingFields);
+        getAuditingManager().auditEvent(factory);
     }
 
     public ActionStatus convertFromStorageResponse(StorageOperationStatus storageResponse) {
@@ -614,9 +732,6 @@ public class ComponentsUtils {
         case DISTR_ENVIRONMENT_SENT_IS_INVALID:
             responseEnum = ActionStatus.DISTRIBUTION_ENVIRONMENT_INVALID;
             break;
-        case DISTR_ARTIFACT_NOT_FOUND:
-            responseEnum = ActionStatus.DISTRIBUTION_ARTIFACT_NOT_FOUND;
-            break;
         case INVALID_TYPE:
             responseEnum = ActionStatus.INVALID_CONTENT;
             break;
@@ -638,11 +753,14 @@ public class ComponentsUtils {
         case INVALID_PROPERTY:
             responseEnum = ActionStatus.INVALID_PROPERTY;
             break;
-        default:
+        case COMPONENT_IS_ARCHIVED:
+            responseEnum = ActionStatus.COMPONENT_IS_ARCHIVED;
+            break;
+       default:
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -688,7 +806,7 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -716,7 +834,7 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -756,7 +874,7 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -812,36 +930,41 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum type, ResourceAuditData prevComponent, String comment) {
-        auditComponent(responseFormat, modifier, component, actionEnum, type, prevComponent, null, null, comment, null, null);
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, String comment) {
+        auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, null, comment, null, null);
     }
 
-    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum type) {
-        auditComponent(responseFormat, modifier, component, actionEnum, type, ResourceAuditData.newBuilder().build());
+    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum) {
+        auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()), ResourceVersionInfo.newBuilder().build());
     }
 
-    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum type, ResourceAuditData prevComponent) {
-        auditComponent(responseFormat, modifier, component, actionEnum, type, prevComponent);
+    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum, String comment) {
+        auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()), ResourceVersionInfo.newBuilder().build(), null,
+                comment, null, null);
     }
 
-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum type, ResourceAuditData prevComponent) {
-        auditComponent(responseFormat, modifier, component, actionEnum, type, prevComponent, null, null, null, null, null);
+    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum, ResourceVersionInfo prevComponent) {
+        auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()), prevComponent);
     }
 
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent) {
+        auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, null, null, null, null);
+    }
 
-    public void auditComponent(ResponseFormat responseFormat, User modifier, AuditingActionEnum actionEnum, String compName, ComponentTypeEnum type, String comment) {
-        auditComponent(responseFormat, modifier, null, actionEnum, type, ResourceAuditData.newBuilder().build(), null, compName, comment, null, null);
+    public void auditComponent(ResponseFormat responseFormat, User modifier, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, String comment) {
+        auditComponent(responseFormat, modifier, null, actionEnum, resourceCommonInfo, ResourceVersionInfo.newBuilder().build(), null, comment, null, null);
     }
 
-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum type, ResourceAuditData prevComponent, ResourceAuditData currComponent) {
-        auditComponent(responseFormat, modifier, component, actionEnum, type, prevComponent, currComponent, null, null, null, null);
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, ResourceVersionInfo currComponent) {
+        auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, currComponent, null, null, null);
     }
 
-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum type, ResourceAuditData prevComponent, ResourceAuditData currComponent, String compName, String comment, String artifactData, String did) {
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, ResourceVersionInfo currComponent,
+                               String comment, ArtifactDefinition artifactDefinition, String did) {
         if (actionEnum != null) {
             String uuid = null;
             String currState = null;
@@ -849,17 +972,12 @@ public class ComponentsUtils {
             String currArtifactUid = null;
             String currVersion = null;
             String dcurrStatus = null;
-            String message = "";
-
-            int status = responseFormat.getStatus();
-
-            log.trace("Inside auditing for audit action {}", actionEnum);
 
-            if (responseFormat.getMessageId() != null) {
-                message = responseFormat.getMessageId() + ": ";
-            }
-            message += responseFormat.getFormattedMessage();
+            log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
 
+            String message = getMessageString(responseFormat);
+            int status = responseFormat.getStatus();
+            String artifactData = buildAuditingArtifactData(artifactDefinition);
 
             if (component != null) {
                 // fields that are filled during creation and might still be empty
@@ -869,8 +987,8 @@ public class ComponentsUtils {
                 uuid = component.getUUID();
                 invariantUUID = component.getInvariantUUID();
                 currVersion = component.getVersion();
-                if (StringUtils.isEmpty(compName)) {
-                    compName = component.getComponentMetadataDefinition().getMetadataDataDefinition().getName();
+                if (StringUtils.isEmpty(resourceCommonInfo.getResourceName())) {
+                    resourceCommonInfo.setResourceName(component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
                 }
             }
             if (currComponent != null) {
@@ -883,7 +1001,7 @@ public class ComponentsUtils {
                     currVersion = currComponent.getVersion();
                 }
             }
-            AuditBaseEventFactory factory = AuditResourceEventFactoryMananger.createResourceEventFactory(
+            AuditEventFactory factory = AuditResourceEventFactoryManager.createResourceEventFactory(
                     actionEnum,
                     CommonAuditData.newBuilder()
                             .status(status)
@@ -891,174 +1009,145 @@ public class ComponentsUtils {
                             .requestId(ThreadLocalsHolder.getUuid())
                             .serviceInstanceId(uuid)
                             .build(),
-                    prevComponent,
-                    ResourceAuditData.newBuilder()
+                    resourceCommonInfo, prevComponent,
+                    ResourceVersionInfo.newBuilder()
                             .artifactUuid(currArtifactUid)
                             .state(currState)
                             .version(currVersion)
                             .distributionStatus(dcurrStatus)
                             .build(),
-                    type.getValue().replace(" ", ""), compName, invariantUUID,
+                    invariantUUID,
                     modifier, artifactData, comment, did, null);
 
             getAuditingManager().auditEvent(factory);
         }
     }
 
-    public void auditDistributionEngine(AuditingActionEnum actionEnum, String environmentName, String topicName, String role, String apiKey, String status) {
-
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
+    public void auditDistributionEngine(AuditingActionEnum action, String environmentName, DistributionTopicData distributionTopicData, String status) {
+        auditDistributionEngine(action, environmentName, distributionTopicData, null, null, status);
+    }
 
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME, environmentName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ROLE, role);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY, apiKey);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
 
-        getAuditingManager().auditEvent(auditingFields);
+     public void auditDistributionEngine(AuditingActionEnum action, String environmentName, DistributionTopicData distributionTopicData, String role, String apiKey, String status) {
+        AuditEventFactory factory = AuditDistributionEngineEventFactoryManager.createDistributionEngineEventFactory(action,
+                environmentName, distributionTopicData, role, apiKey, status);
+        getAuditingManager().auditEvent(factory);
     }
 
 
     public void auditEnvironmentEngine(AuditingActionEnum actionEnum, String environmentID,
                                        String environmentType, String action, String environmentName, String tenantContext) {
-        getAuditingManager().auditEvent(new AuditEcompOpEnvEventFactory(actionEnum, environmentID, environmentName,
-                environmentType, action, tenantContext));
+        AuditEventFactory factory = new AuditEcompOpEnvEventFactory(actionEnum, environmentID, environmentName,
+                environmentType, action, tenantContext);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditDistributionNotification(AuditingActionEnum actionEnum, String serviceUUID, String resourceName, String resourceType, String currVersion, String modifierUid, String modifierName, String environmentName, String currState,
-            String topicName, String distributionId, String description, String status, String workloadContext, String tenant) {
-
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, serviceUUID);
-
+    public void auditDistributionNotification(String serviceUUID, String resourceName, String resourceType, String currVersion, User modifier, String environmentName, String currState,
+                                              String topicName, String distributionId, String description, String status, String workloadContext, String tenant) {
 
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, distributionId);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, currVersion);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, currState);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, resourceType);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, description);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifierUid);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifierName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resourceName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TENANT, tenant);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_VNF_WORKLOAD_CONTEXT, workloadContext);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVIRONMENT_ID, environmentName);
+        AuditEventFactory factory = new AuditDistributionNotificationEventFactory(
+                CommonAuditData.newBuilder()
+                    .serviceInstanceId(serviceUUID)
+                    .status(status)
+                    .description(description)
+                    .requestId(ThreadLocalsHolder.getUuid())
+                    .build(),
+                new ResourceCommonInfo(resourceName, resourceType),
+                ResourceVersionInfo.newBuilder()
+                    .state(currState)
+                    .version(currVersion)
+                    .build(),
+                distributionId, modifier, topicName,
+                new OperationalEnvAuditData(environmentName, workloadContext, tenant));
 
-        getAuditingManager().auditEvent(auditingFields);
+        getAuditingManager().auditEvent(factory);
     }
 
     public void auditAuthEvent(String url, String user, String authStatus, String realm) {
-        getAuditingManager().auditEvent(new AuditAuthRequestEventFactory(
+        AuditEventFactory factory = new AuditAuthRequestEventFactory(
                 CommonAuditData.newBuilder()
                 .requestId(ThreadLocalsHolder.getUuid())
                 .build(),
-                user, url, realm, authStatus));
+                user, url, realm, authStatus);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditDistributionStatusNotification(AuditingActionEnum actionEnum, String distributionId, String consumerId, String topicName, String resourceUrl, String statusTime, String status, String errorReason) {
-
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_REQUEST_ID, distributionId);
+    public void auditDistributionStatusNotification(String distributionId, String consumerId, String topicName, String resourceUrl, String statusTime, String status, String errorReason) {
         ThreadLocalsHolder.setUuid(distributionId);
 
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, distributionId);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, consumerId);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, resourceUrl);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME, statusTime);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, errorReason);
+        AuditEventFactory factory =  new AuditDistributionStatusEventFactory(
+                CommonAuditData.newBuilder()
+                .description(errorReason)
+                .status(status)
+                .requestId(distributionId)
+                .build(),
+                new DistributionData(consumerId, resourceUrl),
+                distributionId, topicName, statusTime);
 
-        getAuditingManager().auditEvent(auditingFields);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditGetUebCluster(AuditingActionEnum actionEnum, String consumerId, String statusTime, String status, String description) {
-
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, consumerId);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME, statusTime);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC, description);
+    public void auditGetUebCluster(String consumerId, String status, String description) {
+        AuditEventFactory factory = new AuditGetUebClusterEventFactory(
+                CommonAuditData.newBuilder()
+                        .description(description)
+                        .status(status)
+                        .requestId(ThreadLocalsHolder.getUuid())
+                        .build(),
+                consumerId);
 
-        getAuditingManager().auditEvent(auditingFields);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditMissingInstanceId(AuditingActionEnum actionEnum, String status, String description) {
-
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, null);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_TIMESTAMP, null);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, description);
-
-        getAuditingManager().auditEvent(auditingFields);
+    public void auditMissingInstanceIdAsDistributionEngineEvent(AuditingActionEnum actionEnum, String status) {
+        AuditEventFactory factory = AuditDistributionEngineEventFactoryManager.createDistributionEngineEventFactory(
+                actionEnum, "",
+                DistributionTopicData.newBuilder()
+                        .build(), null, null, status);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditTopicACLKeys(AuditingActionEnum actionEnum, String envName, String topicName, String role, String apiPublicKey, String status) {
 
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME, envName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_TOPIC_NAME, topicName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ROLE, role);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY, apiPublicKey);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
+    public void auditRegisterOrUnRegisterEvent(AuditingActionEnum action, String consumerId, String apiPublicKey, String envName, String status, String distributionStatus, String notifTopicName, String statusTopicName) {
+        String appliedStatus = !StringUtils.isEmpty(status) ? status : distributionStatus;
 
-        getAuditingManager().auditEvent(auditingFields);
-    }
+        AuditEventFactory factory = new AuditRegUnregDistributionEngineEventFactory(action,
+                CommonAuditData.newBuilder()
+                    .requestId(ThreadLocalsHolder.getUuid())
+                    .status(appliedStatus)
+                    .build(),
+                DistributionTopicData.newBuilder()
+                    .statusTopic(statusTopicName)
+                    .notificationTopic(notifTopicName)
+                    .build(),
+                consumerId, apiPublicKey, envName);
 
-    public void auditRegisterOrUnRegisterEvent(AuditingActionEnum actionEnum, String consumerId, String apiPublicKey, String envName, String status, String statusDesc, String notifTopicName, String statusTopicName) {
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, consumerId);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_API_KEY, apiPublicKey);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ENVRIONMENT_NAME, envName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_DESC, statusDesc);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_NOTIFICATION_TOPIC_NAME, notifTopicName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TOPIC_NAME, statusTopicName);
-        getAuditingManager().auditEvent(auditingFields);
+        getAuditingManager().auditEvent(factory);
     }
 
-    public void auditServiceDistributionDeployed(AuditingActionEnum actionEnum, String serviceName, String serviceVersion, String serviceUUID, String distributionId, String status, String desc, User modifier) {
+    public void auditServiceDistributionDeployed(String serviceName, String serviceVersion, String serviceUUID, String distributionId, String status, String desc, User modifier) {
 
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, serviceUUID);
-
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifier.getFirstName() + " " + modifier.getLastName());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId());
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_TYPE, "Service");
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, serviceName);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, serviceVersion);
+        AuditEventFactory factory = new AuditDistributionDeployEventFactory(
+                CommonAuditData.newBuilder()
+                    .requestId(ThreadLocalsHolder.getUuid())
+                    .serviceInstanceId(serviceUUID)
+                    .status(status)
+                    .description(desc)
+                    .build(),
+                new ResourceCommonInfo(serviceName, "Service"),
+                distributionId,
+                modifier,
+                serviceVersion);
 
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_ID, distributionId);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, desc);
+        getAuditingManager().auditEvent(factory);
 
-        getAuditingManager().auditEvent(auditingFields);
     }
 
     public void auditConsumerCredentialsEvent(AuditingActionEnum actionEnum, ConsumerDefinition consumer, ResponseFormat responseFormat, User modifier) {
-        int status = responseFormat.getStatus();
-        String message = "";
-
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
-        }
-        message += responseFormat.getFormattedMessage();
-
         AuditEventFactory factory = new AuditConsumerEventFactory(actionEnum,
                 CommonAuditData.newBuilder()
-                .description(message)
-                .status(status)
+                .description(getMessageString(responseFormat))
+                .status(responseFormat.getStatus())
                 .requestId(ThreadLocalsHolder.getUuid())
                 .build(),
                 modifier, consumer);
@@ -1066,41 +1155,24 @@ public class ComponentsUtils {
         getAuditingManager().auditEvent(factory);
     }
 
-    public void auditGetUsersList(AuditingActionEnum actionEnum, User modifier, String details, ResponseFormat responseFormat) {
-
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        if (modifier != null) {
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifier.getFirstName() + " " + modifier.getLastName());
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId());
-        }
-
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_USER_DETAILS, details);
-        int status = responseFormat.getStatus();
-        String message = "";
+    public void auditGetUsersList(User user, String details, ResponseFormat responseFormat) {
 
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
-        }
-        message += responseFormat.getFormattedMessage();
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, message);
-        getAuditingManager().auditEvent(auditingFields);
+        AuditEventFactory factory = new AuditGetUsersListEventFactory(
+                CommonAuditData.newBuilder()
+                        .description(getMessageString(responseFormat))
+                        .status(responseFormat.getStatus())
+                        .requestId(ThreadLocalsHolder.getUuid())
+                        .build(),
+                user, details);
+        getAuditingManager().auditEvent(factory);
     }
 
     public void auditAdminUserAction(AuditingActionEnum actionEnum, User modifier, User userBefore, User userAfter, ResponseFormat responseFormat) {
-        int status = responseFormat.getStatus();
-        String message = "";
-
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
-        }
-        message += responseFormat.getFormattedMessage();
 
         AuditEventFactory factory = new AuditUserAdminEventFactory(actionEnum,
                 CommonAuditData.newBuilder()
-                        .description(message)
-                        .status(status)
+                        .description(getMessageString(responseFormat))
+                        .status(responseFormat.getStatus())
                         .requestId(ThreadLocalsHolder.getUuid())
                         .build(),
                 modifier, userBefore, userAfter);
@@ -1108,19 +1180,11 @@ public class ComponentsUtils {
         getAuditingManager().auditEvent(factory);
     }
 
-    public void auditUserAccess(AuditingActionEnum actionEnum, User user, ResponseFormat responseFormat) {
-
-        int status = responseFormat.getStatus();
-        String message = "";
-
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
-        }
-        message += responseFormat.getFormattedMessage();
+    public void auditUserAccess(User user, ResponseFormat responseFormat) {
 
         AuditEventFactory factory = new AuditUserAccessEventFactory(CommonAuditData.newBuilder()
-                .description(message)
-                .status(status)
+                .description(getMessageString(responseFormat))
+                .status(responseFormat.getStatus())
                 .requestId(ThreadLocalsHolder.getUuid())
                 .build(),
                 user);
@@ -1128,25 +1192,16 @@ public class ComponentsUtils {
         getAuditingManager().auditEvent(factory);
     }
 
-    public void auditGetCategoryHierarchy(AuditingActionEnum actionEnum, User modifier, String details, ResponseFormat responseFormat) {
+    public void auditGetCategoryHierarchy(User user, String details, ResponseFormat responseFormat) {
 
-        EnumMap<AuditingFieldsKeysEnum, Object> auditingFields = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_ACTION, actionEnum.getName());
-        if (modifier != null) {
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifier.getFirstName() + " " + modifier.getLastName());
-            auditingFields.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId());
-        }
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DETAILS, details);
-        int status = responseFormat.getStatus();
-        String message = "";
+        AuditEventFactory factory = new AuditGetCategoryHierarchyEventFactory(CommonAuditData.newBuilder()
+                        .description(getMessageString(responseFormat))
+                        .status(responseFormat.getStatus())
+                        .requestId(ThreadLocalsHolder.getUuid())
+                        .build(),
+                user, details);
 
-        if (responseFormat.getMessageId() != null) {
-            message = responseFormat.getMessageId() + ": ";
-        }
-        message += responseFormat.getFormattedMessage();
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_STATUS, status);
-        auditingFields.put(AuditingFieldsKeysEnum.AUDIT_DESC, message);
-        getAuditingManager().auditEvent(auditingFields);
+        getAuditingManager().auditEvent(factory);
     }
 
     public ResponseFormat getResponseFormatByComponent(ActionStatus actionStatus, Component component, ComponentTypeEnum type) {
@@ -1199,7 +1254,7 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -1299,7 +1354,7 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -1327,7 +1382,7 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -1358,7 +1413,7 @@ public class ComponentsUtils {
             responseEnum = ActionStatus.GENERAL_ERROR;
             break;
         }
-        log.debug("convert storage response {} to action response {}", storageResponse, responseEnum);
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
         return responseEnum;
     }
 
@@ -1458,6 +1513,14 @@ public class ComponentsUtils {
         }
         return result;
     }
-
+    
+    
+    public ResponseFormat getResponseFormat(ComponentException exception) {
+        ResponseFormat responseFormat = exception.getResponseFormat();
+        if (responseFormat != null) {
+            return responseFormat;
+        }
+        return getResponseFormat(exception.getActionStatus(), exception.getParams());
+    }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/DownloadArtifactLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/DownloadArtifactLogic.java
index 445f8d9fd9..fef5f86cf8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/DownloadArtifactLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/DownloadArtifactLogic.java
@@ -20,17 +20,9 @@
 
 package org.openecomp.sdc.be.impl;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.StreamingOutput;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import fj.data.Either;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
 import org.eclipse.jgit.util.Base64;
@@ -40,17 +32,21 @@ import org.openecomp.sdc.be.info.ArtifactAccessList;
 import org.openecomp.sdc.be.info.ServletJsonResponse;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import fj.data.Either;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.StreamingOutput;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 
 public class DownloadArtifactLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(DownloadArtifactLogic.class);
+    private static final Logger log = Logger.getLogger(DownloadArtifactLogic.class);
 
     private Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
@@ -95,9 +91,9 @@ public class DownloadArtifactLogic {
 
     public List<ArtifactAccessInfo> convertArtifactList(List<? extends ESArtifactData> artifactsList, String servletPath) {
 
-        List<ArtifactAccessInfo> artifactAccessList = new ArrayList<ArtifactAccessInfo>();
+        List<ArtifactAccessInfo> artifactAccessList = new ArrayList<>();
         for (ESArtifactData artifact : artifactsList) {
-            ArtifactAccessInfo accessInfo = new ArtifactAccessInfo(artifact, servletPath);
+            ArtifactAccessInfo accessInfo = new ArtifactAccessInfo(servletPath);
             artifactAccessList.add(accessInfo);
         }
         return artifactAccessList;
@@ -138,9 +134,7 @@ public class DownloadArtifactLogic {
         jsonResponse.setDescription(errorMessage);
         jsonResponse.setSource(Constants.CATALOG_BE);
 
-        Response response = Response.status(status).entity(jsonResponse).build();
-
-        return response;
+        return Response.status(status).entity(jsonResponse).build();
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ForwardingPathUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ForwardingPathUtils.java
index ec3e146164..e7ff412d2c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ForwardingPathUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ForwardingPathUtils.java
@@ -1,14 +1,8 @@
 package org.openecomp.sdc.be.impl;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.SetMultimap;
 import org.apache.commons.collections.CollectionUtils;
 import org.javatuples.Pair;
 import org.openecomp.sdc.be.components.impl.ResponseFormatManager;
@@ -24,8 +18,8 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Service;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.SetMultimap;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class ForwardingPathUtils {
 
@@ -49,7 +43,10 @@ public class ForwardingPathUtils {
     }
 
     private void initNodeToCP(ComponentInstance ci, SetMultimap<NameIdPair, NameIdPair> nodeToCP) {
-        Set<CapabilityDefinition> capabilities = ci.getCapabilities().values().stream().flatMap(capabilityDefinitions -> capabilityDefinitions.stream()).collect(Collectors.toSet());
+        if (ci.getCapabilities() == null){
+            return;
+        }
+        Set<CapabilityDefinition> capabilities = ci.getCapabilities().values().stream().flatMap(Collection::stream).collect(Collectors.toSet());
         if (!CollectionUtils.isNotEmpty(capabilities)) {
             return;
         }
@@ -57,12 +54,11 @@ public class ForwardingPathUtils {
         if (!CollectionUtils.isNotEmpty(forwarderCapabilities)) {
             return;
         }
-        NameIdPair node = new NameIdPair(ci.getName(), ci.getUniqueId());
+        NameIdPair node = new NameIdPair(ci.getName(), ci.getName());
         forwarderCapabilities.forEach(fc -> {
-            NameIdPair capability = new NameIdPair(fc.getName(), fc.getUniqueId(), fc.getOwnerId());
+            NameIdPair capability = new NameIdPair(fc.getName(), fc.getName(), fc.getOwnerId());
             nodeToCP.put(node, capability);
-
-        });
+         });
 
     }
 
@@ -84,31 +80,11 @@ public class ForwardingPathUtils {
         Map<NameIdPair, Set<NameIdPair>> options = toMap(nodeToCP);
 
         Set<NameIdPair> cpOptions = options.get(wrapper.getNameIdPair());
-        List<NameIdPairWrapper> wrappers = cpOptions.stream().map(cpOption -> createWrapper(cpOption)).collect(Collectors.toList());
+        List<NameIdPairWrapper> wrappers = cpOptions.stream().map(this::createWrapper).collect(Collectors.toList());
         wrappers.forEach(cpOptionWrapper -> {
             org.openecomp.sdc.be.datamodel.NameIdPair data = wrapper.getData();
             data.addWrappedData(cpOptionWrapper);
         });
-        addNodes(wrappers, options);
-    }
-
-    private void addNodes(List<NameIdPairWrapper> cpOptions, Map<NameIdPair, Set<NameIdPair>> options) {
-
-        cpOptions.forEach(cpOption -> {
-            Set<NameIdPairWrapper> wrappers = options.keySet().stream().map(option -> createWrapper(option)).collect(Collectors.toSet());
-            wrappers.forEach(wrapper -> {
-                cpOption.getData().addWrappedData(wrapper);
-                Collection<NameIdPair> cps = options.get(wrapper.getNameIdPair());
-                Set<NameIdPairWrapper> cpsWrappers = cps.stream().map(cp -> new NameIdPairWrapper(cp)).collect(Collectors.toSet());
-                cpsWrappers.forEach(cpw -> {
-                    NameIdPair data = wrapper.getData();
-                    if (!data.containsKey(cpw)) {
-                        data.addWrappedData(cpw);
-                    }
-                });
-            });
-
-        });
     }
 
     private NameIdPairWrapper createWrapper(NameIdPair cpOption) {
@@ -224,7 +200,7 @@ public class ForwardingPathUtils {
         return newCI.getCapabilities().values()
             .stream()
             .flatMap(List::stream)
-            .anyMatch(c -> c.getUniqueId().equals(capabilityID));
+            .anyMatch(c -> c.getName().equals(capabilityID));
     }
 
     private boolean elementContainsCIAndDoesNotContainForwarder(
@@ -243,4 +219,37 @@ public class ForwardingPathUtils {
             || (elementDataDefinitions.getToNode().equals(oldCIId) && !ciContainsForwarder(newCI,
             elementDataDefinitions.getToCP()));
     }
+
+
+    public Set<ForwardingPathDataDefinition> updateComponentInstanceName(Collection<ForwardingPathDataDefinition> forwardingPathDataDefinitions,
+        String oldName, String newName){
+        return  forwardingPathDataDefinitions.stream().filter(fp -> shouldRenameCI(fp,oldName)).
+            map(forwardingPathDataDefinition -> renamePathCI(forwardingPathDataDefinition,oldName,newName))
+            .collect(Collectors.toSet());
+
+    }
+
+    public boolean shouldRenameCI(ForwardingPathDataDefinition forwardingPathDataDefinitions,
+        String oldName){
+        return forwardingPathDataDefinitions.getPathElements().getListToscaDataDefinition().stream()
+            .anyMatch(pe -> pe.getToNode().equals(oldName) || pe.getFromNode().equals(oldName));
+    }
+
+    public ForwardingPathDataDefinition renamePathCI(ForwardingPathDataDefinition forwardingPathDataDefinitions,
+        String oldName, String newName){
+        forwardingPathDataDefinitions.getPathElements().getListToscaDataDefinition().stream()
+            .forEach(pe -> renamePathCI(pe,oldName, newName));
+        return forwardingPathDataDefinitions;
+    }
+
+    public void renamePathCI(ForwardingPathElementDataDefinition pathElementDataDefinition,
+        String oldName, String newName){
+        if (pathElementDataDefinition.getFromNode().equals(oldName)){
+            pathElementDataDefinition.setFromNode(newName);
+        }
+        if(pathElementDataDefinition.getToNode().equals(oldName)){
+            pathElementDataDefinition.setToNode(newName);
+        }
+
+    }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java
index 6e078cf675..c8128a33fc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ServletUtils.java
@@ -20,12 +20,11 @@
 
 package org.openecomp.sdc.be.impl;
 
-import javax.annotation.Resource;
-
+import com.google.gson.Gson;
 import org.openecomp.sdc.be.user.IUserBusinessLogic;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.Gson;
+import javax.annotation.Resource;
 
 @Component("servletUtils")
 public class ServletUtils {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/WebAppContextWrapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/WebAppContextWrapper.java
index 7d4c09d852..02759289b2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/WebAppContextWrapper.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/WebAppContextWrapper.java
@@ -20,11 +20,11 @@
 
 package org.openecomp.sdc.be.impl;
 
-import javax.servlet.ServletContext;
-
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
+import javax.servlet.ServletContext;
+
 public class WebAppContextWrapper {
 
     public WebApplicationContext getWebAppContext(ServletContext context) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactAccessInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactAccessInfo.java
index d3fcf9f6c0..bedbff46b1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactAccessInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactAccessInfo.java
@@ -30,7 +30,7 @@ public class ArtifactAccessInfo {
         this.id = artifactData.getId();
     }
 
-    public ArtifactAccessInfo(ESArtifactData artifactData, String servletContext) {
+    public ArtifactAccessInfo(String servletContext) {
         StringBuilder urlBuilder = new StringBuilder();
         urlBuilder = urlBuilder.append(servletContext).append("/");
         urlBuilder.append("resources/")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java
index 141dd7b66d..8bf56df3da 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,12 +20,9 @@
 
 package org.openecomp.sdc.be.info;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import fj.data.Either;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig;
 import org.openecomp.sdc.be.config.ConfigurationManager;
@@ -34,44 +31,38 @@ import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.ArtifactType;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
-import fj.data.Either;
+import java.util.*;
 
 public class ArtifactTemplateInfo {
-    public static final String TYPE = "type";
-    public static final String FILE_NAME = "fileName";
-    public static final String ENV = "env";
-    public static final String IS_BASE = "isBase";
-
-    public static final String CSAR_HEAT = "HEAT";
+    private static final Logger log = Logger.getLogger(ArtifactTemplateInfo.class);
+    private static final Gson gson = new Gson();
     public static final String CSAR_ARTIFACT = "artifacts";
-    public static final String CSAR_NETWORK = "network";
-    public static final String CSAR_VOLUME = "volume";
-    public static final String CSAR_NESTED = "nested";
-    private static final Object DESC = "description";
-    private static final Logger log = LoggerFactory.getLogger(ArtifactTemplateInfo.class);
-    String type;
-    String fileName;
-    String env;
-    boolean isBase;
-    String groupName;
-    String description;
-
-    List<ArtifactTemplateInfo> relatedArtifactsInfo;
-    private static Gson gson = new Gson();
-
-    public ArtifactTemplateInfo() {
-        super();
-    }
+
+    private static final String ARTIFACT_TEMPLATE_TYPE = "type";
+    private static final String FILE_NAME = "fileName";
+    private static final String ARTIFACT_TEMPLATE_ENV = "env";
+    private static final String IS_BASE = "isBase";
+    private static final String CSAR_HEAT = "HEAT";
+    private static final String CSAR_NETWORK = "network";
+    private static final String CSAR_VOLUME = "volume";
+    private static final String CSAR_NESTED = "nested";
+    private static final String DESC = "description";
+
+    private String type;
+    private String fileName;
+    private String env;
+    private boolean isBase;
+    private String groupName;
+    private String description;
+
+    private List<ArtifactTemplateInfo> relatedArtifactsInfo;
+
+    public ArtifactTemplateInfo() {}
 
     public ArtifactTemplateInfo(String type, String fileName, String env, List<ArtifactTemplateInfo> relatedArtifactsInfo) {
-        super();
         this.type = type;
         this.fileName = fileName;
         this.env = env;
@@ -147,19 +138,23 @@ public class ArtifactTemplateInfo {
 
         jsonElement = gson.fromJson(content, jsonElement.getClass());
 
-        Map<String, Object> artifactTemplateMap = componentsUtils.parseJsonToObject(jsonElement.toString(), HashMap.class);
-        if (artifactTemplateMap.containsKey(TYPE))
-            resourceInfo.setType((String) artifactTemplateMap.get(TYPE));
-        if (artifactTemplateMap.containsKey(FILE_NAME))
+        Map<String, Object> artifactTemplateMap = ComponentsUtils.parseJsonToObject(jsonElement.toString(), HashMap.class);
+        if (artifactTemplateMap.containsKey(ARTIFACT_TEMPLATE_TYPE)) {
+            resourceInfo.setType((String) artifactTemplateMap.get(ARTIFACT_TEMPLATE_TYPE));
+        }
+        if (artifactTemplateMap.containsKey(FILE_NAME)) {
             resourceInfo.setFileName((String) artifactTemplateMap.get(FILE_NAME));
-        if (artifactTemplateMap.containsKey(IS_BASE))
+        }
+        if (artifactTemplateMap.containsKey(IS_BASE)) {
             resourceInfo.setBase((Boolean) artifactTemplateMap.get(IS_BASE));
-        if (artifactTemplateMap.containsKey(ENV)) {
-            Object envObj = artifactTemplateMap.get(ENV);
+        }
+        if (artifactTemplateMap.containsKey(ARTIFACT_TEMPLATE_ENV)) {
+            Object envObj = artifactTemplateMap.get(ARTIFACT_TEMPLATE_ENV);
             String envStr = "";
             if (envObj instanceof String) {
                 envStr = (String) envObj;
-            } else if (envObj instanceof Map) {
+            }
+            else if (envObj instanceof Map) {
                 Map envMap = (Map) envObj;
                 if (envMap.containsKey(FILE_NAME)) {
                     envStr = (String) envMap.get(FILE_NAME);
@@ -174,23 +169,30 @@ public class ArtifactTemplateInfo {
         }
 
         boolean artifactTypeExist = false;
-        String correctType = type;
-        if (type.equalsIgnoreCase(CSAR_NESTED))
+        String correctType;
+        if (type.equalsIgnoreCase(CSAR_NESTED)) {
             correctType = ArtifactTypeEnum.HEAT_NESTED.getType();
-        else if (type.equalsIgnoreCase(CSAR_VOLUME))
+        }
+        else if (type.equalsIgnoreCase(CSAR_VOLUME)) {
             correctType = ArtifactTypeEnum.HEAT_VOL.getType();
-        else if (type.equalsIgnoreCase(CSAR_NETWORK))
+        }
+        else if (type.equalsIgnoreCase(CSAR_NETWORK)) {
             correctType = ArtifactTypeEnum.HEAT_NET.getType();
+        }
         else if (type.equalsIgnoreCase(CSAR_ARTIFACT)){
-            if( parentArtifact != null)
+            if( parentArtifact != null) {
                 correctType = ArtifactTypeEnum.HEAT_ARTIFACT.getType();
-            else
+            }
+            else {
                 correctType = resourceInfo.type;
+            }
         }
-        else if (type.equalsIgnoreCase(CSAR_HEAT))
+        else if (type.equalsIgnoreCase(CSAR_HEAT)) {
             correctType = ArtifactTypeEnum.HEAT.getType();
-        else
+        }
+        else {
             correctType = ArtifactTypeEnum.OTHER.getType();
+        }
         Either<List<ArtifactType>, ActionStatus> allArtifactTypes = getDeploymentArtifactTypes(NodeTypeEnum.Resource);
 
         if (allArtifactTypes.isRight()) {
@@ -214,24 +216,29 @@ public class ArtifactTemplateInfo {
         }
 
         Either<Boolean, ResponseFormat> eitherNeedToCreate = validateEnv(componentsUtils, createdArtifactTemplateInfoList, resourceInfo);
-        if (eitherNeedToCreate.isRight())
+        if (eitherNeedToCreate.isRight()) {
             return Either.right(eitherNeedToCreate.right().value());
+        }
         eitherNeedToCreate = validateParentType(componentsUtils, resourceInfo, parentArtifact);
-        if (eitherNeedToCreate.isRight())
+        if (eitherNeedToCreate.isRight()) {
             return Either.right(eitherNeedToCreate.right().value());
+        }
         eitherNeedToCreate = validateIsAlreadyExist(componentsUtils, resourceInfo, createdArtifactTemplateInfoList, parentArtifact);
-        if (eitherNeedToCreate.isRight())
+        if (eitherNeedToCreate.isRight()) {
             return Either.right(eitherNeedToCreate.right().value());
+        }
         Set<String> keys = o.keySet();
         for (String key : keys) {
             if (o.get(key) instanceof List) {
                 List<Map<String, Object>> artifList = (List<Map<String, Object>>) o.get(key);
                 for (Map<String, Object> relatedArtifactsMap : artifList) {
                     Either<ArtifactTemplateInfo, ResponseFormat> relatedArtifact = ArtifactTemplateInfo.createArtifactTemplateInfoFromJson(componentsUtils, key, relatedArtifactsMap, createdArtifactTemplateInfoList, resourceInfo);
-                    if (relatedArtifact.isRight())
+                    if (relatedArtifact.isRight()) {
                         return relatedArtifact;
-                    if (resourceInfo.relatedArtifactsInfo == null)
-                        resourceInfo.relatedArtifactsInfo = new ArrayList<ArtifactTemplateInfo>();
+                    }
+                    if (resourceInfo.relatedArtifactsInfo == null) {
+                        resourceInfo.relatedArtifactsInfo = new ArrayList<>();
+                    }
                     resourceInfo.relatedArtifactsInfo.add(relatedArtifact.left().value());
                 }
             }
@@ -255,10 +262,8 @@ public class ArtifactTemplateInfo {
             if (relatedArtifacts == null || relatedArtifacts.isEmpty())
                 return Either.left(true);
             for (ArtifactTemplateInfo relatedArtifact : relatedArtifacts) {
-                if (relatedArtifact.getType().equalsIgnoreCase(resourceInfo.getType())) {
-                    if (relatedArtifact.getFileName().equalsIgnoreCase(resourceInfo.getFileName())) {
-                        return Either.right(componentsUtils.getResponseFormat(ActionStatus.ARTIFACT_ALRADY_EXIST_IN_MASTER_IN_CSAR, resourceInfo.getFileName(), parentArtifact.getFileName()));
-                    }
+                if (relatedArtifact.getType().equalsIgnoreCase(resourceInfo.getType()) && relatedArtifact.getFileName().equalsIgnoreCase(resourceInfo.getFileName())) {
+                    return Either.right(componentsUtils.getResponseFormat(ActionStatus.ARTIFACT_ALRADY_EXIST_IN_MASTER_IN_CSAR, resourceInfo.getFileName(), parentArtifact.getFileName()));
                 }
             }
             return Either.left(true);
@@ -267,11 +272,13 @@ public class ArtifactTemplateInfo {
 
     private static Either<Boolean, ResponseFormat> validateParentType(ComponentsUtils componentsUtils, ArtifactTemplateInfo resourceInfo, ArtifactTemplateInfo parentArtifact) {
 
-        if (parentArtifact == null)
+        if (parentArtifact == null) {
             return Either.left(true);
-        if (resourceInfo.getType().equalsIgnoreCase(ArtifactTypeEnum.HEAT_ARTIFACT.getType()))
+        }
+        if (resourceInfo.getType().equalsIgnoreCase(ArtifactTypeEnum.HEAT_ARTIFACT.getType())) {
             return Either.left(true);
-        if (resourceInfo.getType().equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType()) && parentArtifact != null) {
+        }
+        if (resourceInfo.getType().equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType())) {
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.ARTIFACT_NOT_VALID_IN_MASTER, resourceInfo.getFileName(), resourceInfo.getType(), parentArtifact.getFileName(), parentArtifact.getType()));
         }
         if ((resourceInfo.getType().equalsIgnoreCase(ArtifactTypeEnum.HEAT_NET.getType()) || resourceInfo.getType().equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType()))
@@ -329,7 +336,7 @@ public class ArtifactTemplateInfo {
     private static Either<List<ArtifactType>, ActionStatus> getDeploymentArtifactTypes(NodeTypeEnum parentType) {
 
         Map<String, ArtifactTypeConfig> deploymentArtifacts = null;
-        List<ArtifactType> artifactTypes = new ArrayList<ArtifactType>();
+        List<ArtifactType> artifactTypes = new ArrayList<>();
 
         if (parentType.equals(NodeTypeEnum.Service)) {
             deploymentArtifacts = ConfigurationManager.getConfigurationManager().getConfiguration().getServiceDeploymentArtifacts();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTypesInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTypesInfo.java
index da7f178862..5d635f05ff 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTypesInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTypesInfo.java
@@ -20,10 +20,10 @@
 
 package org.openecomp.sdc.be.info;
 
-import java.util.List;
-
 import org.openecomp.sdc.be.model.ArtifactType;
 
+import java.util.List;
+
 public class ArtifactTypesInfo {
 
     Integer heatDefaultTimeout = 60;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java
index 795d5f6046..11a42694bf 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java
@@ -20,8 +20,7 @@
 
 package org.openecomp.sdc.be.info;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
 public enum DistributionStatus {
     DEPLOYED("Deployed", "DEPLOYED");
@@ -29,7 +28,7 @@ public enum DistributionStatus {
     private String name;
     private String auditingStatus;
 
-    private static final Logger log = LoggerFactory.getLogger(DistributionStatus.class);
+    private static final Logger log = Logger.getLogger(DistributionStatus.class);
 
     DistributionStatus(String name, String auditingStatus) {
         this.name = name;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatusInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatusInfo.java
index dd8ef32124..c9eba2e764 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatusInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatusInfo.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.sdc.be.info;
 
-import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKey;
 import org.openecomp.sdc.common.datastructure.ESTimeBasedEvent;
 
 public class DistributionStatusInfo {
@@ -32,12 +32,11 @@ public class DistributionStatusInfo {
 
     public DistributionStatusInfo(ESTimeBasedEvent distributionStatusEvent) {
         super();
-        omfComponentID = (String) distributionStatusEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName());
-        timestamp = (String) distributionStatusEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_STATUS_TIME.getDisplayName());// distributionStatusEvent.getStatusTime();
-        url = (String) distributionStatusEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL.getDisplayName());// distributionStatusEvent.getResoureURL();
-        status = (String) distributionStatusEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_STATUS.getDisplayName());// distributionStatusEvent.getStatus();
-        errorReason = (String) distributionStatusEvent.getFields().get(AuditingFieldsKeysEnum.AUDIT_DESC.getDisplayName());
-
+        omfComponentID = (String) distributionStatusEvent.getFields().get(AuditingFieldsKey.AUDIT_DISTRIBUTION_CONSUMER_ID.getDisplayName());
+        timestamp = (String) distributionStatusEvent.getFields().get(AuditingFieldsKey.AUDIT_DISTRIBUTION_STATUS_TIME.getDisplayName());
+        url = (String) distributionStatusEvent.getFields().get(AuditingFieldsKey.AUDIT_DISTRIBUTION_RESOURCE_URL.getDisplayName());
+        status = (String) distributionStatusEvent.getFields().get(AuditingFieldsKey.AUDIT_STATUS.getDisplayName());
+        errorReason = (String) distributionStatusEvent.getFields().get(AuditingFieldsKey.AUDIT_DESC.getDisplayName());
     }
 
     public DistributionStatusInfo(String omfComponentID, String timestamp, String url, String status) {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/GroupDefinitionInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/GroupDefinitionInfo.java
index 456ffd095b..e7a0706b31 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/GroupDefinitionInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/GroupDefinitionInfo.java
@@ -20,15 +20,19 @@
 
 package org.openecomp.sdc.be.info;
 
-import java.util.List;
-
 import org.openecomp.sdc.be.model.GroupDefinition;
 import org.openecomp.sdc.be.model.GroupInstance;
 import org.openecomp.sdc.be.model.GroupProperty;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 public class GroupDefinitionInfo {
     private String name;
 
+    private String description;
+
     // the id is unique per group instance on graph.
     private String uniqueId;
 
@@ -48,12 +52,14 @@ public class GroupDefinitionInfo {
     private String invariantUUID;
     private String customizationUUID;
 
-    Boolean isBase = null;
+    private Boolean isBase = null;
 
     // artifacts - list of artifact uid. All artifacts in the group must already
     // be uploaded to the VF
     private List<ArtifactDefinitionInfo> artifacts;
 
+    private Map<String, String> members;
+
     private List<? extends GroupProperty> properties;
 
     public GroupDefinitionInfo() {
@@ -62,17 +68,20 @@ public class GroupDefinitionInfo {
 
     public GroupDefinitionInfo(GroupDefinition other) {
         this.setName(other.getName());
+        this.setDescription(other.getDescription());
         this.setUniqueId(other.getUniqueId());
         this.setVersion(other.getVersion());
         this.setGroupUUID(other.getGroupUUID());
         this.setInvariantUUID(other.getInvariantUUID());
         this.setProperties(other.convertToGroupProperties());
-
-
+        if (other.getMembers() != null) {
+            this.members = new HashMap<>(other.getMembers());
+        }
     }
 
     public GroupDefinitionInfo(GroupInstance other) {
         this.setName(other.getGroupName());
+        this.setDescription(other.getDescription());
         this.setUniqueId(other.getGroupUid());
         this.setGroupInstanceUniqueId(other.getUniqueId());
         this.setVersion(other.getVersion());
@@ -80,8 +89,6 @@ public class GroupDefinitionInfo {
         this.setCustomizationUUID(other.getCustomizationUUID());
         this.setInvariantUUID(other.getInvariantUUID());
         this.setProperties(other.convertToGroupInstancesProperties());
-
-
     }
 
     public String getInvariantUUID() {
@@ -100,6 +107,14 @@ public class GroupDefinitionInfo {
         this.name = name;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public String getUniqueId() {
         return uniqueId;
     }
@@ -142,19 +157,19 @@ public class GroupDefinitionInfo {
     }
 
     public List<ArtifactDefinitionInfo> getArtifacts() {
-        return artifacts;
+        return (artifacts==null) ? null : new ArrayList<>(artifacts);
     }
 
     public void setArtifacts(List<ArtifactDefinitionInfo> artifacts) {
-        this.artifacts = artifacts;
+        this.artifacts = (artifacts==null) ? null : new ArrayList<>(artifacts);
     }
 
-    public List<? extends GroupProperty> getProperties() {
-        return properties;
+    public List<GroupProperty> getProperties() {
+        return (properties==null) ? null : new ArrayList<>(properties);
     }
 
     public void setProperties(List<? extends GroupProperty> properties) {
-        this.properties = properties;
+        this.properties = (properties==null) ? null : new ArrayList<>(properties);
     }
 
 
@@ -167,6 +182,14 @@ public class GroupDefinitionInfo {
         this.groupInstanceUniqueId = groupInstanceUniqueId;
     }
 
+    public Map<String, String> getMembers() {
+        return members;
+    }
+
+    public void setMembers(Map<String, String> members) {
+        this.members = members;
+    }
+
     @Override
     public String toString() {
         return "GroupDefinitionInfo [" + super.toString() + ", isBase=" + isBase + ", artifacts=" + artifacts + "]";
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java
index d5da29f77d..455bf40246 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/MergedArtifactInfo.java
@@ -20,14 +20,11 @@
 
 package org.openecomp.sdc.be.info;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
+
+import java.util.*;
+
 public class MergedArtifactInfo {
 
     private List<ArtifactDefinition> createdArtifact;
@@ -40,7 +37,7 @@ public class MergedArtifactInfo {
 
     public void setCreatedArtifact(List<ArtifactDefinition> createdArtifact) {
         this.createdArtifact = createdArtifact;
-        parsetArtifactsNames = new HashSet<String>();
+        parsetArtifactsNames = new HashSet<>();
         parsetArtifactsNames.add(jsonArtifactTemplate.getFileName());
         List<ArtifactTemplateInfo> relatedGroupTemplateList = jsonArtifactTemplate.getRelatedArtifactsInfo();
         if (relatedGroupTemplateList != null && !relatedGroupTemplateList.isEmpty()) {
@@ -58,7 +55,7 @@ public class MergedArtifactInfo {
     }
 
     public List<ArtifactTemplateInfo> getListToAssociateArtifactToGroup() {
-        List<ArtifactTemplateInfo> resList = new ArrayList<ArtifactTemplateInfo>();
+        List<ArtifactTemplateInfo> resList = new ArrayList<>();
         List<ArtifactTemplateInfo> relatedArtifacts = jsonArtifactTemplate.getRelatedArtifactsInfo();
         if (relatedArtifacts != null && !relatedArtifacts.isEmpty()) {
             getNewArtifactsInGroup(resList, relatedArtifacts);
@@ -67,7 +64,7 @@ public class MergedArtifactInfo {
     }
 
     public List<ArtifactDefinition> getListToDissotiateArtifactFromGroup(List<ArtifactDefinition> deletedArtifacts) {
-        List<ArtifactDefinition> resList = new ArrayList<ArtifactDefinition>();
+        List<ArtifactDefinition> resList = new ArrayList<>();
         for (ArtifactDefinition artifactDefinition : createdArtifact) {
             boolean isDissotiate = true;
             if(parsetArtifactsNames.contains(artifactDefinition.getArtifactName())){
@@ -106,10 +103,10 @@ public class MergedArtifactInfo {
     }
 
     public List<ImmutablePair<ArtifactDefinition, ArtifactTemplateInfo>> getListToUpdateArtifactInGroup() {
-        List<ImmutablePair<ArtifactDefinition, ArtifactTemplateInfo>> resList = new ArrayList<ImmutablePair<ArtifactDefinition, ArtifactTemplateInfo>>();
+        List<ImmutablePair<ArtifactDefinition, ArtifactTemplateInfo>> resList = new ArrayList<>();
         for (ArtifactDefinition artifactDefinition : createdArtifact) {
             if (artifactDefinition.getArtifactName().equalsIgnoreCase(jsonArtifactTemplate.getFileName())) {
-                resList.add(new ImmutablePair<ArtifactDefinition, ArtifactTemplateInfo>(artifactDefinition, jsonArtifactTemplate));
+                resList.add(new ImmutablePair<>(artifactDefinition, jsonArtifactTemplate));
             }
         }
         List<ArtifactTemplateInfo> relatedArtifacts = jsonArtifactTemplate.getRelatedArtifactsInfo();
@@ -125,7 +122,7 @@ public class MergedArtifactInfo {
 
             for (ArtifactDefinition artifactDefinition : createdArtifact) {
                 if (artifactDefinition.getArtifactName().equalsIgnoreCase(artifactTemplateInfo.getFileName())) {
-                    resList.add(new ImmutablePair<ArtifactDefinition, ArtifactTemplateInfo>(artifactDefinition, artifactTemplateInfo));
+                    resList.add(new ImmutablePair<>(artifactDefinition, artifactTemplateInfo));
                 }
             }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifacts.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifacts.java
index 2aef7808ae..766581bd62 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifacts.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/NodeTypeInfoToUpdateArtifacts.java
@@ -1,12 +1,12 @@
 package org.openecomp.sdc.be.info;
 
+import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-
 public class NodeTypeInfoToUpdateArtifacts {
 
     private String nodeName;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/OperationalEnvInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/OperationalEnvInfo.java
index f49722aa42..68ef5ac5b7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/OperationalEnvInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/OperationalEnvInfo.java
@@ -1,22 +1,20 @@
 package org.openecomp.sdc.be.info;
 
-import java.io.IOException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.io.IOException;
 
 public final class OperationalEnvInfo {
     @JsonIgnore
     private static ObjectMapper objectMapper = new ObjectMapper();
     
     @JsonIgnore
-    private static final Logger logger = LoggerFactory.getLogger(OperationalEnvInfo.class);
+    private static final Logger logger = Logger.getLogger(OperationalEnvInfo.class);
     
     @JsonProperty("operational-environment-id")
     private String operationalEnvId;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/Relationship.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/Relationship.java
index 5fd51e3dee..fba6632698 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/Relationship.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/Relationship.java
@@ -1,10 +1,10 @@
 package org.openecomp.sdc.be.info;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 public final class Relationship {
     
     @JsonProperty("related-to")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/listen/BEAppContextListener.java b/catalog-be/src/main/java/org/openecomp/sdc/be/listen/BEAppContextListener.java
index f895577c5d..34ebf14ae5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/listen/BEAppContextListener.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/listen/BEAppContextListener.java
@@ -20,15 +20,6 @@
 
 package org.openecomp.sdc.be.listen;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.impl.DownloadArtifactLogic;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
@@ -36,13 +27,20 @@ import org.openecomp.sdc.be.monitoring.BeMonitoringService;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.impl.ExternalConfiguration;
 import org.openecomp.sdc.common.listener.AppContextListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 public class BEAppContextListener extends AppContextListener implements ServletContextListener {
 
     private static final String MANIFEST_FILE_NAME = "/META-INF/MANIFEST.MF";
-    private static final Logger log = LoggerFactory.getLogger(BEAppContextListener.class);
+    private static final Logger log = Logger.getLogger(BEAppContextListener.class);
 
     public void contextInitialized(ServletContextEvent context) {
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/GroupCompositionMixin.java b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/GroupCompositionMixin.java
new file mode 100644
index 0000000000..eb61b1c0fe
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/GroupCompositionMixin.java
@@ -0,0 +1,22 @@
+package org.openecomp.sdc.be.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.view.Mixin;
+import org.openecomp.sdc.be.view.MixinTarget;
+
+import java.util.Map;
+
+@MixinTarget(target = GroupDataDefinition.class)
+public abstract  class GroupCompositionMixin  extends Mixin {
+    @JsonProperty
+    abstract String getName();
+    @JsonProperty("members")
+    abstract Map<String, String> resolveMembersList();
+    @JsonProperty
+    abstract String getUniqueId();
+    @JsonProperty
+    abstract String getType();
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/GroupTypeMixin.java b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/GroupTypeMixin.java
index 0b0b8627c0..6990f8ec91 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/GroupTypeMixin.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/GroupTypeMixin.java
@@ -1,11 +1,10 @@
 package org.openecomp.sdc.be.mixin;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.openecomp.sdc.be.datatypes.elements.GroupTypeDataDefinition;
 import org.openecomp.sdc.be.view.Mixin;
 import org.openecomp.sdc.be.view.MixinTarget;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 @MixinTarget(target = GroupTypeDataDefinition.class)
 public abstract class GroupTypeMixin extends Mixin {
 
@@ -15,6 +14,10 @@ public abstract class GroupTypeMixin extends Mixin {
     abstract String getVersion();
     @JsonProperty
     abstract String getUniqueId();
+    @JsonProperty
+    abstract String getName();
+    @JsonProperty
+    abstract String getIcon();
 
 }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/PolicyCompositionMixin.java b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/PolicyCompositionMixin.java
new file mode 100644
index 0000000000..7e479eadfe
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/PolicyCompositionMixin.java
@@ -0,0 +1,24 @@
+package org.openecomp.sdc.be.mixin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openecomp.sdc.be.datatypes.elements.PolicyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
+import org.openecomp.sdc.be.view.Mixin;
+import org.openecomp.sdc.be.view.MixinTarget;
+
+import java.util.List;
+import java.util.Map;
+
+@MixinTarget(target = PolicyDataDefinition.class)
+public abstract  class PolicyCompositionMixin extends Mixin {
+    @JsonProperty
+    abstract String getName();
+    @JsonProperty
+    abstract Map<PolicyTargetType, List<String>> getTargets();
+    @JsonProperty
+    abstract String getUniqueId();
+    @JsonProperty("type")
+    abstract String getPolicyTypeName();
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/PolicyTypeMixin.java b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/PolicyTypeMixin.java
index b0081728d3..55e18f4c53 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/PolicyTypeMixin.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/mixin/PolicyTypeMixin.java
@@ -1,20 +1,23 @@
 package org.openecomp.sdc.be.mixin;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.openecomp.sdc.be.datatypes.elements.PolicyTypeDataDefinition;
 import org.openecomp.sdc.be.view.Mixin;
 import org.openecomp.sdc.be.view.MixinTarget;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 @MixinTarget(target = PolicyTypeDataDefinition.class)
 public abstract class PolicyTypeMixin extends Mixin {
 
     @JsonProperty
+    abstract String getName();
+    @JsonProperty
     abstract String getType();
     @JsonProperty
     abstract String getVersion();
     @JsonProperty
     abstract String getUniqueId();
+    @JsonProperty
+    abstract String getIcon();
 
 }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java b/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
index c3b4f6e049..5f3fd10eb1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
@@ -20,26 +20,24 @@
 
 package org.openecomp.sdc.be.monitoring;
 
-import java.net.URI;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.proxy.ProxyServlet;
 import org.openecomp.sdc.be.components.impl.MonitoringBusinessLogic;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.web.context.WebApplicationContext;
 
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URI;
+
 public class EsGateway extends ProxyServlet {
 
     private static final long serialVersionUID = 1L;
-    private static final Logger log = LoggerFactory.getLogger(EsGateway.class);
+    private static final Logger log = Logger.getLogger(EsGateway.class);
 
     @Override
     public URI rewriteURI(HttpServletRequest request) {
@@ -93,8 +91,7 @@ public class EsGateway extends ProxyServlet {
             url.append("?").append(queryString);
         }
 
-        String redirectedUrl = url.toString().replace("/sdc2/esGateway/", "/");
-        return redirectedUrl;
+        return url.toString().replace("/sdc2/esGateway/", "/");
 
     }
 
@@ -102,9 +99,8 @@ public class EsGateway extends ProxyServlet {
 
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        MonitoringBusinessLogic monitoringBusinessLogic = webApplicationContext.getBean(MonitoringBusinessLogic.class);
 
-        return monitoringBusinessLogic;
+        return webApplicationContext.getBean(MonitoringBusinessLogic.class);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AbstractValidationsServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AbstractValidationsServlet.java
index a995d61fb5..c4035206f2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AbstractValidationsServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AbstractValidationsServlet.java
@@ -20,24 +20,10 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-import java.util.zip.ZipInputStream;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -47,8 +33,8 @@ import org.openecomp.sdc.be.components.impl.CsarValidationUtils;
 import org.openecomp.sdc.be.components.impl.ImportUtils;
 import org.openecomp.sdc.be.components.impl.ImportUtils.ResultStatusEnum;
 import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaElementTypeEnum;
-import org.openecomp.sdc.be.components.impl.ImportUtils.ToscaTagNamesEnum;
 import org.openecomp.sdc.be.components.impl.ResourceImportManager;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
@@ -57,31 +43,41 @@ import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.ServletUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.UploadResourceInfo;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.servlets.ResourceUploadServlet.ResourceAuthorityTypeEnum;
 import org.openecomp.sdc.be.user.IUserBusinessLogic;
 import org.openecomp.sdc.be.user.Role;
+import org.openecomp.sdc.be.utils.TypeUtils;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.api.UploadArtifactInfo;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.common.util.YamlToObjectConverter;
 import org.openecomp.sdc.common.util.ZipUtil;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
 import org.springframework.web.context.WebApplicationContext;
 import org.yaml.snakeyaml.Yaml;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.JsonSyntaxException;
-
-import fj.data.Either;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Response;
+import java.io.*;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.zip.ZipInputStream;
 
 public abstract class AbstractValidationsServlet extends BeGenericServlet {
 
+    private static final Logger log = Logger.getLogger(AbstractValidationsServlet.class);
     private static final String TOSCA_SIMPLE_YAML_PREFIX = "tosca_simple_yaml_";
     private static final List<String> TOSCA_DEFINITION_VERSIONS = Arrays.asList(TOSCA_SIMPLE_YAML_PREFIX + "1_0_0", TOSCA_SIMPLE_YAML_PREFIX + "1_1_0", "tosca_simple_profile_for_nfv_1_0_0", TOSCA_SIMPLE_YAML_PREFIX + "1_0", TOSCA_SIMPLE_YAML_PREFIX + "1_1");
     private static final List<String> TOSCA_YML_CSAR_VALID_SUFFIX = Arrays.asList(".yml", ".yaml", ".csar");
@@ -92,18 +88,8 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
 
     protected ComponentsUtils componentsUtils;
 
-    private Logger log = null;
-
-    protected void init(Logger log) {
-        initLog(log);
+    protected void init() {
         initSpringFromContext();
-
-    }
-
-    protected synchronized void initLog(Logger log) {
-        if (this.log == null) {
-            this.log = log;
-        }
     }
 
     private synchronized void initSpringFromContext() {
@@ -114,6 +100,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
             WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
             servletUtils = webApplicationContext.getBean(ServletUtils.class);
             resourceImportManager = webApplicationContext.getBean(ResourceImportManager.class);
+            componentsUtils = webApplicationContext.getBean(ComponentsUtils.class);
         }
     }
 
@@ -204,13 +191,17 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
     }
 
     protected void fillZipContents(Wrapper<String> yamlStringWrapper, File file) throws FileNotFoundException {
+        extractZipContents(yamlStringWrapper, file);
+    }
+
+    public static void extractZipContents(Wrapper<String> yamlStringWrapper, File file) throws FileNotFoundException {
         InputStream fileInputStream = new FileInputStream(file);
         Map<String, byte[]> unzippedFolder = ZipUtil.readZip(new ZipInputStream(fileInputStream));
         String ymlName = unzippedFolder.keySet().iterator().next();
         fillToscaTemplateFromZip(yamlStringWrapper, ymlName, file);
     }
 
-    protected void fillToscaTemplateFromZip(Wrapper<String> yamlStringWrapper, String payloadName, File file) throws FileNotFoundException {
+    private static void fillToscaTemplateFromZip(Wrapper<String> yamlStringWrapper, String payloadName, File file) throws FileNotFoundException {
         InputStream fileInputStream = new FileInputStream(file);
         Map<String, byte[]> unzippedFolder = ZipUtil.readZip(new ZipInputStream(fileInputStream));
         byte[] yamlFileInBytes = unzippedFolder.get(payloadName);
@@ -322,7 +313,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
         log.debug("checking payload is valid tosca");
         boolean isValid;
         Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(toscaPayload);
-        Either<String, ResultStatusEnum> findFirstToscaStringElement = ImportUtils.findFirstToscaStringElement(mappedToscaTemplate, ToscaTagNamesEnum.TOSCA_VERSION);
+        Either<String, ResultStatusEnum> findFirstToscaStringElement = ImportUtils.findFirstToscaStringElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.TOSCA_VERSION);
 
         if (findFirstToscaStringElement.isRight()) {
             isValid = false;
@@ -360,7 +351,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
         boolean isValid;
         String nameSpace = "";
         Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(toscaPayload);
-        Either<Map<String, Object>, ResultStatusEnum> toscaElement = ImportUtils.findFirstToscaMapElement(mappedToscaTemplate, ToscaTagNamesEnum.NODE_TYPES);
+        Either<Map<String, Object>, ResultStatusEnum> toscaElement = ImportUtils.findFirstToscaMapElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.NODE_TYPES);
         if (toscaElement.isRight() || toscaElement.left().value().size() != 1) {
             isValid = false;
         } else {
@@ -389,7 +380,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
         log.debug("checking payload contains single resource");
         boolean isValid;
         Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(toscaPayload);
-        Either<Map<String, Object>, ResultStatusEnum> toscaElement = ImportUtils.findFirstToscaMapElement(mappedToscaTemplate, ToscaTagNamesEnum.NODE_TYPES);
+        Either<Map<String, Object>, ResultStatusEnum> toscaElement = ImportUtils.findFirstToscaMapElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.NODE_TYPES);
         if (toscaElement.isRight()) {
             isValid = false;
         } else {
@@ -408,7 +399,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
     protected void validatePayloadIsNotService(Wrapper<Response> responseWrapper, User user, UploadResourceInfo uploadResourceInfo, String toscaPayload) {
         log.debug("checking payload is not a tosca service");
         Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(toscaPayload);
-        Either<Object, ResultStatusEnum> toscaElement = ImportUtils.findToscaElement(mappedToscaTemplate, ToscaTagNamesEnum.TOPOLOGY_TEMPLATE, ToscaElementTypeEnum.ALL);
+        Either<Object, ResultStatusEnum> toscaElement = ImportUtils.findToscaElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.TOPOLOGY_TEMPLATE, ToscaElementTypeEnum.ALL);
 
         if (toscaElement.isLeft()) {
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.NOT_RESOURCE_TOSCA_TEMPLATE);
@@ -617,14 +608,13 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
 
 
     protected void handleImport(Wrapper<Response> responseWrapper, User user, UploadResourceInfo resourceInfoObject, String yamlAsString, ResourceAuthorityTypeEnum authority, boolean createNewVersion, String resourceUniqueId) {
-        Either<ImmutablePair<org.openecomp.sdc.be.model.Resource, ActionStatus>, ResponseFormat> createOrUpdateResponse;
-        Response response;
+        Either<ImmutablePair<Resource, ActionStatus>, ResponseFormat> createOrUpdateResponse = null;
+        Response response = null;
         Object representation = null;
-
+        ImmutablePair<Resource, ActionStatus> importedResourceStatus = null;
         if (CsarValidationUtils.isCsarPayloadName(resourceInfoObject.getPayloadName())) {
             log.debug("import resource from csar");
-
-            createOrUpdateResponse = importResourceFromUICsar(resourceInfoObject, user, resourceUniqueId);
+            importedResourceStatus = importResourceFromUICsar(resourceInfoObject, user, resourceUniqueId);
         } else if (!authority.isUserTypeResource()) {
             log.debug("import normative type resource");
             createOrUpdateResponse = resourceImportManager.importNormativeResource(yamlAsString, resourceInfoObject, user, createNewVersion, true);
@@ -632,57 +622,56 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
             log.debug("import user resource (not normative type)");
             createOrUpdateResponse = resourceImportManager.importUserDefinedResource(yamlAsString, resourceInfoObject, user,  false);
         }
-        if (createOrUpdateResponse.isRight()) {
-            response = buildErrorResponse(createOrUpdateResponse.right().value());
-        } else {
+        if (createOrUpdateResponse!= null){
+            if(createOrUpdateResponse.isRight()){
+                response = buildErrorResponse(createOrUpdateResponse.right().value());
+            }else {
+                importedResourceStatus = createOrUpdateResponse.left().value();
+            }
+        }
+        if(importedResourceStatus != null){
             try {
-                representation = RepresentationUtils.toRepresentation(createOrUpdateResponse.left().value().getLeft());
+                representation = RepresentationUtils.toRepresentation(importedResourceStatus.left);
             } catch (IOException e) {
                 log.debug("Error while building resource representation : {}", e.getMessage(), e);
             }
-            ActionStatus successStatus = createOrUpdateResponse.left().value().right;
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(successStatus), representation);
+            response = buildOkResponse(getComponentsUtils().getResponseFormat(importedResourceStatus.right), representation);
         }
         responseWrapper.setInnerElement(response);
     }
 
-    private Either<ImmutablePair<org.openecomp.sdc.be.model.Resource, ActionStatus>, ResponseFormat> importResourceFromUICsar(UploadResourceInfo resourceInfoObject, User user, String resourceUniqueId) {
+    private ImmutablePair<Resource, ActionStatus> importResourceFromUICsar(UploadResourceInfo resourceInfoObject, User user, String resourceUniqueId) {
 
-        Either<org.openecomp.sdc.be.model.Resource, ResponseFormat> createOrUpdateResourceRes;
-        ImmutablePair<org.openecomp.sdc.be.model.Resource, ActionStatus> result = null;
+        Resource newResource;
+        ImmutablePair<Resource, ActionStatus> result = null;
         ActionStatus actionStatus;
-        org.openecomp.sdc.be.model.Resource resource = new org.openecomp.sdc.be.model.Resource();
+        Resource resource = new Resource();
         String payloadName = resourceInfoObject.getPayloadName();
         fillResourceFromResourceInfoObject(resource, resourceInfoObject);
 
-        Either<Map<String, byte[]>, ResponseFormat> csarUIPayloadRes = getScarFromPayload(resourceInfoObject);
+        Either<Map<String, byte[]>, ResponseFormat> csarUIPayloadRes = getCsarFromPayload(resourceInfoObject);
         if (csarUIPayloadRes.isRight()) {
-            return Either.right(csarUIPayloadRes.right().value());
+            throw new ComponentException(csarUIPayloadRes.right().value());
         }
         Map<String, byte[]> csarUIPayload = csarUIPayloadRes.left().value();
 
-        createOrUpdateResourceRes = getAndValidateCsarYaml(csarUIPayload, resource, user, payloadName);
-        if (createOrUpdateResourceRes.isRight()) {
-            return Either.right(createOrUpdateResourceRes.right().value());
-        }
+        getAndValidateCsarYaml(csarUIPayload, resource, user, payloadName);
+
         if (resourceUniqueId == null || resourceUniqueId.isEmpty()) {
-            createOrUpdateResourceRes = resourceImportManager.getResourceBusinessLogic().createResource(resource, AuditingActionEnum.CREATE_RESOURCE, user, csarUIPayload, payloadName);
-            if (createOrUpdateResourceRes.isRight()) {
-                return Either.right(createOrUpdateResourceRes.right().value());
-            }
+            newResource = resourceImportManager.getResourceBusinessLogic().createResource(resource, AuditingActionEnum.CREATE_RESOURCE, user, csarUIPayload, payloadName);
             actionStatus = ActionStatus.CREATED;
         } else {
-            createOrUpdateResourceRes = resourceImportManager.getResourceBusinessLogic().validateAndUpdateResourceFromCsar(resource, user, csarUIPayload, payloadName, resourceUniqueId);
-            if (createOrUpdateResourceRes.isRight()) {
-                return Either.right(createOrUpdateResourceRes.right().value());
-            }
+            newResource = resourceImportManager.getResourceBusinessLogic().validateAndUpdateResourceFromCsar(resource, user, csarUIPayload, payloadName, resourceUniqueId);
             actionStatus = ActionStatus.OK;
         }
-        result = new ImmutablePair<org.openecomp.sdc.be.model.Resource, ActionStatus>(createOrUpdateResourceRes.left().value(), actionStatus);
-        return Either.left(result);
+        return new ImmutablePair<>(newResource, actionStatus);
+    }
+
+    private Resource throwComponentException(ResponseFormat responseFormat) {
+        throw new ComponentException(responseFormat);
     }
 
-    private Either<org.openecomp.sdc.be.model.Resource, ResponseFormat> getAndValidateCsarYaml(Map<String, byte[]> csarUIPayload, org.openecomp.sdc.be.model.Resource resource, User user, String csarUUID) {
+    private void getAndValidateCsarYaml(Map<String, byte[]> csarUIPayload, Resource resource, User user, String csarUUID) {
 
         Either<ImmutablePair<String, String>, ResponseFormat> getToscaYamlRes = CsarValidationUtils.getToscaYaml(csarUIPayload, csarUUID, getComponentsUtils());
 
@@ -691,7 +680,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
             log.debug("Error when try to get csar toscayamlFile with csar ID {}, error: {}", csarUUID, responseFormat);
             BeEcompErrorManager.getInstance().logBeDaoSystemError("Creating resource from CSAR: fetching CSAR with id " + csarUUID + " failed");
             getComponentsUtils().auditResource(responseFormat, user, resource, AuditingActionEnum.CREATE_RESOURCE);
-            return Either.right(responseFormat);
+            throwComponentException(responseFormat);
         }
         String toscaYaml = getToscaYamlRes.left().value().getValue();
 
@@ -701,13 +690,12 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
         if (!isValid) {
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_YAML_FILE);
             getComponentsUtils().auditResource(responseFormat, user, resource, AuditingActionEnum.IMPORT_RESOURCE);
-            return Either.right(responseFormat);
+            throwComponentException(responseFormat);
         }
 
         log.debug("checking payload is valid tosca");
-        String heatDecodedPayload = toscaYaml;
-        Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(heatDecodedPayload);
-        Either<String, ResultStatusEnum> findFirstToscaStringElement = ImportUtils.findFirstToscaStringElement(mappedToscaTemplate, ToscaTagNamesEnum.TOSCA_VERSION);
+        Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(toscaYaml);
+        Either<String, ResultStatusEnum> findFirstToscaStringElement = ImportUtils.findFirstToscaStringElement(mappedToscaTemplate, TypeUtils.ToscaTagNamesEnum.TOSCA_VERSION);
 
         if (findFirstToscaStringElement.isRight()) {
             isValid = false;
@@ -723,22 +711,21 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
         if (!isValid) {
             ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.INVALID_TOSCA_TEMPLATE);
             getComponentsUtils().auditResource(responseFormat, user, resource, AuditingActionEnum.IMPORT_RESOURCE);
-            return Either.right(responseFormat);
+            throwComponentException(responseFormat);
         }
-        return Either.left(resource);
     }
 
-    private void fillResourceFromResourceInfoObject(org.openecomp.sdc.be.model.Resource resource, UploadResourceInfo resourceInfoObject) {
+    private void fillResourceFromResourceInfoObject(Resource resource, UploadResourceInfo resourceInfoObject) {
         resourceImportManager.populateResourceMetadata(resourceInfoObject, resource);
         fillArtifacts(resource, resourceInfoObject);
 
     }
 
-    private void fillArtifacts(org.openecomp.sdc.be.model.Resource resource, UploadResourceInfo resourceInfoObject) {
+    private void fillArtifacts(Resource resource, UploadResourceInfo resourceInfoObject) {
         if (resource != null && resourceInfoObject != null) {
             List<UploadArtifactInfo> artifactList = resourceInfoObject.getArtifactList();
             if (artifactList != null) {
-                Map<String, ArtifactDefinition> artifactsHM = new HashMap<String, ArtifactDefinition>();
+                Map<String, ArtifactDefinition> artifactsHM = new HashMap<>();
                 for (UploadArtifactInfo artifact : artifactList) {
                     ArtifactDefinition artifactDef = new ArtifactDefinition();
                     artifactDef.setArtifactName(artifact.getArtifactName());
@@ -753,7 +740,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
         }
     }
 
-    private Either<Map<String, byte[]>, ResponseFormat> getScarFromPayload(UploadResourceInfo innerElement) {
+    private Either<Map<String, byte[]>, ResponseFormat> getCsarFromPayload(UploadResourceInfo innerElement) {
         String csarUUID = innerElement.getPayloadName();
         String payloadData = innerElement.getPayloadData();
         if (payloadData == null) {
@@ -805,7 +792,7 @@ public abstract class AbstractValidationsServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-        ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+        ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
         if (componentInstanceLogic == null) {
             log.debug("Unsupported component type {}", containerComponentType);
             errorWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AdditionalInformationServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AdditionalInformationServlet.java
index f06781094d..f8b83742d7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AdditionalInformationServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AdditionalInformationServlet.java
@@ -20,22 +20,9 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.AdditionalInformationBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -44,26 +31,25 @@ import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.model.AdditionalInformationDefinition;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Api(value = "Additional Information Servlet", description = "Additional Information Servlet")
 @Singleton
 public class AdditionalInformationServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(AdditionalInformationServlet.class);
+    private static final Logger log = Logger.getLogger(AdditionalInformationServlet.class);
 
     /**
      *
@@ -314,7 +300,7 @@ public class AdditionalInformationServlet extends BeGenericServlet {
             // create the new property
             AdditionalInformationBusinessLogic businessLogic = getBL(context);
 
-            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.createAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, null, userId);
+            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.createAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, userId);
 
             if (either.isRight()) {
                 ResponseFormat responseFormat = either.right().value();
@@ -366,7 +352,7 @@ public class AdditionalInformationServlet extends BeGenericServlet {
 
             additionalInfoParameterInfo.setUniqueId(labelId);
 
-            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.updateAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, null, userId);
+            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.updateAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, userId);
 
             if (either.isRight()) {
                 ResponseFormat responseFormat = either.right().value();
@@ -416,7 +402,7 @@ public class AdditionalInformationServlet extends BeGenericServlet {
             AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo();
             additionalInfoParameterInfo.setUniqueId(labelId);
 
-            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.deleteAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, null, userId);
+            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.deleteAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, userId);
 
             if (either.isRight()) {
                 ResponseFormat responseFormat = either.right().value();
@@ -466,7 +452,7 @@ public class AdditionalInformationServlet extends BeGenericServlet {
             AdditionalInfoParameterInfo additionalInfoParameterInfo = new AdditionalInfoParameterInfo();
             additionalInfoParameterInfo.setUniqueId(labelId);
 
-            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.getAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, null, userId);
+            Either<AdditionalInfoParameterInfo, ResponseFormat> either = businessLogic.getAdditionalInformation(nodeType, uniqueId, additionalInfoParameterInfo, userId);
 
             if (either.isRight()) {
                 ResponseFormat responseFormat = either.right().value();
@@ -512,7 +498,7 @@ public class AdditionalInformationServlet extends BeGenericServlet {
 
             AdditionalInformationBusinessLogic businessLogic = getBL(context);
 
-            Either<AdditionalInformationDefinition, ResponseFormat> either = businessLogic.getAllAdditionalInformation(nodeType, uniqueId, null, userId);
+            Either<AdditionalInformationDefinition, ResponseFormat> either = businessLogic.getAllAdditionalInformation(nodeType, uniqueId, userId);
             if (either.isRight()) {
                 ResponseFormat responseFormat = either.right().value();
                 log.info("Failed to update additional information property. Reason - {}", responseFormat);
@@ -538,8 +524,7 @@ public class AdditionalInformationServlet extends BeGenericServlet {
     private AdditionalInformationBusinessLogic getBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        AdditionalInformationBusinessLogic bl = webApplicationContext.getBean(AdditionalInformationBusinessLogic.class);
-        return bl;
+        return webApplicationContext.getBean(AdditionalInformationBusinessLogic.class);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ArchiveEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ArchiveEndpoint.java
new file mode 100644
index 0000000000..cf77514874
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ArchiveEndpoint.java
@@ -0,0 +1,156 @@
+package org.openecomp.sdc.be.servlets;
+
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.openecomp.sdc.be.components.impl.ArchiveBusinessLogic;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.catalog.CatalogComponent;
+import org.openecomp.sdc.common.api.Constants;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+
+@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Path("/v1/catalog")
+@Api(value = "Archive Endpoint")
+@Controller
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class ArchiveEndpoint {
+
+    private final ArchiveBusinessLogic archiveBusinessLogic;
+
+    public ArchiveEndpoint(ArchiveBusinessLogic archiveBusinessLogic) {
+        this.archiveBusinessLogic = archiveBusinessLogic;
+    }
+
+    @POST
+    @Path("/resources/{componentId}/archive")
+    @ApiOperation(value = "Archive Resource", httpMethod = "POST", notes = "Marks a resource as archived. Can be restored with restore action", response = String.class, responseContainer = "")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Archive successful"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 404, message = "Resource not found"),
+            @ApiResponse(code = 500, message = "Internal Error")
+    })
+    public Response archiveResources(@PathParam("componentId") final String componentId, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        archiveBusinessLogic.archiveComponent(ComponentTypeEnum.RESOURCE_PARAM_NAME, userId, componentId);
+        return Response.ok().build();
+    }
+
+    @POST
+    @Path("/resources/{componentId}/restore")
+    @ApiOperation(value = "Restore Resource", httpMethod = "POST", notes = "Restores a resource from archive.", response = String.class, responseContainer = "")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Restore successful"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 404, message = "Resource not found"),
+            @ApiResponse(code = 500, message = "Internal Error")
+    })
+    public Response restoreResource(@PathParam("componentId") final String componentId, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        archiveBusinessLogic.restoreComponent(ComponentTypeEnum.RESOURCE_PARAM_NAME, userId, componentId);
+        return Response.ok().build();
+    }
+
+    @POST
+    @Path("/services/{componentId}/archive")
+    @ApiOperation(value = "Archive Service", httpMethod = "POST", notes = "Marks a service as archived. Can be restored with restore action", response = String.class, responseContainer = "")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Archive successful"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 404, message = "Service not found"),
+            @ApiResponse(code = 500, message = "Internal Error")
+    })
+    public Response archiveService(@PathParam("componentId") final String componentId, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        archiveBusinessLogic.archiveComponent(ComponentTypeEnum.SERVICE_PARAM_NAME, userId, componentId);
+        return Response.ok().build();
+    }
+
+
+    @POST
+    @Path("/services/{componentId}/restore")
+    @ApiOperation(value = "Restore Service", httpMethod = "POST", notes = "Restores a service from archive.", response = String.class, responseContainer = "")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Restore successful"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 404, message = "Service not found"),
+            @ApiResponse(code = 500, message = "Internal Error")
+    })
+    public Response restoreService(@PathParam("componentId") final String componentId, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        archiveBusinessLogic.restoreComponent(ComponentTypeEnum.SERVICE_PARAM_NAME, userId, componentId);
+        return Response.ok().build();
+    }
+
+    @GET
+    @Path("/archive")
+    @ApiOperation(value = "Get all Archived Components", httpMethod = "GET", notes = "Get all Archived Components", response = String.class, responseContainer = "")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Success"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 500, message = "Internal Error")
+    })
+    public Map<String, List<CatalogComponent>> getArchivedComponents(@HeaderParam(value = Constants.USER_ID_HEADER) String userId){
+        return this.archiveBusinessLogic.getArchiveComponents(userId, new LinkedList<>());
+    }
+
+    @POST
+    @Path("/notif/vsp/archived")
+    @ApiOperation(value = "Notify about an archived VSP. All VFs with relation to the given CSAR IDs will be martked as vspArchived=true", httpMethod = "POST")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Success"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 500, message = "Internal Error. A list of the failed CSAR IDs may be returned.")
+    })
+    public Response onVspArchived(@HeaderParam(value = Constants.USER_ID_HEADER) String userId, @RequestBody List<String> csarIds){
+        List<String> failedCsarIds = this.archiveBusinessLogic.onVspArchive(userId, csarIds);
+        if (!failedCsarIds.isEmpty()){
+            //There are some failed CSAR IDs, return 500 and the list of failed CSAR IDs
+            Map<String, List<String>> entity = new HashMap<>();
+            entity.put("failedIds", failedCsarIds);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+                    .entity(entity)
+                    .build();
+        }
+        return Response.ok().build();
+    }
+
+    @POST
+    @Path("/notif/vsp/restored")
+    @ApiOperation(value = "Notify about a restored VSP. All VFs with relation to the given CSAR IDs will be martked as vspArchived=false", httpMethod = "POST")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Success"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 500, message = "Internal Error. A list of the failed CSAR IDs may be returned.")
+    })
+    public Response onVspRestored(@HeaderParam(value = Constants.USER_ID_HEADER) String userId, @RequestBody List<String> csarIds){
+        List<String> failedCsarIds = this.archiveBusinessLogic.onVspRestore(userId, csarIds);
+        if (!failedCsarIds.isEmpty()){
+            //There are some failed CSAR IDs, return 500 and the list of failed CSAR IDs
+            Map<String, List<String>> entity = new HashMap<>();
+            entity.put("failedIds", failedCsarIds);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+                    .entity(entity)
+                    .build();
+        }
+        return Response.ok().build();
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ArtifactServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ArtifactServlet.java
index ad4009d914..ddb1af4888 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ArtifactServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ArtifactServlet.java
@@ -20,23 +20,9 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
@@ -48,18 +34,17 @@ import org.openecomp.sdc.be.model.ArtifactDefinition;
 import org.openecomp.sdc.be.model.ArtifactUiDownloadData;
 import org.openecomp.sdc.be.model.Operation;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Map;
 /**
  * Root resource (exposed at "/" path)
  */
@@ -69,7 +54,7 @@ import io.swagger.annotations.ApiResponses;
 @Singleton
 public class ArtifactServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ArtifactServlet.class);
+    private static final Logger log = Logger.getLogger(ArtifactServlet.class);
 
     // *************** Resources
     @POST
@@ -496,11 +481,11 @@ public class ArtifactServlet extends BeGenericServlet {
     // ************ private *********************
 
     private Response handleUploadRequest(String data, HttpServletRequest request, String componentId, ComponentTypeEnum componentType) {
-        return handleArtifactRequest(data, request, componentId, null, componentType, ArtifactOperationEnum.CREATE);
+        return handleArtifactRequest(data, componentId, null, componentType, ArtifactOperationEnum.CREATE);
     }
 
     private Response handleUpdateRequest(String data, HttpServletRequest request, String componentId, String artifactId, ComponentTypeEnum componentType) {
-        return handleArtifactRequest(data, request, componentId, artifactId, componentType, ArtifactOperationEnum.UPDATE);
+        return handleArtifactRequest(data, componentId, artifactId, componentType, ArtifactOperationEnum.UPDATE);
     }
 
     private Response handleDownloadRequest(HttpServletRequest request, String componentId, String artifactId, String parentId, ComponentTypeEnum componentType, String containerComponentType) {
@@ -596,7 +581,7 @@ public class ArtifactServlet extends BeGenericServlet {
 
     }
 
-    private Response handleArtifactRequest(String data, HttpServletRequest request, String componentId, String artifactId, ComponentTypeEnum componentType, ArtifactOperationEnum operation) {
+    private Response handleArtifactRequest(String data, String componentId, String artifactId, ComponentTypeEnum componentType, ArtifactOperationEnum operation) {
         return handleArtifactRequest(data, servletRequest, componentId, null, null, artifactId, componentType, operation, null, null);
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java
index 90b5316b25..53bac884f0 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java
@@ -20,21 +20,11 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.AttributeBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -42,20 +32,17 @@ import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 /**
  * Web Servlet for actions on Attributes
  * 
@@ -67,7 +54,7 @@ import io.swagger.annotations.ApiResponses;
 @Api(value = "Resource Attribute Servlet", description = "Resource Attribute Servlet")
 @Singleton
 public class AttributeServlet extends AbstractValidationsServlet {
-    private static final Logger log = LoggerFactory.getLogger(AttributeServlet.class);
+    private static final Logger log = Logger.getLogger(AttributeServlet.class);
 
     /**
      * Creates new Attribute on a resource with given resource ID
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AutomatedUpgradeEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AutomatedUpgradeEndpoint.java
new file mode 100644
index 0000000000..3d31e66b1a
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AutomatedUpgradeEndpoint.java
@@ -0,0 +1,89 @@
+package org.openecomp.sdc.be.servlets;
+
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.*;
+import org.openecomp.sdc.be.components.upgrade.UpgradeBusinessLogic;
+import org.openecomp.sdc.be.components.upgrade.UpgradeRequest;
+import org.openecomp.sdc.be.components.upgrade.UpgradeStatus;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.dao.jsongraph.utils.JsonParserUtils;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.stereotype.Controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.List;
+
+@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Path("/v1/catalog")
+@Api(value = "policy types resource")
+@Controller
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class AutomatedUpgradeEndpoint extends BeGenericServlet {
+    private static final Logger log = Logger.getLogger(PolicyTypesEndpoint.class);
+
+    private final UpgradeBusinessLogic businessLogic;
+
+    public AutomatedUpgradeEndpoint(UpgradeBusinessLogic businessLogic) {
+        this.businessLogic = businessLogic;
+    }
+    
+    
+    @POST
+    @Path("/{componentType}/{componentId}/automatedupgrade")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "Autometed upgrade", httpMethod = "POST", notes = "....", response = Resource.class)
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "Component found"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 404, message = "Component not found") })
+    public Response autometedUpgrade(@PathParam("componentType") final String componentType, @Context final HttpServletRequest request, @PathParam("componentId") final String componentId, @HeaderParam(value = Constants.USER_ID_HEADER) String userId,
+            @ApiParam(value = "json describes upgrade request", required = true) String data) {
+
+     
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug("(POST) Start handle request of {}", url);
+
+        try {
+            
+            List<UpgradeRequest> inputsToUpdate = JsonParserUtils.toList(data, UpgradeRequest.class);
+            
+            if (log.isDebugEnabled()) {
+                log.debug("Received upgrade requests size is {}", inputsToUpdate == null ? 0 : inputsToUpdate.size());
+            }
+            UpgradeStatus actionResponse = businessLogic.automatedUpgrade(componentId, inputsToUpdate, userId);
+            
+            return actionResponse.getStatus() == ActionStatus.OK ? buildOkResponse(actionResponse) : buildErrorResponse(actionResponse.getError());
+
+        } catch (Exception e) {
+            log.error("#autometedUpgrade - Exception occurred during autometed Upgrade", e);
+             return buildGeneralErrorResponse();
+        }
+    }
+    
+    @GET
+    @Path("/{componentType}/{componentId}/dependencies")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "Autometed upgrade", httpMethod = "POST", notes = "....", response = Resource.class)
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "Component found"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 404, message = "Component not found") })
+    public Response getComponentDependencies(@PathParam("componentType") final String componentType, @Context final HttpServletRequest request, @PathParam("componentId") final String componentId, @HeaderParam(value = Constants.USER_ID_HEADER) String userId,
+            @ApiParam(value = "Consumer Object to be created", required = true) List<String> data) {
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug("(GET) Start handle request of {}", url);
+
+        try {
+            return  businessLogic.getComponentDependencies(componentId, userId)
+                    .either(this::buildOkResponse, this::buildErrorResponse);  
+        } catch (Exception e) {
+            log.error("#getServicesForComponent - Exception occurred during autometed Upgrade", e);
+            return buildGeneralErrorResponse();
+        }
+     
+        
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java
index 9d23184335..5b8d6dcc17 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeGenericServlet.java
@@ -20,33 +20,16 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.function.Supplier;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-
-import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ElementBusinessLogic;
-import org.openecomp.sdc.be.components.impl.GroupBusinessLogic;
-import org.openecomp.sdc.be.components.impl.InterfaceOperationBusinessLogic;
-import org.openecomp.sdc.be.components.impl.MonitoringBusinessLogic;
-import org.openecomp.sdc.be.components.impl.PolicyBusinessLogic;
-import org.openecomp.sdc.be.components.impl.PolicyTypeBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ProductBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import fj.data.Either;
+import org.openecomp.sdc.be.components.impl.*;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.components.scheduledtasks.ComponentsCleanBusinessLogic;
+import org.openecomp.sdc.be.components.upgrade.UpgradeBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.api.IElementDAO;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
@@ -58,24 +41,26 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.servlets.BasicServlet;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
-import fj.data.Either;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.function.Supplier;
 
 public class BeGenericServlet extends BasicServlet {
 
     @Context
     protected HttpServletRequest servletRequest;
 
-    private static final Logger log = LoggerFactory.getLogger(BeGenericServlet.class);
+    private static final Logger log = Logger.getLogger(BeGenericServlet.class);
 
     /******************** New error response mechanism
      * @param requestErrorWrapper **************/
@@ -92,7 +77,7 @@ public class BeGenericServlet extends BasicServlet {
         return buildOkResponseStatic(entity);
     }
 
-    static public Response buildOkResponseStatic(Object entity) {
+    private static Response buildOkResponseStatic(Object entity) {
         return Response.status(Response.Status.OK)
                 .entity(entity)
                 .build();
@@ -137,22 +122,19 @@ public class BeGenericServlet extends BasicServlet {
 
     }
 
-    protected PolicyTypeBusinessLogic getPolicyTypeBL(ServletContext context) {
-        return getClassFromWebAppContext(context, () -> PolicyTypeBusinessLogic.class);
-    }
-
-    protected UserBusinessLogic getUserAdminManager(ServletContext context) {
+    UserBusinessLogic getUserAdminManager(ServletContext context) {
         return getClassFromWebAppContext(context, () -> UserBusinessLogic.class);
     }
 
     protected ResourceBusinessLogic getResourceBL(ServletContext context) {
         return getClassFromWebAppContext(context, () -> ResourceBusinessLogic.class);
     }
+
     protected InterfaceOperationBusinessLogic getInterfaceOperationBL(ServletContext context) {
         return getClassFromWebAppContext(context, () -> InterfaceOperationBusinessLogic.class);
     }
 
-    protected ComponentsCleanBusinessLogic getComponentCleanerBL(ServletContext context) {
+    ComponentsCleanBusinessLogic getComponentCleanerBL(ServletContext context) {
         return getClassFromWebAppContext(context, () -> ComponentsCleanBusinessLogic.class);
     }
 
@@ -160,19 +142,22 @@ public class BeGenericServlet extends BasicServlet {
         return getClassFromWebAppContext(context, () -> ServiceBusinessLogic.class);
     }
 
-    protected ProductBusinessLogic getProductBL(ServletContext context) {
+    ProductBusinessLogic getProductBL(ServletContext context) {
         return getClassFromWebAppContext(context, () -> ProductBusinessLogic.class);
     }
 
     protected ArtifactsBusinessLogic getArtifactBL(ServletContext context) {
         return getClassFromWebAppContext(context, () -> ArtifactsBusinessLogic.class);
     }
+    protected UpgradeBusinessLogic getUpgradeBL(ServletContext context) {
+        return getClassFromWebAppContext(context, () -> UpgradeBusinessLogic.class);
+    }
 
     protected ElementBusinessLogic getElementBL(ServletContext context) {
         return getClassFromWebAppContext(context, () -> ElementBusinessLogic.class);
     }
 
-    protected MonitoringBusinessLogic getMonitoringBL(ServletContext context) {
+    MonitoringBusinessLogic getMonitoringBL(ServletContext context) {
         return getClassFromWebAppContext(context, () -> MonitoringBusinessLogic.class);
     }
 
@@ -184,37 +169,25 @@ public class BeGenericServlet extends BasicServlet {
         return getClassFromWebAppContext(context, () -> LifecycleBusinessLogic.class);
     }
 
-    protected PolicyBusinessLogic getPolicyBL(ServletContext context) {
-        return getClassFromWebAppContext(context, () -> PolicyBusinessLogic.class);
-    }
-
-    protected <T> T getClassFromWebAppContext(ServletContext context, Supplier<Class<T>> businessLogicClassGen) {
+    <T> T getClassFromWebAppContext(ServletContext context, Supplier<Class<T>> businessLogicClassGen) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
         return webApplicationContext.getBean(businessLogicClassGen.get());
     }
 
-    protected GroupBusinessLogic getGroupBL(ServletContext context) {
+    GroupBusinessLogic getGroupBL(ServletContext context) {
 
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
         return webApplicationContext.getBean(GroupBusinessLogic.class);
     }
 
-    protected ComponentInstanceBusinessLogic getComponentInstanceBL(ServletContext context, ComponentTypeEnum containerComponentType) {
+    protected ComponentInstanceBusinessLogic getComponentInstanceBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
         return webApplicationContext.getBean(ComponentInstanceBusinessLogic.class);
     }
 
-    protected IElementDAO getElementDao(Class<? extends IElementDAO> clazz, ServletContext context) {
-        WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
-
-        WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-
-        return webApplicationContext.getBean(clazz);
-    }
-
     protected ComponentsUtils getComponentsUtils() {
         ServletContext context = this.servletRequest.getSession().getServletContext();
 
@@ -229,7 +202,7 @@ public class BeGenericServlet extends BasicServlet {
      *
      * @return
      */
-    protected String initHeaderParam(String headerValue, HttpServletRequest request, String headerName) {
+    String initHeaderParam(String headerValue, HttpServletRequest request, String headerName) {
         String retValue;
         if (headerValue != null) {
             retValue = headerValue;
@@ -242,6 +215,8 @@ public class BeGenericServlet extends BasicServlet {
     protected String getContentDispositionValue(String artifactFileName) {
         return new StringBuilder().append("attachment; filename=\"").append(artifactFileName).append("\"").toString();
     }
+    
+    
 
     protected ComponentBusinessLogic getComponentBL(ComponentTypeEnum componentTypeEnum, ServletContext context) {
         ComponentBusinessLogic businessLogic;
@@ -265,7 +240,7 @@ public class BeGenericServlet extends BasicServlet {
         return businessLogic;
     }
 
-    protected <T> void convertJsonToObjectOfClass(String json, Wrapper<T> policyWrapper, Class<T> clazz, Wrapper<Response> errorWrapper) {
+    <T> void convertJsonToObjectOfClass(String json, Wrapper<T> policyWrapper, Class<T> clazz, Wrapper<Response> errorWrapper) {
         T object = null;
         ObjectMapper mapper = new ObjectMapper()
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java
index 516ba57637..42dc7b3c18 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/BeMonitoringServlet.java
@@ -20,20 +20,14 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.List;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.apache.commons.lang3.tuple.Pair;
 import org.openecomp.sdc.be.components.health.HealthCheckBusinessLogic;
 import org.openecomp.sdc.be.components.impl.MonitoringBusinessLogic;
@@ -43,21 +37,20 @@ import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.api.HealthCheckInfo;
 import org.openecomp.sdc.common.api.HealthCheckWrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.monitoring.MonitoringEvent;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.List;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.TRACE, trim = false)
 @Path("/")
 @Api(value = "BE Monitoring", description = "BE Monitoring")
@@ -66,7 +59,7 @@ public class BeMonitoringServlet extends BeGenericServlet {
 
     Gson prettyGson = new GsonBuilder().setPrettyPrinting().create();
 
-    private static final Logger log = LoggerFactory.getLogger(ConfigServlet.class);
+    private static final Logger log = Logger.getLogger(ConfigServlet.class);
 
     @GET
     @Path("/healthCheck")
@@ -157,8 +150,7 @@ public class BeMonitoringServlet extends BeGenericServlet {
 
     private String getVersionFromContext(HttpServletRequest request) {
         ServletContext servletContext = request.getSession().getServletContext();
-        String version = (String) servletContext.getAttribute(Constants.ASDC_RELEASE_VERSION_ATTR);
-        return version;
+        return (String) servletContext.getAttribute(Constants.ASDC_RELEASE_VERSION_ATTR);
     }
 
     protected MonitoringEvent convertContentToJson(String content, Class<MonitoringEvent> clazz) {
@@ -177,8 +169,7 @@ public class BeMonitoringServlet extends BeGenericServlet {
     private HealthCheckBusinessLogic getHealthCheckBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        HealthCheckBusinessLogic healthCheckBl = webApplicationContext.getBean(HealthCheckBusinessLogic.class);
-        return healthCheckBl;
+        return webApplicationContext.getBean(HealthCheckBusinessLogic.class);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java
index 072ab0c984..dec12d770f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java
@@ -20,30 +20,13 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.io.InputStream;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.openecomp.sdc.be.components.impl.ComponentInstanceBusinessLogic;
@@ -55,32 +38,26 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.info.CreateAndAssotiateInfo;
 import org.openecomp.sdc.be.info.GroupDefinitionInfo;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.PropertyConstraint;
-import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintDeserialiser;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
 
 /**
  * Root resource (exposed at "/" path) .json
@@ -91,12 +68,21 @@ import io.swagger.annotations.ApiResponses;
 @Singleton
 public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ComponentInstanceServlet.class);
-
-    Type constraintType = new TypeToken<PropertyConstraint>() {
-    }.getType();
-
-    Gson gson = new GsonBuilder().registerTypeAdapter(constraintType, new PropertyConstraintDeserialiser()).create();
+    private static final String FAILED_TO_GET_PROPERTIES_OF_COMPONENT_INSTANCE_ID_IN_WITH_ID = "Failed to get properties of component instance ID: {} in {} with ID: {}";
+	private static final String GET_GROUP_ARTIFACT_BY_ID = "getGroupArtifactById";
+	private static final String GET_GROUP_ARTIFACT_BY_ID_UNEXPECTED_EXCEPTION = "getGroupArtifactById unexpected exception";
+	private static final String GET_START_HANDLE_REQUEST_OF = "(GET) Start handle request of {}";
+	private static final String START_HANDLE_REQUEST_OF_UPDATE_RESOURCE_INSTANCE_PROPERTY_RECEIVED_PROPERTY_IS = "Start handle request of updateResourceInstanceProperty. Received property is {}";
+	private static final String UPDATE_RESOURCE_INSTANCE = "Update Resource Instance";
+	private static final String RESOURCE_INSTANCE_UPDATE_RESOURCE_INSTANCE = "Resource Instance - updateResourceInstance";
+	private static final String UPDATE_RESOURCE_INSTANCE_WITH_EXCEPTION = "update resource instance with exception";
+	private static final String FAILED_TO_CONVERT_RECEIVED_DATA_TO_BE_FORMAT = "Failed to convert received data to BE format.";
+	private static final String EMPTY_BODY_WAS_SENT = "Empty body was sent.";
+	private static final String START_HANDLE_REQUEST_OF = "Start handle request of {}";
+	private static final String UNSUPPORTED_COMPONENT_TYPE = "Unsupported component type {}";
+	private static final Logger log = Logger.getLogger(ComponentInstanceServlet.class);
+    private static final Type PROPERTY_CONSTRAINT_TYPE = new TypeToken<PropertyConstraint>() {}.getType();
+    private static final Gson gsonDeserializer = new GsonBuilder().registerTypeAdapter(PROPERTY_CONSTRAINT_TYPE, new PropertyConstraintDeserialiser()).create();
 
     @POST
     @Path("/{containerComponentType}/{componentId}/resourceInstance")
@@ -115,9 +101,9 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             ComponentInstance componentInstance = RepresentationUtils.fromRepresentation(data, ComponentInstance.class);
             componentInstance.setInvariantName(null);
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
             Either<ComponentInstance, ResponseFormat> actionResponse = componentInstanceLogic.createComponentInstance(containerComponentType, containerComponentId, userId, componentInstance);
@@ -147,17 +133,17 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         try {
 
-            log.debug("Start handle request of {}", url);
+            log.debug(START_HANDLE_REQUEST_OF, url);
 
             InputStream inputStream = request.getInputStream();
 
             byte[] bytes = IOUtils.toByteArray(inputStream);
 
             if (bytes == null || bytes.length == 0) {
-                log.info("Empty body was sent.");
+                log.info(EMPTY_BODY_WAS_SENT);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
             }
 
@@ -165,16 +151,16 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
             String data = new String(bytes);
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
             Either<ComponentInstance, ResponseFormat> convertResponse = convertToResourceInstance(data);
 
             if (convertResponse.isRight()) {
-                BeEcompErrorManager.getInstance().logBeSystemError("Resource Instance - updateResourceInstance");
-                log.debug("Failed to convert received data to BE format.");
+                BeEcompErrorManager.getInstance().logBeSystemError(RESOURCE_INSTANCE_UPDATE_RESOURCE_INSTANCE);
+                log.debug(FAILED_TO_CONVERT_RECEIVED_DATA_TO_BE_FORMAT);
                 return buildErrorResponse(convertResponse.right().value());
             }
 
@@ -187,8 +173,8 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Resource Instance");
-            log.debug("update resource instance with exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(UPDATE_RESOURCE_INSTANCE);
+            log.debug(UPDATE_RESOURCE_INSTANCE_WITH_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
@@ -207,10 +193,10 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         try {
-            log.debug("Start handle request of {}", url);
+            log.debug(START_HANDLE_REQUEST_OF, url);
 
             if (componentInstanceJsonArray == null || componentInstanceJsonArray.length() == 0) {
                 log.info("Empty JSON list was sent.");
@@ -220,9 +206,9 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             String userId = request.getHeader(Constants.USER_ID_HEADER);
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
@@ -230,14 +216,14 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
             if (convertResponse.isRight()) {
                 // Using both ECOMP error methods, show to Sofer
-                BeEcompErrorManager.getInstance().logBeSystemError("Resource Instance - updateResourceInstance");
-                log.debug("Failed to convert received data to BE format.");
+                BeEcompErrorManager.getInstance().logBeSystemError(RESOURCE_INSTANCE_UPDATE_RESOURCE_INSTANCE);
+                log.debug(FAILED_TO_CONVERT_RECEIVED_DATA_TO_BE_FORMAT);
                 return buildErrorResponse(convertResponse.right().value());
             }
 
             List<ComponentInstance> componentInstanceList = convertResponse.left().value();
 
-            Either<List<ComponentInstance>, ResponseFormat> actionResponse = componentInstanceLogic.updateComponentInstance(containerComponentType, componentId, userId, componentInstanceList, true, true);
+            Either<List<ComponentInstance>, ResponseFormat> actionResponse = componentInstanceLogic.updateComponentInstance(containerComponentType, componentId, userId, componentInstanceList, true);
 
             if (actionResponse.isRight()) {
                 return buildErrorResponse(actionResponse.right().value());
@@ -246,8 +232,8 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Resource Instance");
-            log.debug("update resource instance with exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(UPDATE_RESOURCE_INSTANCE);
+            log.debug(UPDATE_RESOURCE_INSTANCE_WITH_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
@@ -267,11 +253,11 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         String url = request.getMethod() + " " + request.getRequestURI();
         Response response = null;
         try {
-            log.debug("Start handle request of {}", url);
+            log.debug(START_HANDLE_REQUEST_OF, url);
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
             String userId = request.getHeader(Constants.USER_ID_HEADER);
@@ -305,17 +291,17 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         Response response = null;
 
         try {
 
-            log.debug("Start handle request of {}", url);
+            log.debug(START_HANDLE_REQUEST_OF, url);
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
@@ -324,10 +310,11 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             Either<RequirementCapabilityRelDef, ResponseFormat> resultOp;
             if (regInfoW.isRight()) {
                 BeEcompErrorManager.getInstance().logBeSystemError("Resource Instance - associateRIToRI");
-                log.debug("Failed to convert received data to BE format.");
+                log.debug(FAILED_TO_CONVERT_RECEIVED_DATA_TO_BE_FORMAT);
                 resultOp = Either.right(regInfoW.right().value());
             } else {
                 RequirementCapabilityRelDef requirementDef = regInfoW.left().value();
+                requirementDef.setOriginUI(true);
                 resultOp = componentInstanceLogic.associateRIToRI(componentId, userId, requirementDef, componentTypeEnum);
             }
 
@@ -361,23 +348,23 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         try {
 
-            log.debug("Start handle request of {}", url);
+            log.debug(START_HANDLE_REQUEST_OF, url);
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
             Either<RequirementCapabilityRelDef, ResponseFormat> regInfoW = convertToRequirementCapabilityRelDef(data);
             if (regInfoW.isRight()) {
                 BeEcompErrorManager.getInstance().logBeSystemError("Resource Instance - dissociateRIFromRI");
-                log.debug("Failed to convert received data to BE format.");
+                log.debug(FAILED_TO_CONVERT_RECEIVED_DATA_TO_BE_FORMAT);
                 return buildErrorResponse(regInfoW.right().value());
             }
 
@@ -409,17 +396,17 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         try {
 
-            log.debug("Start handle request of {}", url);
+            log.debug(START_HANDLE_REQUEST_OF, url);
 
             InputStream inputStream = request.getInputStream();
 
             byte[] bytes = IOUtils.toByteArray(inputStream);
 
             if (bytes == null || bytes.length == 0) {
-                log.info("Empty body was sent.");
+                log.info(EMPTY_BODY_WAS_SENT);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
             }
 
@@ -428,21 +415,23 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             String data = new String(bytes);
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
             Either<CreateAndAssotiateInfo, ActionStatus> convertStatus = convertJsonToObject(data, CreateAndAssotiateInfo.class);
             if (convertStatus.isRight()) {
                 BeEcompErrorManager.getInstance().logBeSystemError("Resource Instance - createAndAssociateRIToRI");
-                log.debug("Failed to convert received data to BE format.");
+                log.debug(FAILED_TO_CONVERT_RECEIVED_DATA_TO_BE_FORMAT);
                 Either<Object, ResponseFormat> formattedResponse = Either.right(getComponentsUtils().getResponseFormat(convertStatus.right().value()));
                 return buildErrorResponse(formattedResponse.right().value());
             }
 
             CreateAndAssotiateInfo createAndAssotiateInfo = convertStatus.left().value();
+            RequirementCapabilityRelDef requirementDef = createAndAssotiateInfo.getAssociate();
+            requirementDef.setOriginUI(true);
             Either<CreateAndAssotiateInfo, ResponseFormat> actionResponse = componentInstanceLogic.createAndAssociateRIToRI(containerComponentType, componentId, userId, createAndAssotiateInfo);
 
             if (actionResponse.isRight()) {
@@ -468,7 +457,7 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             @Context final HttpServletRequest request, @ApiParam(value = "Component Instance Properties JSON Array", required = true) final String componentInstancePropertiesJsonArray) {
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         try {
             Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
@@ -486,14 +475,14 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
                 return buildErrorResponse(errorWrapper.getInnerElement());
             }
 
-            log.debug("Start handle request of updateResourceInstanceProperty. Received property is {}", propertiesToUpdate);
+            log.debug(START_HANDLE_REQUEST_OF_UPDATE_RESOURCE_INSTANCE_PROPERTY_RECEIVED_PROPERTY_IS, propertiesToUpdate);
 
             ServletContext context = request.getSession().getServletContext();
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
@@ -527,7 +516,7 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             @Context final HttpServletRequest request, @ApiParam(value = "Component Instance Properties JSON Array", required = true) final String componentInstanceInputsJsonArray) {
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         try {
             Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
@@ -544,14 +533,14 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
                 return buildErrorResponse(errorWrapper.getInnerElement());
             }
 
-            log.debug("Start handle request of updateResourceInstanceProperty. Received property is {}", inputsToUpdate);
+            log.debug(START_HANDLE_REQUEST_OF_UPDATE_RESOURCE_INSTANCE_PROPERTY_RECEIVED_PROPERTY_IS, inputsToUpdate);
 
             ServletContext context = request.getSession().getServletContext();
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
@@ -596,7 +585,7 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             @Context final HttpServletRequest request) {
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         try {
 
@@ -650,13 +639,13 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         try {
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
@@ -684,13 +673,13 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         try (    InputStream inputStream = request.getInputStream()) {
 
             byte[] bytes = IOUtils.toByteArray(inputStream);
 
             if (bytes == null || bytes.length == 0) {
-                log.info("Empty body was sent.");
+                log.info(EMPTY_BODY_WAS_SENT);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
             }
 
@@ -699,17 +688,17 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             String data = new String(bytes);
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
             Either<ComponentInstance, ResponseFormat> convertResponse = convertToResourceInstance(data);
 
             if (convertResponse.isRight()) {
-                BeEcompErrorManager.getInstance().logBeSystemError("Resource Instance - updateResourceInstance");
-                log.debug("Failed to convert received data to BE format.");
+                BeEcompErrorManager.getInstance().logBeSystemError(RESOURCE_INSTANCE_UPDATE_RESOURCE_INSTANCE);
+                log.debug(FAILED_TO_CONVERT_RECEIVED_DATA_TO_BE_FORMAT);
                 return buildErrorResponse(convertResponse.right().value());
             }
 
@@ -722,8 +711,8 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Resource Instance");
-            log.debug("update resource instance with exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(UPDATE_RESOURCE_INSTANCE);
+            log.debug(UPDATE_RESOURCE_INSTANCE_WITH_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
@@ -741,7 +730,7 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             @ApiParam(value = "id of user initiating the operation") @HeaderParam(value = Constants.USER_ID_HEADER) String userId, @Context final HttpServletRequest request) {
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         try {
             Wrapper<String> dataWrapper = new Wrapper<>();
@@ -760,14 +749,14 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
             ComponentInstanceProperty property = propertyWrapper.getInnerElement();
 
-            log.debug("Start handle request of updateResourceInstanceProperty. Received property is {}", property);
+            log.debug(START_HANDLE_REQUEST_OF_UPDATE_RESOURCE_INSTANCE_PROPERTY_RECEIVED_PROPERTY_IS, property);
 
             ServletContext context = request.getSession().getServletContext();
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
 
@@ -799,7 +788,7 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             @PathParam("groupInstId") final String groupInstId, @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("(GET) Start handle request of {}", url);
+        log.debug(GET_START_HANDLE_REQUEST_OF, url);
 
         try {
 
@@ -815,8 +804,8 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("getGroupArtifactById");
-            log.debug("getGroupArtifactById unexpected exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(GET_GROUP_ARTIFACT_BY_ID);
+            log.debug(GET_GROUP_ARTIFACT_BY_ID_UNEXPECTED_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
@@ -834,23 +823,23 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("(GET) Start handle request of {}", url);
+        log.debug(GET_START_HANDLE_REQUEST_OF, url);
 
         try {
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceBL = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceBL = getComponentInstanceBL(context);
 
             Either<List<ComponentInstanceProperty>, ResponseFormat> componentInstancePropertiesById = componentInstanceBL.getComponentInstancePropertiesById(containerComponentType, containerComponentId, componentInstanceUniqueId, userId);
 
             if (componentInstancePropertiesById.isRight()) {
-                log.debug("Failed to get properties of component instance ID: {} in {} with ID: {}", componentInstanceUniqueId, containerComponentType, containerComponentId);
+                log.debug(FAILED_TO_GET_PROPERTIES_OF_COMPONENT_INSTANCE_ID_IN_WITH_ID, componentInstanceUniqueId, containerComponentType, containerComponentId);
                 return buildErrorResponse(componentInstancePropertiesById.right().value());
             }
 
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), componentInstancePropertiesById.left().value());
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("getGroupArtifactById");
-            log.debug("getGroupArtifactById unexpected exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(GET_GROUP_ARTIFACT_BY_ID);
+            log.debug(GET_GROUP_ARTIFACT_BY_ID_UNEXPECTED_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
@@ -869,24 +858,24 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("(GET) Start handle request of {}", url);
+        log.debug(GET_START_HANDLE_REQUEST_OF, url);
 
         try {
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceBL = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceBL = getComponentInstanceBL(context);
 
             Either<List<ComponentInstanceProperty>, ResponseFormat> componentInstancePropertiesById = componentInstanceBL.getComponentInstanceCapabilityPropertiesById(containerComponentType, containerComponentId, componentInstanceUniqueId,
                     capabilityType, capabilityName, ownerId, userId);
 
             if (componentInstancePropertiesById.isRight()) {
-                log.debug("Failed to get properties of component instance ID: {} in {} with ID: {}", componentInstanceUniqueId, containerComponentType, containerComponentId);
+                log.debug(FAILED_TO_GET_PROPERTIES_OF_COMPONENT_INSTANCE_ID_IN_WITH_ID, componentInstanceUniqueId, containerComponentType, containerComponentId);
                 return buildErrorResponse(componentInstancePropertiesById.right().value());
             }
 
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), componentInstancePropertiesById.left().value());
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("getGroupArtifactById");
-            log.debug("getGroupArtifactById unexpected exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(GET_GROUP_ARTIFACT_BY_ID);
+            log.debug(GET_GROUP_ARTIFACT_BY_ID_UNEXPECTED_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
@@ -923,19 +912,19 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             }
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceBL = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceBL = getComponentInstanceBL(context);
 
             Either<List<ComponentInstanceProperty>, ResponseFormat> updateCICapProperty = componentInstanceBL.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, propertiesToUpdate, userId);
 
             if (updateCICapProperty.isRight()) {
-                log.debug("Failed to get properties of component instance ID: {} in {} with ID: {}", componentInstanceUniqueId, containerComponentType, containerComponentId);
+                log.debug(FAILED_TO_GET_PROPERTIES_OF_COMPONENT_INSTANCE_ID_IN_WITH_ID, componentInstanceUniqueId, containerComponentType, containerComponentId);
                 return buildErrorResponse(updateCICapProperty.right().value());
             }
 
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), updateCICapProperty.left().value());
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("getGroupArtifactById");
-            log.debug("getGroupArtifactById unexpected exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(GET_GROUP_ARTIFACT_BY_ID);
+            log.debug(GET_GROUP_ARTIFACT_BY_ID_UNEXPECTED_EXCEPTION, e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
     }
@@ -961,12 +950,12 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
                 log.debug("Unsupported container component type {}", containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
-            Either<ComponentInstance, ResponseFormat> actionResponse = componentInstanceLogic.createServiceProxy(containerComponentType, containerComponentId, userId, componentInstance);
+            Either<ComponentInstance, ResponseFormat> actionResponse = componentInstanceLogic.createServiceProxy();
 
             if (actionResponse.isRight()) {
                 return buildErrorResponse(actionResponse.right().value());
@@ -994,15 +983,15 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         String url = request.getMethod() + " " + request.getRequestURI();
         Response response = null;
         try {
-            log.debug("Start handle request of {}", url);
+            log.debug(START_HANDLE_REQUEST_OF, url);
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
             String userId = request.getHeader(Constants.USER_ID_HEADER);
-            Either<ComponentInstance, ResponseFormat> actionResponse = componentInstanceLogic.deleteServiceProxy(containerComponentType, containerComponentId, serviceProxyId, userId);
+            Either<ComponentInstance, ResponseFormat> actionResponse = componentInstanceLogic.deleteServiceProxy();
 
             if (actionResponse.isRight()) {
                 response = buildErrorResponse(actionResponse.right().value());
@@ -1029,18 +1018,18 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         try {
 
             String userId = request.getHeader(Constants.USER_ID_HEADER);
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
             if (componentInstanceLogic == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
-            Either<ComponentInstance, ResponseFormat> actionResponse = componentInstanceLogic.changeServiceProxyVersion(containerComponentType, containerComponentId, serviceProxyId, userId);
+            Either<ComponentInstance, ResponseFormat> actionResponse = componentInstanceLogic.changeServiceProxyVersion();
 
             if (actionResponse.isRight()) {
                 return buildErrorResponse(actionResponse.right().value());
@@ -1074,14 +1063,14 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("(GET) Start handle request of {}", url);
+        log.debug(GET_START_HANDLE_REQUEST_OF, url);
         try {
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
             if (componentTypeEnum == null) {
-                log.debug("Unsupported component type {}", containerComponentType);
+                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
             }
-            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+            ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
 
             Either<RequirementCapabilityRelDef, ResponseFormat> actionResponse = componentInstanceLogic.getRelationById(componentId, relationId, userId, componentTypeEnum);
             if (actionResponse.isRight()) {
@@ -1097,8 +1086,6 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
 
     private Either<ComponentInstance, ResponseFormat> convertToResourceInstance(String data) {
 
-        // Either<ComponentInstance, ActionStatus> convertStatus =
-        // convertJsonToObject(data, ComponentInstance.class);
         Either<ComponentInstance, ResponseFormat> convertStatus = getComponentsUtils().convertJsonToObjectUsingObjectMapper(data, new User(), ComponentInstance.class, null, ComponentTypeEnum.RESOURCE_INSTANCE);
         if (convertStatus.isRight()) {
             return Either.right(convertStatus.right().value());
@@ -1155,7 +1142,7 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         try {
             log.trace("convert json to object. json=\n {}", data);
             T t;
-            t = gson.fromJson(data, clazz);
+            t = gsonDeserializer.fromJson(data, clazz);
             if (t == null) {
                 BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
                 log.debug("object is null after converting from json");
@@ -1192,11 +1179,11 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-        ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context, componentTypeEnum);
+        ComponentInstanceBusinessLogic componentInstanceLogic = getComponentInstanceBL(context);
         if (componentInstanceLogic == null) {
-            log.debug("Unsupported component type {}", containerComponentType);
+            log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
         }
         ComponentInstance newComponentInstance;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentServlet.java
index e1abe42f2e..f9297c4db2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentServlet.java
@@ -20,59 +20,58 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ComponentBusinessLogicProvider;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.api.HighestFilterEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum;
-import org.openecomp.sdc.be.model.CapReqDef;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.IComponentInstanceConnectedElement;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.mixin.GroupCompositionMixin;
+import org.openecomp.sdc.be.mixin.PolicyCompositionMixin;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
+import org.openecomp.sdc.be.view.ResponseView;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
 
-import com.jcabi.aspects.Loggable;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Api(value = "Component Servlet", description = "Component Servlet")
-@Singleton
+@Controller
 public class ComponentServlet extends BeGenericServlet {
-    private static final Logger log = LoggerFactory.getLogger(ComponentServlet.class);
+    private static final String GET_CERTIFIED_NOT_ABSTRACT_COMPONENTS_FAILED_WITH_EXCEPTION = "getCertifiedNotAbstractComponents failed with exception";
+
+	private static final String GET_CERTIFIED_NON_ABSTRACT = "Get Certified Non Abstract";
+
+	private static final String FAILED_TO_GET_ALL_NON_ABSTRACT = "failed to get all non abstract {}";
+
+	private static final String START_HANDLE_REQUEST_OF = "Start handle request of {}";
+
+	private static final Logger log = Logger.getLogger(ComponentServlet.class);
+
+    private final ComponentBusinessLogicProvider componentBusinessLogicProvider;
+
+    public ComponentServlet(ComponentBusinessLogicProvider componentBusinessLogicProvider) {
+        this.componentBusinessLogicProvider = componentBusinessLogicProvider;
+    }
 
     @GET
     @Path("/{componentType}/{componentUuid}/conformanceLevelValidation")
@@ -86,7 +85,7 @@ public class ComponentServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
         if (componentTypeEnum != null) {
@@ -116,7 +115,7 @@ public class ComponentServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
         if (componentTypeEnum != null) {
@@ -162,18 +161,18 @@ public class ComponentServlet extends BeGenericServlet {
 
             log.debug("Received componentUids size is {}", componentUids == null ? 0 : componentUids.size());
 
-            Either<List<Component>, ResponseFormat> actionResponse = businessLogic.getLatestVersionNotAbstractComponents(false, HighestFilterEnum.HIGHEST_ONLY, componentTypeEnum, internalComponentType, componentUids, userId);
+            Either<List<Component>, ResponseFormat> actionResponse = businessLogic.getLatestVersionNotAbstractComponents(false, componentTypeEnum, internalComponentType, componentUids, userId);
 
             if (actionResponse.isRight()) {
-                log.debug("failed to get all non abstract {}", componentType);
+                log.debug(FAILED_TO_GET_ALL_NON_ABSTRACT, componentType);
                 return buildErrorResponse(actionResponse.right().value());
             }
             Object components = RepresentationUtils.toRepresentation(actionResponse.left().value());
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), components);
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Certified Non Abstract" + componentType);
-            log.debug("getCertifiedNotAbstractComponents failed with exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(GET_CERTIFIED_NON_ABSTRACT + componentType);
+            log.debug(GET_CERTIFIED_NOT_ABSTRACT_COMPONENTS_FAILED_WITH_EXCEPTION, e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
             return response;
 
@@ -200,26 +199,25 @@ public class ComponentServlet extends BeGenericServlet {
 
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
             ComponentBusinessLogic businessLogic = getComponentBL(componentTypeEnum, context);
-            List<String> componentUids = data;
-            if (log.isDebugEnabled())
-                log.debug("Received componentUids size is {}", componentUids == null ? 0 : componentUids.size());
+            if (log.isDebugEnabled()) {
+                log.debug("Received componentUids size is {}", data == null ? 0 : data.size());
+            }
 
-            Either<List<Component>, ResponseFormat> actionResponse = businessLogic.getLatestVersionNotAbstractComponents(false, HighestFilterEnum.HIGHEST_ONLY, componentTypeEnum, internalComponentType, componentUids, userId);
+            Either<List<Component>, ResponseFormat> actionResponse = businessLogic.getLatestVersionNotAbstractComponents(false, componentTypeEnum, internalComponentType, data, userId);
 
             if (actionResponse.isRight()) {
-                if (log.isDebugEnabled())
-                    log.debug("failed to get all non abstract {}", componentType);
+                log.debug(FAILED_TO_GET_ALL_NON_ABSTRACT, componentType);
                 return buildErrorResponse(actionResponse.right().value());
 
             }
             Object components = RepresentationUtils.toRepresentation(actionResponse.left().value());
-            Response responseToReturn = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), components);
+            return  buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), components);
+
 
-            return responseToReturn;
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Certified Non Abstract" + componentType);
-            log.debug("getCertifiedNotAbstractComponents failed with exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(GET_CERTIFIED_NON_ABSTRACT + componentType);
+            log.debug(GET_CERTIFIED_NOT_ABSTRACT_COMPONENTS_FAILED_WITH_EXCEPTION, e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
             return response;
 
@@ -246,15 +244,15 @@ public class ComponentServlet extends BeGenericServlet {
 
             Either<List<Component>, ResponseFormat> actionResponse = businessLogic.getLatestVersionNotAbstractComponentsMetadata(false, HighestFilterEnum.HIGHEST_ONLY, componentTypeEnum, internalComponentType, userId);
             if (actionResponse.isRight()) {
-                log.debug("failed to get all non abstract {}", componentType);
+                log.debug(FAILED_TO_GET_ALL_NON_ABSTRACT, componentType);
                 return buildErrorResponse(actionResponse.right().value());
             }
             Object components = RepresentationUtils.toRepresentation(actionResponse.left().value());
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), components);
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Certified Non Abstract" + componentType);
-            log.debug("getCertifiedNotAbstractComponents failed with exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(GET_CERTIFIED_NON_ABSTRACT + componentType);
+            log.debug(GET_CERTIFIED_NOT_ABSTRACT_COMPONENTS_FAILED_WITH_EXCEPTION, e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
             return response;
 
@@ -279,7 +277,7 @@ public class ComponentServlet extends BeGenericServlet {
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
             ComponentBusinessLogic businessLogic = getComponentBL(componentTypeEnum, context);
 
-            Either<List<ComponentInstance>, ResponseFormat> actionResponse = businessLogic.getComponentInstancesFilteredByPropertiesAndInputs(componentId, componentTypeEnum, userId, searchText);
+            Either<List<ComponentInstance>, ResponseFormat> actionResponse = businessLogic.getComponentInstancesFilteredByPropertiesAndInputs(componentId, userId);
             if (actionResponse.isRight()) {
                 log.debug("failed to get all component instances filtered by properties and inputs", componentType);
                 return buildErrorResponse(actionResponse.right().value());
@@ -314,13 +312,12 @@ public class ComponentServlet extends BeGenericServlet {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Retrieve Resource", httpMethod = "GET", notes = "Returns resource according to resourceId", response = Resource.class)
+    @ResponseView(mixin = {GroupCompositionMixin.class, PolicyCompositionMixin.class})
     @ApiResponses(value = { @ApiResponse(code = 200, message = "Resource found"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 404, message = "Resource not found") })
     public Response getComponentDataFilteredByParams(@PathParam("componentType") final String componentType, @PathParam("componentId") final String componentId, @QueryParam("include") final List<String> dataParamsToReturn, @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
 
-        ServletContext context = request.getSession().getServletContext();
-
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}" , url);
+        log.debug(START_HANDLE_REQUEST_OF , url);
 
         // get modifier id
         User modifier = new User();
@@ -331,9 +328,8 @@ public class ComponentServlet extends BeGenericServlet {
 
         try {
             String resourceIdLower = componentId.toLowerCase();
-
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(componentType);
-            ComponentBusinessLogic businessLogic = getComponentBL(componentTypeEnum, context);
+            ComponentBusinessLogic businessLogic = componentBusinessLogicProvider.getInstance(componentTypeEnum);
 
             log.trace("get component with id {} filtered by ui params", componentId);
             Either<UiComponentDataTransfer, ResponseFormat> actionResponse = businessLogic.getComponentDataFilteredByParams(resourceIdLower, modifier, dataParamsToReturn);
@@ -343,8 +339,8 @@ public class ComponentServlet extends BeGenericServlet {
                 response = buildErrorResponse(actionResponse.right().value());
                 return response;
             }
-            Object resource = RepresentationUtils.toRepresentation(actionResponse.left().value());
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), resource);
+            RepresentationUtils.toRepresentation(actionResponse.left().value());
+            return buildOkResponse(actionResponse.left().value());
 
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get component filtered by ui params");
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java
index f307baa3b6..5b21e7de74 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigMgrServlet.java
@@ -20,26 +20,18 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-
+import com.jcabi.aspects.Loggable;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.servlets.BasicServlet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
 
 /**
  * Root resource (exposed at "/" path)
@@ -48,7 +40,7 @@ import com.jcabi.aspects.Loggable;
 @Path("/configmgr")
 public class ConfigMgrServlet extends BasicServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ConfigMgrServlet.class);
+    private static final Logger log = Logger.getLogger(ConfigMgrServlet.class);
 
     @GET
     @Path("/get")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigServlet.java
index daa21acfa2..ac4381f65f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConfigServlet.java
@@ -20,6 +20,13 @@
 
 package org.openecomp.sdc.be.servlets;
 
+import com.jcabi.aspects.Loggable;
+import org.openecomp.sdc.be.config.Configuration;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.servlets.BasicServlet;
+
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
@@ -28,15 +35,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
-import org.openecomp.sdc.be.config.Configuration;
-import org.openecomp.sdc.common.api.ConfigurationSource;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.servlets.BasicServlet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.jcabi.aspects.Loggable;
-
 /**
  * Root resource (exposed at "/" path)
  */
@@ -44,7 +42,7 @@ import com.jcabi.aspects.Loggable;
 @Path("/config")
 public class ConfigServlet extends BasicServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ConfigServlet.class);
+    private static final Logger log = Logger.getLogger(ConfigServlet.class);
 
     @GET
     @Path("/get")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConsumerServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConsumerServlet.java
index 038a9de7f6..bbc09bf435 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConsumerServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ConsumerServlet.java
@@ -20,21 +20,10 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.google.gson.Gson;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.ConsumerBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -43,27 +32,27 @@ import org.openecomp.sdc.be.model.ConsumerDefinition;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.gson.Gson;
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/consumers")
 @Api(value = "Consumer Servlet", description = "Consumer Servlet")
 @Singleton
 public class ConsumerServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ConsumerServlet.class);
+    private static final String MODIFIER_ID_IS = "modifier id is {}";
+	private static final String START_HANDLE_REQUEST_OF = "Start handle request of {}";
+	private static final Logger log = Logger.getLogger(ConsumerServlet.class);
 
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
@@ -75,11 +64,11 @@ public class ConsumerServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         User modifier = new User();
         modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
+        log.debug(MODIFIER_ID_IS, userId);
 
         try {
             ConsumerBusinessLogic businessLogic = getConsumerBL(context);
@@ -122,11 +111,11 @@ public class ConsumerServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         User modifier = new User();
         modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
+        log.debug(MODIFIER_ID_IS, userId);
 
         Response response = null;
         try {
@@ -160,11 +149,11 @@ public class ConsumerServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         User modifier = new User();
         modifier.setUserId(userId);
-        log.debug("modifier id is {}", userId);
+        log.debug(MODIFIER_ID_IS, userId);
 
         Response response = null;
         try {
@@ -190,13 +179,11 @@ public class ConsumerServlet extends BeGenericServlet {
     private ConsumerBusinessLogic getConsumerBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        ConsumerBusinessLogic consumerBL = webApplicationContext.getBean(ConsumerBusinessLogic.class);
-
-        return consumerBL;
+        return webApplicationContext.getBean(ConsumerBusinessLogic.class);
     }
 
     public Either<ConsumerDefinition, ResponseFormat> convertJsonToObject(String data, User user, AuditingActionEnum actionEnum) {
-        ConsumerDefinition consumer = null;
+        ConsumerDefinition consumer;
         Gson gson = new Gson();
         try {
             log.trace("convert json to object. json=\n {}", data);
@@ -204,16 +191,14 @@ public class ConsumerServlet extends BeGenericServlet {
             if (consumer == null) {
                 BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
                 log.debug("object is null after converting from json");
-                //TODO call correct audit event method!!! - consumer!!!
-                ResponseFormat responseFormat = getComponentsUtils().getInvalidContentErrorAndAudit(user, "", actionEnum);
+                ResponseFormat responseFormat = getComponentsUtils().getInvalidContentErrorForConsumerAndAudit(user, null, actionEnum);
                 return Either.right(responseFormat);
             }
         } catch (Exception e) {
             // INVALID JSON
             BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
             log.debug("failed to convert from json {}", data, e);
-            //TODO call correct audit event method!!! - consumer!!!
-            ResponseFormat responseFormat = getComponentsUtils().getInvalidContentErrorAndAudit(user, "", actionEnum);
+            ResponseFormat responseFormat = getComponentsUtils().getInvalidContentErrorForConsumerAndAudit(user, null, actionEnum);
             return Either.right(responseFormat);
         }
         return Either.left(consumer);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CsarBuildServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CsarBuildServlet.java
index 2dca0081d5..640f54e67d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CsarBuildServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/CsarBuildServlet.java
@@ -20,6 +20,10 @@
 
 package org.openecomp.sdc.be.servlets;
 
+import com.jcabi.aspects.Loggable;
+import org.openecomp.sdc.be.resources.data.ESArtifactData;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -27,17 +31,11 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 
-import org.openecomp.sdc.be.resources.data.ESArtifactData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.jcabi.aspects.Loggable;
-
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/services")
 public class CsarBuildServlet extends ToscaDaoServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(CsarBuildServlet.class);
+    private static final Logger log = Logger.getLogger(CsarBuildServlet.class);
 
     @GET
     @Path("/{serviceName}/{serviceVersion}")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DistributionServiceServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DistributionServiceServlet.java
index 7ab36560c3..c14eb87cc5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DistributionServiceServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DistributionServiceServlet.java
@@ -20,20 +20,12 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.openecomp.sdc.be.components.impl.DistributionMonitoringBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -41,18 +33,19 @@ import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.info.DistributionStatusListResponse;
 import org.openecomp.sdc.be.info.DistributionStatusOfServiceListResponce;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.jcabi.aspects.Loggable;
+import javax.annotation.Resource;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 /**
  * Root resource (exposed at "/" path)
  */
@@ -61,7 +54,7 @@ import io.swagger.annotations.ApiResponses;
 @Api(value = "Distribution Service Servlet", description = "Distribution Service Servlet")
 @Singleton
 public class DistributionServiceServlet extends BeGenericServlet {
-    private static final Logger log = LoggerFactory.getLogger(DistributionServiceServlet.class);
+    private static final Logger log = Logger.getLogger(DistributionServiceServlet.class);
 
     @Resource
     private DistributionMonitoringBusinessLogic distributionMonitoringLogic;
@@ -158,8 +151,7 @@ public class DistributionServiceServlet extends BeGenericServlet {
     private DistributionMonitoringBusinessLogic getDistributionBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        DistributionMonitoringBusinessLogic distributionBl = webApplicationContext.getBean(DistributionMonitoringBusinessLogic.class);
-        return distributionBl;
+        return webApplicationContext.getBean(DistributionMonitoringBusinessLogic.class);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java
index 06f0fed43a..eda9a61883 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ElementServlet.java
@@ -20,27 +20,9 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.ElementBusinessLogic;
 import org.openecomp.sdc.be.components.scheduledtasks.ComponentsCleanBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
@@ -50,12 +32,8 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.info.ArtifactTypesInfo;
-import org.openecomp.sdc.be.model.ArtifactType;
-import org.openecomp.sdc.be.model.Category;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.PropertyScope;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.Tag;
-import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.catalog.CatalogComponent;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.GroupingDefinition;
@@ -63,18 +41,20 @@ import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.ui.model.UiCategories;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Path("/v1/")
 
@@ -89,7 +69,7 @@ import io.swagger.annotations.ApiResponses;
 @Singleton
 public class ElementServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ElementServlet.class);
+    private static final Logger log = Logger.getLogger(ElementServlet.class);
 
     /*
      ******************************************************************************
@@ -115,7 +95,7 @@ public class ElementServlet extends BeGenericServlet {
 
         try {
             ElementBusinessLogic elementBL = getElementBL(request.getSession().getServletContext());
-            Either<List<CategoryDefinition>, ResponseFormat> either = elementBL.getAllCategories(componentType, userId);
+            Either<List<CategoryDefinition>, ResponseFormat> either = elementBL .getAllCategories(componentType, userId);
             if (either.isRight()) {
                 log.debug("No categories were found for type {}", componentType);
                 return buildErrorResponse(either.right().value());
@@ -265,7 +245,7 @@ public class ElementServlet extends BeGenericServlet {
 
         try {
             ElementBusinessLogic elementBL = getElementBL(request.getSession().getServletContext());
-            Either<SubCategoryDefinition, ResponseFormat> deleteSubResourceCategory = elementBL.deleteSubCategory(categoryUniqueId, subCategoryUniqueId, componentType, userId);
+            Either<SubCategoryDefinition, ResponseFormat> deleteSubResourceCategory = elementBL.deleteSubCategory(subCategoryUniqueId, componentType, userId);
             if (deleteSubResourceCategory.isRight()) {
                 return buildErrorResponse(deleteSubResourceCategory.right().value());
             }
@@ -327,7 +307,7 @@ public class ElementServlet extends BeGenericServlet {
 
         try {
             ElementBusinessLogic elementBL = getElementBL(request.getSession().getServletContext());
-            Either<GroupingDefinition, ResponseFormat> deleteGrouping = elementBL.deleteGrouping(grandParentCategoryUniqueId, parentSubCategoryUniqueId, groupingUniqueId, componentType, userId);
+            Either<GroupingDefinition, ResponseFormat> deleteGrouping = elementBL.deleteGrouping(groupingUniqueId, componentType, userId);
             if (deleteGrouping.isRight()) {
                 return buildErrorResponse(deleteGrouping.right().value());
             }
@@ -464,8 +444,8 @@ public class ElementServlet extends BeGenericServlet {
                 log.debug("No resource types were found");
                 return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT));
             } else {
-                Map<String, Object> artifacts = new HashMap<String, Object>();
-                Map<String, Object> configuration = new HashMap<String, Object>();
+                Map<String, Object> artifacts = new HashMap<>();
+                Map<String, Object> configuration = new HashMap<>();
 
                 artifacts.put("other", otherEither.left().value());
                 artifacts.put("deployment", deploymentEither.left().value());
@@ -546,7 +526,7 @@ public class ElementServlet extends BeGenericServlet {
             String url = request.getMethod() + " " + request.getRequestURI();
             log.debug("Start handle request of {}", url);
 
-            Either<Map<String, List<CatalogComponent>>, ResponseFormat> catalogData = getElementBL(request.getSession().getServletContext()).getCatalogComponents(userId);
+			Either<Map<String, List<CatalogComponent>>, ResponseFormat> catalogData = getElementBL(request.getSession().getServletContext()).getCatalogComponents(userId, excludeTypes);
 
             if (catalogData.isRight()) {
                 log.debug("failed to get catalog data");
@@ -582,11 +562,11 @@ public class ElementServlet extends BeGenericServlet {
 
         NodeTypeEnum nodeType = NodeTypeEnum.getByNameIgnoreCase(componentType);
         if (nodeType == null) {
-            log.info("componentType is not valid: {]", componentType);
+            log.info("componentType is not valid: {}", componentType);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
         }
 
-        List<NodeTypeEnum> componentsList = new ArrayList<NodeTypeEnum>();
+        List<NodeTypeEnum> componentsList = new ArrayList<>();
         componentsList.add(nodeType);
         try {
             ComponentsCleanBusinessLogic businessLogic = getComponentCleanerBL(context);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupEndpoint.java
new file mode 100644
index 0000000000..791d921752
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupEndpoint.java
@@ -0,0 +1,83 @@
+package org.openecomp.sdc.be.servlets;
+
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.*;
+import org.openecomp.sdc.be.components.impl.GroupBusinessLogicNew;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.model.GroupProperty;
+import org.openecomp.sdc.common.api.Constants;
+import org.springframework.stereotype.Controller;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+/**
+ * Here new APIs for group will be written in an attempt to gradually clean BL code
+ */
+@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Path("/v1/catalog")
+@Api(value = "Group Servlet")
+@Controller
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+public class GroupEndpoint {
+
+    private final GroupBusinessLogicNew groupBusinessLogic;
+
+    public GroupEndpoint(GroupBusinessLogicNew groupBusinessLogic) {
+        this.groupBusinessLogic = groupBusinessLogic;
+    }
+
+    @POST
+    @Path("/{containerComponentType}/{componentId}/groups/{groupUniqueId}/members")
+    @ApiOperation(value = "Update group members ", httpMethod = "POST", notes = "Updates list of members and returns it", response = String.class, responseContainer = "List")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Group members updated"),
+            @ApiResponse(code = 400, message = "field name invalid type/length, characters;  mandatory field is absent, already exists (name)"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 404, message = "Component not found"),
+            @ApiResponse(code = 500, message = "Internal Error")
+    })
+    public List<String> updateGroupMembers(
+            @PathParam("containerComponentType") final String containerComponentType,
+            @PathParam("componentId") final String componentId,
+            @PathParam("groupUniqueId") final String groupUniqueId,
+            @ApiParam(value = "List of members unique ids", required = true) List<String> members,
+            @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
+        return groupBusinessLogic.updateMembers(componentId, componentTypeEnum, userId, groupUniqueId, members);
+    }
+
+    @GET
+    @Path("/{containerComponentType}/{componentId}/groups/{groupUniqueId}/properties")
+    @ApiOperation(value = "Get List of properties on a group", httpMethod = "GET", notes = "Returns list of properties", response = GroupProperty.class, responseContainer="List")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Group Updated"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 400, message = "Invalid content / Missing content") })
+    public List<PropertyDataDefinition> getGroupProperties(@PathParam("containerComponentType") final String containerComponentType,
+                                                           @PathParam("componentId") final String componentId,
+                                                           @PathParam("groupUniqueId") final String groupUniqueId,
+                                                           @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        return groupBusinessLogic.getProperties(containerComponentType, userId, componentId, groupUniqueId);
+    }
+
+    @PUT
+    @Path("/{containerComponentType}/{componentId}/groups/{groupUniqueId}/properties")
+    @ApiOperation(value = "Updates List of properties on a group (only values)", httpMethod = "PUT", notes = "Returns updated list of properties", response = GroupProperty.class, responseContainer="List")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Group Updated"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 400, message = "Invalid content / Missing content") })
+    public List<GroupProperty> updateGroupProperties(@PathParam("containerComponentType") final String containerComponentType,
+                                                     @PathParam("componentId") final String componentId,
+                                                     @PathParam("groupUniqueId") final String groupUniqueId,
+                                                     @ApiParam(value = "Group Properties to be Updated", required = true) List<GroupProperty> properties,
+                                                     @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
+        return groupBusinessLogic.updateProperties(componentId, componentTypeEnum, userId, groupUniqueId, properties);
+    }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupServlet.java
index 0309e23e72..6d61e0685b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupServlet.java
@@ -20,47 +20,28 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.List;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.GroupBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.info.GroupDefinitionInfo;
 import org.openecomp.sdc.be.model.GroupDefinition;
-import org.openecomp.sdc.be.model.GroupProperty;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.google.common.reflect.TypeToken;
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 /**
  * Root resource (exposed at "/" path)
@@ -69,11 +50,11 @@ import io.swagger.annotations.ApiResponses;
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
 @Path("/v1/catalog")
-@Api(value = "Resource Group Servlet")
+@Api(value = "Group Servlet")
 @Singleton
 public class GroupServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(GroupServlet.class);
+    private static final Logger log = Logger.getLogger(GroupServlet.class);
     public static final String START_HANDLE_REQUEST = "Start handle request of {}";
 
     @POST
@@ -98,7 +79,7 @@ public class GroupServlet extends AbstractValidationsServlet {
         GroupBusinessLogic businessLogic = getGroupBL(context);
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
         GroupDefinition groupDefinition = businessLogic
-                .createGroup(type, componentTypeEnum, componentId, userId);
+                .createGroup(componentId, componentTypeEnum, type, userId);
 
         return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED),
                 groupDefinition);
@@ -162,7 +143,7 @@ public class GroupServlet extends AbstractValidationsServlet {
         GroupBusinessLogic businessLogic = this.getGroupBL(context);
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
         GroupDefinition groupDefinition = businessLogic
-                .deleteGroup(componentTypeEnum, componentId, groupId, userId);
+                .deleteGroup(componentId, componentTypeEnum, groupId, userId);
 
         return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), groupDefinition.getUniqueId());
     }
@@ -184,33 +165,25 @@ public class GroupServlet extends AbstractValidationsServlet {
         ServletContext context = request.getSession().getServletContext();
         GroupBusinessLogic businessLogic = this.getGroupBL(context);
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-        GroupDefinition updatedGroup = businessLogic.updateGroup(componentTypeEnum, componentId, groupId, userId, groupData);
+        GroupDefinition updatedGroup = businessLogic.updateGroup(componentId, componentTypeEnum, groupId, userId, groupData);
         return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), updatedGroup);
     }
 
-    /**
-     * Updates List of properties on a group (only values)
-     * @param containerComponentType
-     * @param componentId
-     * @param groupUniqueId
-     * @param data
-     * @param request
-     * @param userId
-     * @return
-     */
     @PUT
-    @Path("/{containerComponentType}/{componentId}/groups/{groupUniqueId}/properties")
-    @ApiOperation(value = "Updates List of properties on a group (only values)", httpMethod = "PUT", notes = "Returns updated list of properties", response = GroupDefinition.class)
+    @Path("/{containerComponentType}/{componentId}/groups/{groupUniqueId}/metadata")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "Update Group Metadata", httpMethod = "PUT", notes = "Returns updated group definition", response = GroupDefinition.class)
     @ApiResponses(value = { @ApiResponse(code = 200, message = "Group Updated"),
             @ApiResponse(code = 403, message = "Restricted operation"),
             @ApiResponse(code = 400, message = "Invalid content / Missing content") })
-    public Response updateGroupProperties(@PathParam("containerComponentType") final String containerComponentType,
+    public Response updateGroupMetadata(
+            @PathParam("containerComponentType") final String containerComponentType,
             @PathParam("componentId") final String componentId, @PathParam("groupUniqueId") final String groupUniqueId,
-            @ApiParam(value = "Group Properties to be Updated", required = true) String data,
+            @ApiParam(value = "Service object to be Updated", required = true) String data,
             @Context final HttpServletRequest request,
             @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
 
-        init(log);
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
         log.debug(START_HANDLE_REQUEST, url);
@@ -223,21 +196,19 @@ public class GroupServlet extends AbstractValidationsServlet {
 
         try {
             GroupBusinessLogic businessLogic = getGroupBL(context);
-            Either<List<GroupProperty>, ResponseFormat> convertResponse = parseListOfObjects(data,
-                    new TypeToken<List<GroupProperty>>() {
-                    }.getType());
 
+            Either<GroupDefinition, ResponseFormat> convertResponse = parseToObject(data, () -> GroupDefinition.class);
             if (convertResponse.isRight()) {
-                log.debug("failed to parse group Property");
+                log.debug("failed to parse group");
                 response = buildErrorResponse(convertResponse.right().value());
                 return response;
             }
-            List<GroupProperty> groupPropertyToUpdate = convertResponse.left().value();
+            GroupDefinition updatedGroup = convertResponse.left().value();
 
             // Update GroupDefinition
             ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-            Either<List<GroupProperty>, ResponseFormat> actionResponse = businessLogic.validateAndUpdateGroupProperties(
-                    componentId, groupUniqueId, user, componentTypeEnum, groupPropertyToUpdate, false);
+            Either<GroupDefinition, ResponseFormat> actionResponse = businessLogic
+                    .validateAndUpdateGroupMetadata(componentId, user, componentTypeEnum, updatedGroup, true ,true);
 
             if (actionResponse.isRight()) {
                 log.debug("failed to update GroupDefinition");
@@ -245,13 +216,13 @@ public class GroupServlet extends AbstractValidationsServlet {
                 return response;
             }
 
-            List<GroupProperty> groupProperty = actionResponse.left().value();
-            Object result = RepresentationUtils.toRepresentation(groupProperty);
+            GroupDefinition group = actionResponse.left().value();
+            Object result = RepresentationUtils.toRepresentation(group);
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), result);
 
         } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Group Properties");
-            log.debug("update group properties failed with exception", e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Group Metadata");
+            log.debug("update group metadata failed with exception", e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
             return response;
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.java
index ef6c1c5d1d..f33b32a5a6 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/GroupTypesEndpoint.java
@@ -1,15 +1,7 @@
 package org.openecomp.sdc.be.servlets;
 
-import java.util.List;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.GroupTypeBusinessLogic;
 import org.openecomp.sdc.be.mixin.GroupTypeMixin;
 import org.openecomp.sdc.be.model.GroupTypeDefinition;
@@ -17,13 +9,9 @@ import org.openecomp.sdc.be.view.ResponseView;
 import org.openecomp.sdc.common.api.Constants;
 import org.springframework.stereotype.Controller;
 
-import com.jcabi.aspects.Loggable;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/InputsServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/InputsServlet.java
index 0ebed157df..d55f3e9cc3 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/InputsServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/InputsServlet.java
@@ -20,51 +20,32 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.Arrays;
-import java.util.List;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.InputsBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
-import org.openecomp.sdc.be.model.ComponentInstInputsMap;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Arrays;
+import java.util.List;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Api(value = "Input Catalog", description = "Input Servlet")
 @Path("/v1/catalog")
@@ -73,7 +54,7 @@ import io.swagger.annotations.ApiResponses;
 @Produces(MediaType.APPLICATION_JSON)
 public class InputsServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(InputsServlet.class);
+    private static final Logger log = Logger.getLogger(InputsServlet.class);
 
     @POST
     @Path("/{containerComponentType}/{componentId}/update/inputs")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/LifecycleServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/LifecycleServlet.java
index 2bcea2564e..0d2308407e 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/LifecycleServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/LifecycleServlet.java
@@ -20,19 +20,10 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoBase;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
@@ -46,26 +37,24 @@ import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.ui.model.UiComponentMetadata;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Api(value = "Lifecycle Actions Servlet", description = "Lifecycle Actions Servlet")
 @Singleton
 public class LifecycleServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(LifecycleServlet.class);
+    private static final Logger log = Logger.getLogger(LifecycleServlet.class);
 
     @POST
     @Path("/{componentCollection}/{componentId}/lifecycleState/{lifecycleOperation}")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyServlet.java
index 4842d66db7..49a827ebec 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyServlet.java
@@ -1,24 +1,8 @@
 package org.openecomp.sdc.be.servlets;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.components.impl.PolicyBusinessLogic;
 import org.openecomp.sdc.be.components.impl.ResourceImportManager;
@@ -33,17 +17,19 @@ import org.openecomp.sdc.be.model.PolicyDefinition;
 import org.openecomp.sdc.be.model.PolicyTargetDTO;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.stereotype.Controller;
 
-import com.jcabi.aspects.Loggable;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Provides REST API to create, retrieve, update, delete a policy
@@ -56,7 +42,7 @@ import io.swagger.annotations.ApiResponses;
 @Produces(MediaType.APPLICATION_JSON)
 public class PolicyServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(PolicyServlet.class);
+    private static final Logger log = Logger.getLogger(PolicyServlet.class);
     private final PolicyBusinessLogic policyBusinessLogic;
 
     public PolicyServlet(PolicyBusinessLogic policyBusinessLogic, ServletUtils servletUtils, ResourceImportManager resourceImportManager, ComponentsUtils componentsUtils) {
@@ -76,7 +62,7 @@ public class PolicyServlet extends AbstractValidationsServlet {
                                  @PathParam("policyTypeName") final String policyTypeName,
                                  @HeaderParam(value = Constants.USER_ID_HEADER) @ApiParam(value = "USER_ID of modifier user", required = true) String userId,
                                  @Context final HttpServletRequest request) {
-        init(log);
+        init();
 
         Wrapper<Response> responseWrapper = new Wrapper<>();
         try {
@@ -103,7 +89,7 @@ public class PolicyServlet extends AbstractValidationsServlet {
                                  @ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("containerComponentType") final String containerComponentType,
                                  @PathParam("policyId") final String policyId, @HeaderParam(value = Constants.USER_ID_HEADER) @ApiParam(value = "USER_ID of modifier user", required = true) String userId,
                                  @ApiParam(value = "PolicyDefinition", required = true) String policyData, @Context final HttpServletRequest request) {
-        init(log);
+        init();
 
         Wrapper<Response> responseWrapper = new Wrapper<>();
         try {
@@ -139,7 +125,7 @@ public class PolicyServlet extends AbstractValidationsServlet {
                               @ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("containerComponentType") final String containerComponentType,
                               @PathParam("policyId") final String policyId, @HeaderParam(value = Constants.USER_ID_HEADER) @ApiParam(value = "USER_ID of modifier user", required = true) String userId,
                               @Context final HttpServletRequest request) {
-        init(log);
+        init();
 
         Wrapper<Response> responseWrapper = new Wrapper<>();
         try {
@@ -167,7 +153,7 @@ public class PolicyServlet extends AbstractValidationsServlet {
                                  @ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("containerComponentType") final String containerComponentType,
                                  @PathParam("policyId") final String policyId, @HeaderParam(value = Constants.USER_ID_HEADER) @ApiParam(value = "USER_ID of modifier user", required = true) String userId,
                                  @Context final HttpServletRequest request) {
-        init(log);
+        init();
 
         Wrapper<Response> responseWrapper = new Wrapper<>();
         try {
@@ -195,7 +181,7 @@ public class PolicyServlet extends AbstractValidationsServlet {
                                         @ApiParam(value = "the id of the policy which its properties are to return") @PathParam("policyId") final String policyId,
                                         @ApiParam(value = "the userid", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) String userId,
                                         @Context final HttpServletRequest request) {
-        init(log);
+        init();
         try {
             return convertToComponentType(containerComponentType)
                     .left()
@@ -220,7 +206,7 @@ public class PolicyServlet extends AbstractValidationsServlet {
                                            @ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("containerComponentType") final String containerComponentType,
                                            @PathParam("policyId") final String policyId, @HeaderParam(value = Constants.USER_ID_HEADER) @ApiParam(value = "USER_ID of modifier user", required = true) String userId,
                                            @ApiParam(value = "PolicyDefinition", required = true) String policyData, @Context final HttpServletRequest request) {
-        init(log);
+        init();
         Wrapper<Response> responseWrapper = new Wrapper<>();
         try {
             Wrapper<ComponentTypeEnum> componentTypeWrapper = validateComponentTypeAndUserId(containerComponentType, userId, responseWrapper);
@@ -256,11 +242,11 @@ public class PolicyServlet extends AbstractValidationsServlet {
         return componentTypeWrapper;
     }
 
-	@PUT
+	@POST
 	@Path("/{containerComponentType}/{componentId}/policies/{policyId}/targets")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	@ApiOperation(value = "update policy targets", httpMethod = "PUT", notes = "Returns updated Policy", response = Response.class)
+	@ApiOperation(value = "update policy targets", httpMethod = "POST", notes = "Returns updated Policy", response = Response.class)
 	@ApiResponses(value = {@ApiResponse(code = 201, message = "Policy target updated"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content")})
 	public Response updatePolicyTargets(@PathParam("componentId") final String containerComponentId,
 										@ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("containerComponentType") final String containerComponentType,
@@ -270,34 +256,35 @@ public class PolicyServlet extends AbstractValidationsServlet {
 										List<PolicyTargetDTO> requestJson) {
 		try {
 
-            Map<PolicyTargetType, List<String>> policyTarget = convertTargetDTOToBLTarget(requestJson);
-            if(policyTarget == null){
-                return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.POLICY_TARGET_TYPE_DOES_NOT_EXIST, StringUtils.join(requestJson.stream().map(PolicyTargetDTO::getType).collect(Collectors.toList())), ","));
-            }
-
-            return convertToComponentType(containerComponentType)
+		    return updatePolicyTargetsFromDTO(requestJson)
                     .left()
-                    .bind(cmptType -> policyBusinessLogic.updatePolicyTargets(cmptType, containerComponentId, policyId, policyTarget, userId))
-                    .either(this::buildOkResponse,
-                            this::buildErrorResponse);
+                    .bind(policyTarget -> updatePolicyTargetsFromMap(policyTarget, containerComponentType, containerComponentId, policyId, userId))
+                    .either(this::buildOkResponse, this::buildErrorResponse);
 
         } catch (Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Policy");
-            log.debug("Policy creation has been failed with the exception{}. ", e);
+            log.debug("Policy target update has been failed with the exception{}. ", e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
     }
 
+    private Either<PolicyDefinition, ResponseFormat> updatePolicyTargetsFromMap(Map<PolicyTargetType, List<String>> policyTarget, String containerComponentType, String containerComponentId, String policyId, String userId) {
+        return convertToComponentType(containerComponentType)
+                .left()
+                .bind(cmptType -> policyBusinessLogic.updatePolicyTargets(cmptType, containerComponentId, policyId, policyTarget, userId));
+    }
 
-    private Map<PolicyTargetType, List<String>> convertTargetDTOToBLTarget(List<PolicyTargetDTO> targetDTOList) {
+    private Either<Map<PolicyTargetType, List<String>>, ResponseFormat> updatePolicyTargetsFromDTO(List<PolicyTargetDTO> targetDTOList) {
         Map<PolicyTargetType, List<String>> policyTarget = new HashMap<>();
         for (PolicyTargetDTO currentTarget : targetDTOList) {
             if(!addTargetsByType(policyTarget, currentTarget.getType(), currentTarget.getUniqueIds())){
-                return null;
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.POLICY_TARGET_TYPE_DOES_NOT_EXIST, currentTarget.getType()));
             }
         }
-        return policyTarget;
+        return Either.left(policyTarget);
     }
+
+
     public boolean addTargetsByType(Map<PolicyTargetType, List<String>> policyTarget, String type, List<String> uniqueIds) {
         PolicyTargetType targetTypeEnum = PolicyTargetType.getByNameIgnoreCase(type);
         if(targetTypeEnum != null){
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java
index d440ca6872..48a41cf83b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PolicyTypesEndpoint.java
@@ -1,30 +1,18 @@
 package org.openecomp.sdc.be.servlets;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.PolicyTypeBusinessLogic;
 import org.openecomp.sdc.be.mixin.PolicyTypeMixin;
 import org.openecomp.sdc.be.model.PolicyTypeDefinition;
 import org.openecomp.sdc.be.view.ResponseView;
 import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Controller;
 
-import com.jcabi.aspects.Loggable;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
@@ -32,9 +20,9 @@ import io.swagger.annotations.ApiResponses;
 @Controller
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
-public class PolicyTypesEndpoint extends BeGenericServlet{
+public class PolicyTypesEndpoint {
 
-    private static final Logger log = LoggerFactory.getLogger(PolicyTypesEndpoint.class);
+    private static final Logger log = Logger.getLogger(PolicyTypesEndpoint.class);
 
     private final PolicyTypeBusinessLogic policyTypeBusinessLogic;
 
@@ -49,18 +37,11 @@ public class PolicyTypesEndpoint extends BeGenericServlet{
                             @ApiResponse(code = 403, message = "Restricted operation"),
                             @ApiResponse(code = 500, message = "The GET request failed due to internal SDC problem.")})
     @ResponseView(mixin = {PolicyTypeMixin.class})
-    public Response getPolicyTypes(@ApiParam(value = "An optional parameter to indicate the type of the container from where this call is executed")
+    public List<PolicyTypeDefinition> getPolicyTypes(@ApiParam(value = "An optional parameter to indicate the type of the container from where this call is executed")
                                    @QueryParam("internalComponentType") String internalComponentType,
-                                   @ApiParam(value = "The user id", required = true) @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+                                                     @ApiParam(value = "The user id", required = true) @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
         log.debug("(get) Start handle request of GET policyTypes");
-        try {
-            return policyTypeBusinessLogic.getAllPolicyTypes(userId, internalComponentType)
-                    .either(this::buildOkResponse,
-                            this::buildErrorResponse);
-        } catch (Exception e) {
-            log.error("#getPolicyTypes - Exception occurred during get policy types", e);
-            return buildGeneralErrorResponse();
-        }
+        return policyTypeBusinessLogic.getAllPolicyTypes(userId, internalComponentType);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ProductServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ProductServlet.java
index 9633f44f29..370f5d5b1d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ProductServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ProductServlet.java
@@ -20,49 +20,33 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.components.impl.ProductBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.Product;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Map;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Api(value = "Product Catalog", description = "Product Servlet")
 @Singleton
 public class ProductServlet extends BeGenericServlet {
-    private static final Logger log = LoggerFactory.getLogger(ProductServlet.class);
+    private static final Logger log = Logger.getLogger(ProductServlet.class);
 
     @POST
     @Path("/products")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PropertyServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PropertyServlet.java
index 557091e3a1..12d788dd45 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PropertyServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/PropertyServlet.java
@@ -20,29 +20,12 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -58,29 +41,31 @@ import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyCons
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.resources.data.EntryData;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Api(value = "Resource Property Servlet", description = "Resource Property Servlet")
 @Singleton
 public class PropertyServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(PropertyServlet.class);
+    private static final Logger log = Logger.getLogger(PropertyServlet.class.getName());
 
     @POST
     @Path("resources/{resourceId}/properties")
@@ -279,7 +264,7 @@ public class PropertyServlet extends BeGenericServlet {
         JSONParser parser = new JSONParser();
         JSONObject root;
         try {
-            Map<String, PropertyDefinition> properties = new HashMap<String, PropertyDefinition>();
+            Map<String, PropertyDefinition> properties = new HashMap<>();
             root = (JSONObject) parser.parse(data);
 
             Set entrySet = root.entrySet();
@@ -324,8 +309,7 @@ public class PropertyServlet extends BeGenericServlet {
         }
         String value = either.left().value();
         try {
-            JSONObject root = (JSONObject) new JSONParser().parse(value);
-            return root;
+            return (JSONObject) new JSONParser().parse(value);
         } catch (ParseException e) {
             log.info("failed to convert input to json");
             log.debug("failed to convert to json", e);
@@ -379,8 +363,7 @@ public class PropertyServlet extends BeGenericServlet {
     private PropertyBusinessLogic getPropertyBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        PropertyBusinessLogic propertytBl = webApplicationContext.getBean(PropertyBusinessLogic.class);
-        return propertytBl;
+        return webApplicationContext.getBean(PropertyBusinessLogic.class);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RepresentationUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RepresentationUtils.java
index 1a3b988a46..dbdfaa9897 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RepresentationUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RepresentationUtils.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,25 +20,6 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationDataDefinition;
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
-import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -51,10 +32,23 @@ import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceOperationDataDefinition;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
+import org.openecomp.sdc.be.model.Operation;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.io.IOException;
+import java.util.*;
 
 public class RepresentationUtils {
 
-    private static final Logger log = LoggerFactory.getLogger(RepresentationUtils.class);
+    private static final Logger log = Logger.getLogger(RepresentationUtils.class);
 
     public static ArtifactDefinition convertJsonToArtifactDefinitionForUpdate(String content, Class<ArtifactDefinition> clazz) {
 
@@ -103,15 +97,13 @@ public class RepresentationUtils {
      * @throws IOException
      */
     public static <T> Object toRepresentation(T elementToRepresent) throws IOException {
+
         ObjectMapper mapper = new ObjectMapper();
         mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         return mapper.writeValueAsString(elementToRepresent);
     }
 
-
-
-
     public static <T> T fromRepresentation(String json, Class<T> clazz) {
         ObjectMapper mapper = new ObjectMapper();
         T object = null;
@@ -127,7 +119,6 @@ public class RepresentationUtils {
         return object;
     }
 
-
     public static ArtifactDefinition convertJsonToArtifactDefinition(String content, Class<ArtifactDefinition> clazz) {
 
         JsonObject jsonElement = new JsonObject();
@@ -180,7 +171,7 @@ public class RepresentationUtils {
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         mapper.setMixIns(IS_EMPTY_FILTER_MIXIN);
         return mapper.writer(new SimpleFilterProvider().addFilter(REMOVE_IS_EMPTY_FROM_COLLECTIONS_FILTER,
-            SerializeExceptFilter.serializeAllExcept(EMPTY))).writeValueAsString(elementToRepresent);
+                SerializeExceptFilter.serializeAllExcept(EMPTY))).writeValueAsString(elementToRepresent);
     }
 
     @JsonFilter(REMOVE_IS_EMPTY_FROM_COLLECTIONS_FILTER)
@@ -189,17 +180,19 @@ public class RepresentationUtils {
     private static final String EMPTY = "empty";
     private static final String REMOVE_IS_EMPTY_FROM_COLLECTIONS_FILTER = "removeIsEmptyFromCollections";
     private static final ImmutableMap<Class<?>,Class<?>> IS_EMPTY_FILTER_MIXIN =
-        ImmutableMap.<Class<?>,Class<?>>builder()
-            .put(Collection.class,IsEmptyFilterMixIn.class)
-            .put(List.class,IsEmptyFilterMixIn.class)
-            .put(Set.class,IsEmptyFilterMixIn.class)
-            .put(HashMap.class,IsEmptyFilterMixIn.class)
-            .put(ArrayList.class,IsEmptyFilterMixIn.class)
-            .put(HashSet.class,IsEmptyFilterMixIn.class)
-            .put(InterfaceDefinition.class,IsEmptyFilterMixIn.class)
-            .put(Operation.class,IsEmptyFilterMixIn.class)
-            .put(Resource.class,IsEmptyFilterMixIn.class)
-            .put(ToscaDataDefinition.class,IsEmptyFilterMixIn.class)
-            .put(InterfaceOperationDataDefinition.class,IsEmptyFilterMixIn.class).build();
+            ImmutableMap.<Class<?>,Class<?>>builder()
+                    .put(Collection.class,IsEmptyFilterMixIn.class)
+                    .put(List.class,IsEmptyFilterMixIn.class)
+                    .put(Set.class,IsEmptyFilterMixIn.class)
+                    .put(HashMap.class,IsEmptyFilterMixIn.class)
+                    .put(ArrayList.class,IsEmptyFilterMixIn.class)
+                    .put(HashSet.class,IsEmptyFilterMixIn.class)
+                    .put(InterfaceDefinition.class,IsEmptyFilterMixIn.class)
+                    .put(Operation.class,IsEmptyFilterMixIn.class)
+                    .put(Resource.class,IsEmptyFilterMixIn.class)
+                    .put(ToscaDataDefinition.class,IsEmptyFilterMixIn.class)
+                    .put(InterfaceOperationDataDefinition.class,IsEmptyFilterMixIn.class).build();
+
+
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementsServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementsServlet.java
index 612d626e59..17a9bf67ba 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementsServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/RequirementsServlet.java
@@ -20,34 +20,26 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.jcabi.aspects.Loggable;
-
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.exception.ResponseFormat;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 public class RequirementsServlet extends BeGenericServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(RequirementsServlet.class);
+    private static final Logger log = Logger.getLogger(RequirementsServlet.class);
 
     @PUT
     @Path("resources/{resourceId}/requirements/{requirementId}")
@@ -56,8 +48,8 @@ public class RequirementsServlet extends BeGenericServlet {
     @ApiOperation(value = "Update Resource Requirement", httpMethod = "PUT", notes = "Returns updated requirement", response = Response.class)
     @ApiResponses(value = { @ApiResponse(code = 200, message = "Resource requirement updated"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content") })
     public Response updateRequirement(@ApiParam(value = "resource id to update with new requirement", required = true) @PathParam("resourceId") final String resourceId,
-            @ApiParam(value = "requirement id to update", required = true) @PathParam("requirementId") final String requirementId, @ApiParam(value = "Resource property to update", required = true) String requirementData,
-            @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
+                                      @ApiParam(value = "requirement id to update", required = true) @PathParam("requirementId") final String requirementId, @ApiParam(value = "Resource property to update", required = true) String requirementData,
+                                      @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
 
         // Convert RequirementDefinition from JSON
         // TODO: it's going to be another object, probably. This is placeholder
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceArtifactDownloadServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceArtifactDownloadServlet.java
index d33bb8e490..fae48103d8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceArtifactDownloadServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceArtifactDownloadServlet.java
@@ -20,15 +20,8 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
 import org.apache.http.HttpStatus;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -38,22 +31,23 @@ import org.openecomp.sdc.be.info.ArtifactAccessInfo;
 import org.openecomp.sdc.be.resources.api.IResourceUploader;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.jcabi.aspects.Loggable;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
-import fj.data.Either;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog/resources/available")
 public class ResourceArtifactDownloadServlet extends ToscaDaoServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ResourceArtifactDownloadServlet.class);
-
-    private Gson gson = new GsonBuilder().setPrettyPrinting().create();
+    private static final Logger log = Logger.getLogger(ResourceArtifactDownloadServlet.class);
 
     @GET
     @Path("/{resourceName}/{resourceVersion}/artifacts/{artifactName}")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceInterfaceOperationServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceInterfaceOperationServlet.java
index 68aa70796e..d5d65a39c5 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceInterfaceOperationServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceInterfaceOperationServlet.java
@@ -16,29 +16,10 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.google.common.collect.Sets;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.openecomp.sdc.be.components.impl.InterfaceOperationBusinessLogic;
@@ -61,15 +42,14 @@ import org.openecomp.sdc.exception.ResponseFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Sets;
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.*;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog/resources/{resourceId}/interfaceOperations")
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceUploadServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceUploadServlet.java
index ca07b31c32..af8903124c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceUploadServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourceUploadServlet.java
@@ -20,24 +20,8 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.io.File;
-
-import javax.annotation.Resource;
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.*;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.openecomp.sdc.be.components.impl.ResourceImportManager;
@@ -48,17 +32,17 @@ import org.openecomp.sdc.be.model.UploadResourceInfo;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.jcabi.aspects.Loggable;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.File;
 
 /**
  * Root resource (exposed at "/" path)
@@ -69,7 +53,7 @@ import io.swagger.annotations.ApiResponses;
 @Singleton
 public class ResourceUploadServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ResourceUploadServlet.class);
+    private static final Logger log = Logger.getLogger(ResourceUploadServlet.class);
     public static final String NORMATIVE_TYPE_RESOURCE = "multipart";
     public static final String CSAR_TYPE_RESOURCE = "csar";
     public static final String USER_TYPE_RESOURCE = "user-resource";
@@ -111,9 +95,6 @@ public class ResourceUploadServlet extends AbstractValidationsServlet {
         }
     }
 
-    @Resource
-    private ResourceImportManager resourceImportManager;
-
     @POST
     @Path("/{resourceAuthority}")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
@@ -173,7 +154,7 @@ public class ResourceUploadServlet extends AbstractValidationsServlet {
     /********************************************************************************************************************/
 
     private void init(ServletContext context) {
-        init(log);
+        init();
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
         resourceImportManager = webApplicationContext.getBean(ResourceImportManager.class);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourcesServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourcesServlet.java
index ef9446454d..818743f7b3 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourcesServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ResourcesServlet.java
@@ -20,30 +20,11 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.http.HttpStatus;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.openecomp.sdc.be.components.impl.CsarValidationUtils;
 import org.openecomp.sdc.be.components.impl.ImportUtils;
@@ -53,7 +34,6 @@ import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.api.HighestFilterEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.UploadResourceInfo;
 import org.openecomp.sdc.be.model.User;
@@ -61,25 +41,28 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.servlets.ResourceUploadServlet.ResourceAuthorityTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Api(value = "Resources Catalog", description = "Resources Servlet")
 @Singleton
 public class ResourcesServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ResourcesServlet.class);
+    private static final Logger log = Logger.getLogger(ResourcesServlet.class);
 
     @POST
     @Path("/resources")
@@ -91,7 +74,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
     public Response createResource(@ApiParam(value = "Resource object to be created", required = true) String data, @Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
 
         userId = (userId != null) ? userId : request.getHeader(Constants.USER_ID_HEADER);
-        init(log);
+        init();
 
         ServletContext context = request.getSession().getServletContext();
 
@@ -103,7 +86,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         modifier.setUserId(userId);
         log.debug("modifier id is {}", userId);
 
-        Response response = null;
+        Response response;
         try {
 
             Wrapper<Response> responseWrapper = new Wrapper<>();
@@ -124,26 +107,17 @@ public class ResourcesServlet extends AbstractValidationsServlet {
                 }
 
                 Resource resource = convertResponse.left().value();
-                Either<Resource, ResponseFormat> actionResponse = businessLogic.createResource(resource, AuditingActionEnum.CREATE_RESOURCE, modifier, null, null);
-
-                if (actionResponse.isRight()) {
-                    log.debug("failed to create resource");
-                    response = buildErrorResponse(actionResponse.right().value());
-                } else {
-                    Object representation = RepresentationUtils.toRepresentation(actionResponse.left().value());
-                    response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), representation);
-                }
+                Resource createdResource = businessLogic.createResource(resource, AuditingActionEnum.CREATE_RESOURCE, modifier, null, null);
+                Object representation = RepresentationUtils.toRepresentation(createdResource);
+                response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), representation);
                 responseWrapper.setInnerElement(response);
             }
-
             return responseWrapper.getInnerElement();
-
-        } catch (Exception e) {
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Resource");
             log.debug("create resource failed with exception", e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
             return response;
-
         }
     }
 
@@ -153,7 +127,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
             JSONObject json = new JSONObject(data);
             String payloadName = json.getString(ImportUtils.Constants.UI_JSON_PAYLOAD_NAME);
             isUIImport = payloadName != null && !payloadName.isEmpty();
-        } catch (Exception e) {
+        } catch (JSONException e) {
             log.debug("failed to parse json sent from client, json:{}", data, e);
             isUIImport = false;
         }
@@ -165,30 +139,29 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         Wrapper<User> userWrapper = new Wrapper<>();
         Wrapper<UploadResourceInfo> uploadResourceInfoWrapper = new Wrapper<>();
         Wrapper<String> yamlStringWrapper = new Wrapper<>();
-        String resourceInfoJsonString = data;
 
         ResourceAuthorityTypeEnum resourceAuthorityEnum = ResourceAuthorityTypeEnum.USER_TYPE_UI;
 
-        commonGeneralValidations(responseWrapper, userWrapper, uploadResourceInfoWrapper, resourceAuthorityEnum, userId, resourceInfoJsonString);
+        commonGeneralValidations(responseWrapper, userWrapper, uploadResourceInfoWrapper, resourceAuthorityEnum, userId, data);
 
         if (!CsarValidationUtils.isCsarPayloadName(uploadResourceInfoWrapper.getInnerElement().getPayloadName())) {
-            fillPayload(responseWrapper, uploadResourceInfoWrapper, yamlStringWrapper, userWrapper.getInnerElement(), resourceInfoJsonString, resourceAuthorityEnum, null);
+            fillPayload(responseWrapper, uploadResourceInfoWrapper, yamlStringWrapper, userWrapper.getInnerElement(), data, resourceAuthorityEnum, null);
 
             // PayLoad Validations
             commonPayloadValidations(responseWrapper, yamlStringWrapper, userWrapper.getInnerElement(), uploadResourceInfoWrapper.getInnerElement());
         }
-        specificResourceAuthorityValidations(responseWrapper, uploadResourceInfoWrapper, yamlStringWrapper, userWrapper.getInnerElement(), request, resourceInfoJsonString, resourceAuthorityEnum);
+        specificResourceAuthorityValidations(responseWrapper, uploadResourceInfoWrapper, yamlStringWrapper, userWrapper.getInnerElement(), request, data, resourceAuthorityEnum);
 
         if (responseWrapper.isEmpty()) {
             handleImport(responseWrapper, userWrapper.getInnerElement(), uploadResourceInfoWrapper.getInnerElement(), yamlStringWrapper.getInnerElement(), resourceAuthorityEnum, true, resourceUniqueId);
         }
     }
 
-    public Either<Resource, ResponseFormat> parseToResource(String resourceJson, User user) {
+    private Either<Resource, ResponseFormat> parseToResource(String resourceJson, User user) {
         return getComponentsUtils().convertJsonToObjectUsingObjectMapper(resourceJson, user, Resource.class, AuditingActionEnum.CREATE_RESOURCE, ComponentTypeEnum.RESOURCE);
     }
 
-    public Either<Resource, ResponseFormat> parseToLightResource(String resourceJson, User user) {
+    private Either<Resource, ResponseFormat> parseToLightResource(String resourceJson, User user) {
         Either<Resource, ResponseFormat> ret = getComponentsUtils().convertJsonToObjectUsingObjectMapper(resourceJson, user, Resource.class, AuditingActionEnum.UPDATE_RESOURCE_METADATA, ComponentTypeEnum.RESOURCE);
         if (ret.isLeft()) {// drop unwanted data (sent from UI in update flow)
             ret.left().value().setRequirements(null);
@@ -212,7 +185,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         modifier.setUserId(userId);
         log.debug("modifier id is {}" , userId);
 
-        Response response = null;
+        Response response;
 
         try {
             String resourceIdLower = resourceId.toLowerCase();
@@ -227,7 +200,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
             response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), null);
             return response;
 
-        } catch (Exception e) {
+        } catch (JSONException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Resource");
             log.debug("delete resource failed with exception", e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
@@ -251,27 +224,17 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         modifier.setUserId(userId);
         log.debug("modifier id is {}" , userId);
 
-        Response response = null;
+        Response response;
+        ResourceBusinessLogic businessLogic = getResourceBL(context);
+        ResponseFormat actionResponse = businessLogic.deleteResourceByNameAndVersion(resourceName, version, modifier);
 
-        try {
-            ResourceBusinessLogic businessLogic = getResourceBL(context);
-            ResponseFormat actionResponse = businessLogic.deleteResourceByNameAndVersion(resourceName, version, modifier);
-
-            if (actionResponse.getStatus() != HttpStatus.SC_NO_CONTENT) {
-                log.debug("failed to delete resource");
-                response = buildErrorResponse(actionResponse);
-                return response;
-            }
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), null);
-            return response;
-
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Delete Resource");
-            log.debug("delete resource failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+        if (actionResponse.getStatus() != HttpStatus.SC_NO_CONTENT) {
+            log.debug("failed to delete resource");
+            response = buildErrorResponse(actionResponse);
             return response;
-
         }
+        response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.NO_CONTENT), null);
+        return response;
     }
 
     @GET
@@ -292,7 +255,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         modifier.setUserId(userId);
         log.debug("modifier id is {}" , userId);
 
-        Response response = null;
+        Response response;
 
         try {
             String resourceIdLower = resourceId.toLowerCase();
@@ -308,7 +271,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
             Object resource = RepresentationUtils.toRepresentation(actionResponse.left().value());
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), resource);
 
-        } catch (Exception e) {
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Resource");
             log.debug("get resource failed with exception", e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
@@ -330,7 +293,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         User modifier = new User();
         modifier.setUserId(userId);
         log.debug("modifier id is {}" , userId);
-        Response response = null;
+        Response response;
         try {
             ResourceBusinessLogic businessLogic = getResourceBL(context);
             Either<Resource, ResponseFormat> actionResponse = businessLogic.getResourceByNameAndVersion(resourceName, resourceVersion, userId);
@@ -341,7 +304,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
             Object resource = RepresentationUtils.toRepresentation(actionResponse.left().value());
             return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), resource);
 
-        } catch (Exception e) {
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Resource by name and version");
             log.debug("get resource failed with exception", e);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
@@ -364,33 +327,27 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         User modifier = new User();
         modifier.setUserId(userId);
         log.debug("modifier id is {}" , userId);
-        Response response = null;
-        try {
-            ResourceBusinessLogic businessLogic = getResourceBL(context);
+        Response response;
+        ResourceBusinessLogic businessLogic = getResourceBL(context);
 
-            if (resourceType != null && !ResourceTypeEnum.containsName(resourceType)) {
-                log.debug("invalid resource type received");
-                response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
-                return response;
+        if (resourceType != null && !ResourceTypeEnum.containsName(resourceType)) {
+            log.debug("invalid resource type received");
+            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
+            return response;
 
-            }
-            ResourceTypeEnum typeEnum = null;
-            if (resourceType != null) {
-                typeEnum = ResourceTypeEnum.valueOf(resourceType);
-            }
-            Either<Map<String, Boolean>, ResponseFormat> actionResponse = businessLogic.validateResourceNameExists(resourceName, typeEnum, userId);
+        }
+        ResourceTypeEnum typeEnum = null;
+        if (resourceType != null) {
+            typeEnum = ResourceTypeEnum.valueOf(resourceType);
+        }
+        Either<Map<String, Boolean>, ResponseFormat> actionResponse = businessLogic.validateResourceNameExists(resourceName, typeEnum, userId);
 
-            if (actionResponse.isRight()) {
-                log.debug("failed to validate resource name");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
-        } catch (Exception e) {
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Validate Resource Name");
-            log.debug("validate resource name failed with exception", e);
-            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+        if (actionResponse.isRight()) {
+            log.debug("failed to validate resource name");
+            response = buildErrorResponse(actionResponse.right().value());
+            return response;
         }
+        return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), actionResponse.left().value());
     }
 
     @GET
@@ -399,33 +356,19 @@ public class ResourcesServlet extends AbstractValidationsServlet {
     @Produces(MediaType.APPLICATION_JSON)
     public Response getCertifiedAbstractResources(@Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
 
-        // TODO: any validations???
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
         log.debug("(get) Start handle request of {}" , url);
-        Response response = null;
         try {
+            List<Resource> resources = getResourceBL(context)
+                    .getAllCertifiedResources(true, HighestFilterEnum.HIGHEST_ONLY, userId);
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), RepresentationUtils.toRepresentation(resources));
 
-            ResourceBusinessLogic businessLogic = getResourceBL(context);
-
-            Either<List<Resource>, ResponseFormat> actionResponse = businessLogic.getAllCertifiedResources(true, HighestFilterEnum.HIGHEST_ONLY, userId);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to get all abstract resources");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-            Object resources = RepresentationUtils.toRepresentation(actionResponse.left().value());
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), resources);
-            return response;
-
-        } catch (Exception e) {
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Certified Abstract Resources");
             log.debug("getCertifiedAbstractResources failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-
+            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
     }
 
@@ -434,33 +377,18 @@ public class ResourcesServlet extends AbstractValidationsServlet {
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public Response getCertifiedNotAbstractResources(@Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        // TODO: any vlidations???
         ServletContext context = request.getSession().getServletContext();
-
         String url = request.getMethod() + " " + request.getRequestURI();
         log.debug("(get) Start handle request of {}" , url);
-        Response response = null;
-
         try {
-
             ResourceBusinessLogic businessLogic = getResourceBL(context);
+            List<Resource> resouces = businessLogic.getAllCertifiedResources(false, HighestFilterEnum.ALL, userId);
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), RepresentationUtils.toRepresentation(resouces));
 
-            Either<List<Resource>, ResponseFormat> actionResponse = businessLogic.getAllCertifiedResources(false, HighestFilterEnum.ALL, userId);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to get all non abstract resources");
-                return buildErrorResponse(actionResponse.right().value());
-            }
-            Object resources = RepresentationUtils.toRepresentation(actionResponse.left().value());
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), resources);
-            return response;
-
-        } catch (Exception e) {
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Get Certified Non Abstract Resources");
             log.debug("getCertifiedNotAbstractResources failed with exception", e);
-            response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
-            return response;
-
+            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
 
     }
@@ -483,9 +411,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         User modifier = new User();
         modifier.setUserId(userId);
         log.debug("modifier id is {}", userId);
-
-        Response response = null;
-
+        Response response;
         try {
             ResourceBusinessLogic businessLogic = getResourceBL(context);
             String resourceIdLower = resourceId.toLowerCase();
@@ -495,18 +421,10 @@ public class ResourcesServlet extends AbstractValidationsServlet {
                 response = buildErrorResponse(updateInfoResource.right().value());
                 return response;
             }
-            Either<Resource, ResponseFormat> actionResponse = businessLogic.updateResourceMetadata(resourceIdLower, updateInfoResource.left().value(), null, modifier, false);
-
-            if (actionResponse.isRight()) {
-                log.debug("failed to update resource metadata");
-                response = buildErrorResponse(actionResponse.right().value());
-                return response;
-            }
-            Object resource = RepresentationUtils.toRepresentation(actionResponse.left().value());
-            response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), resource);
-            return response;
-
-        } catch (Exception e) {
+            Resource updatedResource = businessLogic.updateResourceMetadata(resourceIdLower, updateInfoResource.left().value(), null, modifier, false);
+            Object resource = RepresentationUtils.toRepresentation(updatedResource);
+            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), resource);
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Resource Metadata");
             log.debug("Update Resource Metadata failed with exception", e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
@@ -526,52 +444,35 @@ public class ResourcesServlet extends AbstractValidationsServlet {
             @PathParam(value = "resourceId") String resourceId) {
 
         userId = (userId != null) ? userId : request.getHeader(Constants.USER_ID_HEADER);
-        init(log);
-
+        init();
         ServletContext context = request.getSession().getServletContext();
-
         String url = request.getMethod() + " " + request.getRequestURI();
         log.debug("Start handle request of {}" , url);
-
         // get modifier id
         User modifier = new User();
         modifier.setUserId(userId);
         log.debug("modifier id is {}", userId);
-
-        Response response = null;
+        Response response;
         try {
-
             Wrapper<Response> responseWrapper = new Wrapper<>();
             // UI Import
             if (isUIImport(data)) {
                 performUIImport(responseWrapper, data, request, userId, resourceId);
             } else {
-
                 ResourceBusinessLogic businessLogic = getResourceBL(context);
-
                 Either<Resource, ResponseFormat> convertResponse = parseToLightResource(data, modifier);
                 if (convertResponse.isRight()) {
                     log.debug("failed to parse resource");
                     response = buildErrorResponse(convertResponse.right().value());
                     return response;
                 }
-
-                Resource resource = convertResponse.left().value();
-                Either<Resource, ResponseFormat> actionResponse = businessLogic.validateAndUpdateResourceFromCsar(resource, modifier, null, null, resourceId);
-
-                if (actionResponse.isRight()) {
-                    log.debug("failed to update resource");
-                    response = buildErrorResponse(actionResponse.right().value());
-                } else {
-                    Object representation = RepresentationUtils.toRepresentation(actionResponse.left().value());
-                    response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation);
-                }
+                Resource updatedResource = businessLogic.validateAndUpdateResourceFromCsar(convertResponse.left().value(), modifier, null, null, resourceId);
+                Object representation = RepresentationUtils.toRepresentation(updatedResource);
+                response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.OK), representation);
                 responseWrapper.setInnerElement(response);
             }
-
             return responseWrapper.getInnerElement();
-
-        } catch (Exception e) {
+        } catch (IOException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Update Resource");
             log.debug("update resource failed with exception", e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
@@ -580,22 +481,6 @@ public class ResourcesServlet extends AbstractValidationsServlet {
         }
     }
 
-    public static List<PropertyDefinition> convertMapToList(Map<String, PropertyDefinition> properties) {
-        if (properties == null) {
-            return null;
-        }
-
-        List<PropertyDefinition> definitions = new ArrayList<>();
-        for (Entry<String, PropertyDefinition> entry : properties.entrySet()) {
-            String name = entry.getKey();
-            PropertyDefinition propertyDefinition = entry.getValue();
-            propertyDefinition.setName(name);
-            definitions.add(propertyDefinition);
-        }
-
-        return definitions;
-    }
-
     @GET
     @Path("/resources/csar/{csaruuid}")
     @Consumes(MediaType.APPLICATION_JSON)
@@ -604,7 +489,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
     @ApiResponses(value = { @ApiResponse(code = 201, message = "Resource retrieced"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content") })
     public Response getResourceFromCsar(@Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId, @PathParam(value = "csaruuid") String csarUUID) {
 
-        init(log);
+        init();
 
         ServletContext context = request.getSession().getServletContext();
 
@@ -618,7 +503,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
 
         log.debug("user id is {}", userId);
 
-        Response response = null;
+        Response response;
 
         try {
 
@@ -637,7 +522,7 @@ public class ResourcesServlet extends AbstractValidationsServlet {
 
             return response;
 
-        } catch (Exception e) {
+        } catch (IOException e) {
             log.debug("get resource by csar failed with exception", e);
             response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
             return response;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceForwardingPathServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceForwardingPathServlet.java
index d51ef4cb5e..4e35ecf191 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceForwardingPathServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceForwardingPathServlet.java
@@ -1,24 +1,10 @@
 package org.openecomp.sdc.be.servlets;
 
-import java.util.Collections;
-import java.util.Set;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
+import com.google.common.collect.Sets;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.collections.MapUtils;
 import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
@@ -32,19 +18,18 @@ import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.ui.model.UiComponentDataTransfer;
 import org.openecomp.sdc.be.ui.model.UiServiceDataTransfer;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Sets;
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Collections;
+import java.util.Set;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog/services/{serviceId}/paths")
@@ -54,7 +39,7 @@ import io.swagger.annotations.ApiResponses;
 @Singleton
 public class ServiceForwardingPathServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ServiceForwardingPathServlet.class);
+    private static final Logger log = Logger.getLogger(ServiceForwardingPathServlet.class);
 
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java
index ba5a706c7b..2c19c0fc2f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ServiceServlet.java
@@ -20,27 +20,11 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.reflect.TypeToken;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.http.HttpStatus;
 import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
@@ -48,28 +32,24 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datamodel.ServiceRelations;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.model.DistributionStatusEnum;
-import org.openecomp.sdc.be.model.GroupInstanceProperty;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.reflect.TypeToken;
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
@@ -77,7 +57,7 @@ import io.swagger.annotations.ApiResponses;
 @Singleton
 public class ServiceServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(ServiceServlet.class);
+    private static final Logger log = Logger.getLogger(ServiceServlet.class);
 
     @POST
     @Path("/services")
@@ -173,7 +153,7 @@ public class ServiceServlet extends AbstractValidationsServlet {
     @ApiResponses(value = { @ApiResponse(code = 200, message = "Service found"), @ApiResponse(code = 403, message = "Restricted operation") })
     public Response getComponentAuditRecords(@PathParam("componentType") final String componentType, @PathParam("componentUniqueId") final String componentUniqueId, @Context final HttpServletRequest request,
             @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
-        init(log);
+        init();
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
         log.debug("Start handle request of {}", url);
@@ -181,11 +161,11 @@ public class ServiceServlet extends AbstractValidationsServlet {
         User modifier = new User();
         modifier.setUserId(userId);
         log.debug("modifier id is {}", userId);
-        Wrapper<Response> responseWrapper = new Wrapper<Response>();
+        Wrapper<Response> responseWrapper = new Wrapper<>();
         Wrapper<String> uuidWrapper = new Wrapper<>();
         Wrapper<String> versionWrapper = new Wrapper<>();
         Wrapper<User> userWrapper = new Wrapper<>();
-        Wrapper<ComponentTypeEnum> componentWrapper = new Wrapper<ComponentTypeEnum>();
+        Wrapper<ComponentTypeEnum> componentWrapper = new Wrapper<>();
         try {
             validateUserExist(responseWrapper, userWrapper, userId);
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ToscaDaoServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ToscaDaoServlet.java
index 52fb809c27..82cf0ca59f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ToscaDaoServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ToscaDaoServlet.java
@@ -20,18 +20,18 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import javax.servlet.ServletContext;
-import javax.ws.rs.core.Response;
-
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.impl.DownloadArtifactLogic;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.info.ServletJsonResponse;
 import org.openecomp.sdc.be.resources.api.IResourceUploader;
 import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.web.context.WebApplicationContext;
 
+import javax.servlet.ServletContext;
+import javax.ws.rs.core.Response;
+
 public abstract class ToscaDaoServlet extends BeGenericServlet {
     public abstract Logger getLogger();
 
@@ -66,8 +66,6 @@ public abstract class ToscaDaoServlet extends BeGenericServlet {
         jsonResponse.setDescription(errorMessage);
         jsonResponse.setSource(Constants.CATALOG_BE);
 
-        Response response = Response.status(status).entity(jsonResponse).build();
-
-        return response;
+        return Response.status(status).entity(jsonResponse).build();
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java
index b586327426..8bb93a7d3d 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesFetchServlet.java
@@ -20,20 +20,12 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.util.Map;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import org.openecomp.sdc.be.components.impl.PropertyBusinessLogic;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -42,25 +34,26 @@ import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.jcabi.aspects.Loggable;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.util.Map;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog")
 @Api(value = "Types Fetch Servlet", description = "Types Fetch Servlet")
 @Singleton
 public class TypesFetchServlet extends AbstractValidationsServlet {
 
-    private static final Logger log = LoggerFactory.getLogger(TypesFetchServlet.class);
+    private static final Logger log = Logger.getLogger(TypesFetchServlet.class);
 
     @GET
     @Path("dataTypes")
@@ -71,12 +64,12 @@ public class TypesFetchServlet extends AbstractValidationsServlet {
             @ApiResponse(code = 404, message = "Data types not found") })
     public Response getAllDataTypesServlet(@Context final HttpServletRequest request, @HeaderParam(value = Constants.USER_ID_HEADER) String userId) {
 
-        Wrapper<Response> responseWrapper = new Wrapper<Response>();
-        Wrapper<User> userWrapper = new Wrapper<User>();
+        Wrapper<Response> responseWrapper = new Wrapper<>();
+        Wrapper<User> userWrapper = new Wrapper<>();
         ServletContext context = request.getSession().getServletContext();
 
         try {
-            init(log);
+            init();
             validateUserExist(responseWrapper, userWrapper, userId);
 
             if (responseWrapper.isEmpty()) {
@@ -113,8 +106,7 @@ public class TypesFetchServlet extends AbstractValidationsServlet {
     private PropertyBusinessLogic getPropertyBL(ServletContext context) {
         WebAppContextWrapper webApplicationContextWrapper = (WebAppContextWrapper) context.getAttribute(Constants.WEB_APPLICATION_CONTEXT_WRAPPER_ATTR);
         WebApplicationContext webApplicationContext = webApplicationContextWrapper.getWebAppContext(context);
-        PropertyBusinessLogic propertytBl = webApplicationContext.getBean(PropertyBusinessLogic.class);
-        return propertytBl;
+        return webApplicationContext.getBean(PropertyBusinessLogic.class);
     }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java
new file mode 100644
index 0000000000..b8436adf4f
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadEndpoint.java
@@ -0,0 +1,105 @@
+package org.openecomp.sdc.be.servlets;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.jcabi.aspects.Loggable;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.openecomp.sdc.be.components.impl.CommonImportManager;
+import org.openecomp.sdc.be.components.validation.AccessValidations;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+import org.openecomp.sdc.be.model.AnnotationTypeDefinition;
+import org.openecomp.sdc.be.model.operations.impl.AnnotationTypeOperations;
+import org.openecomp.sdc.be.utils.TypeUtils;
+import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Here new APIs for types upload written in an attempt to gradually servlet code
+ */
+@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Path("/v1/catalog/uploadType")
+@Consumes(MediaType.MULTIPART_FORM_DATA)
+@Produces(MediaType.APPLICATION_JSON)
+@Api(value = "Catalog Types Upload")
+@Controller
+public class TypesUploadEndpoint {
+
+    private final CommonImportManager commonImportManager;
+    private final AnnotationTypeOperations annotationTypeOperations;
+    private final AccessValidations accessValidations;
+
+    public TypesUploadEndpoint(CommonImportManager commonImportManager, AnnotationTypeOperations annotationTypeOperations, AccessValidations accessValidations) {
+        this.commonImportManager = commonImportManager;
+        this.annotationTypeOperations = annotationTypeOperations;
+        this.accessValidations = accessValidations;
+    }
+
+    @POST
+    @Path("/annotationtypes")
+    @ApiOperation(value = "Create AnnotationTypes from yaml", httpMethod = "POST", notes = "Returns created annotation types", response = Response.class)
+    @ApiResponses(value = {
+            @ApiResponse(code = 201, message = "annotation types created"),
+            @ApiResponse(code = 403, message = "Restricted operation"),
+            @ApiResponse(code = 400, message = "Invalid content / Missing content"),
+            @ApiResponse(code = 409, message = "annotation types already exist")})
+    public Response uploadAnnotationTypes(
+            @ApiParam("FileInputStream") @FormDataParam("annotationTypesZip") File file,
+            @HeaderParam("USER_ID") String userId) throws IOException {
+        accessValidations.validateUserExists(userId, "Annotation Types Creation");
+        Wrapper<String> yamlStringWrapper = new Wrapper<>();
+        AbstractValidationsServlet.extractZipContents(yamlStringWrapper, file);
+        List<ImmutablePair<AnnotationTypeDefinition, Boolean>> typesResults = commonImportManager.createElementTypes(yamlStringWrapper.getInnerElement(), TypesUploadEndpoint::buildAnnotationFromFieldMap, annotationTypeOperations);
+        HttpStatus status = getHttpStatus(typesResults);
+        return Response.status(status.value())
+                .entity(typesResults)
+                .build();
+    }
+
+    @VisibleForTesting
+    static <T extends ToscaDataDefinition> HttpStatus getHttpStatus(List<ImmutablePair<T, Boolean>> typesResults) {
+        boolean typeActionFailed = false;
+        boolean typeExists = false;
+        boolean typeActionSucceeded = false;
+        for (ImmutablePair<T, Boolean> typeResult : typesResults) {
+            Boolean result = typeResult.getRight();
+            if (result==null) {
+                typeExists = true;
+            } else if (result) {
+                typeActionSucceeded = true;
+            } else {
+                typeActionFailed = true;
+            }
+        }
+        HttpStatus status = HttpStatus.OK;
+        if (typeActionFailed) {
+            status =  HttpStatus.BAD_REQUEST;
+        } else if (typeActionSucceeded) {
+            status = HttpStatus.CREATED;
+        } else if (typeExists) {
+            status = HttpStatus.CONFLICT;
+        }
+        return status;
+    }
+
+    private static <T extends ToscaDataDefinition> T buildAnnotationFromFieldMap(String typeName, Map<String, Object> toscaJson) {
+        AnnotationTypeDefinition annotationType = new AnnotationTypeDefinition();
+        annotationType.setVersion(TypeUtils.FIRST_CERTIFIED_VERSION_VERSION);
+        annotationType.setHighestVersion(true);
+        annotationType.setType(typeName);
+        TypeUtils.setField(toscaJson, TypeUtils.ToscaTagNamesEnum.DESCRIPTION, annotationType::setDescription);
+        CommonImportManager.setProperties(toscaJson, annotationType::setProperties);
+        return (T) annotationType;
+    }
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadServlet.java
index 8cb3cbdfc6..a09e34fa9a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/TypesUploadServlet.java
@@ -20,32 +20,14 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.google.gson.reflect.TypeToken;
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.glassfish.jersey.media.multipart.FormDataParam;
-import org.openecomp.sdc.be.components.impl.CapabilityTypeImportManager;
-import org.openecomp.sdc.be.components.impl.CategoriesImportManager;
-import org.openecomp.sdc.be.components.impl.DataTypeImportManager;
-import org.openecomp.sdc.be.components.impl.GroupTypeImportManager;
-import org.openecomp.sdc.be.components.impl.InterfaceLifecycleTypeImportManager;
-import org.openecomp.sdc.be.components.impl.PolicyTypeImportManager;
+import org.openecomp.sdc.be.components.impl.*;
+import org.openecomp.sdc.be.components.impl.model.ToscaTypeImportData;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
@@ -53,41 +35,46 @@ import org.openecomp.sdc.be.model.DataTypeDefinition;
 import org.openecomp.sdc.be.model.GroupTypeDefinition;
 import org.openecomp.sdc.be.model.PolicyTypeDefinition;
 import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.normatives.ToscaTypeMetadata;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.FunctionalInterfaces.ConsumerTwoParam;
 import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 
-import com.jcabi.aspects.Loggable;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/catalog/uploadType")
+@Consumes(MediaType.MULTIPART_FORM_DATA)
+@Produces(MediaType.APPLICATION_JSON)
 @Api(value = "Catalog Types Upload")
 @Controller
 public class TypesUploadServlet extends AbstractValidationsServlet {
-    private static final Logger log = LoggerFactory.getLogger(TypesUploadServlet.class);
-    private CapabilityTypeImportManager capabilityTypeImportManager;
+    private static final Logger log = Logger.getLogger(TypesUploadServlet.class);
+    public static final String CREATE = "Create ";
 
+    private final CapabilityTypeImportManager capabilityTypeImportManager;
     private final InterfaceLifecycleTypeImportManager interfaceLifecycleTypeImportManager;
-
     private final CategoriesImportManager categoriesImportManager;
-
     private final DataTypeImportManager dataTypeImportManager;
-
     private final GroupTypeImportManager groupTypeImportManager;
-
     private final PolicyTypeImportManager policyTypeImportManager;
 
-    public TypesUploadServlet(CapabilityTypeImportManager capabilityTypeImportManager, InterfaceLifecycleTypeImportManager interfaceLifecycleTypeImportManager, CategoriesImportManager categoriesImportManager, DataTypeImportManager dataTypeImportManager, GroupTypeImportManager groupTypeImportManager, PolicyTypeImportManager policyTypeImportManager) {
+    public TypesUploadServlet(CapabilityTypeImportManager capabilityTypeImportManager, InterfaceLifecycleTypeImportManager interfaceLifecycleTypeImportManager, CategoriesImportManager categoriesImportManager, DataTypeImportManager dataTypeImportManager,
+                              GroupTypeImportManager groupTypeImportManager, PolicyTypeImportManager policyTypeImportManager) {
         this.capabilityTypeImportManager = capabilityTypeImportManager;
         this.interfaceLifecycleTypeImportManager = interfaceLifecycleTypeImportManager;
         this.categoriesImportManager = categoriesImportManager;
@@ -98,8 +85,6 @@ public class TypesUploadServlet extends AbstractValidationsServlet {
 
     @POST
     @Path("/capability")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Create Capability Type from yaml", httpMethod = "POST", notes = "Returns created Capability Type", response = Response.class)
     @ApiResponses(value = { @ApiResponse(code = 201, message = "Capability Type created"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content"),
     @ApiResponse(code = 409, message = "Capability Type already exist") })
@@ -110,8 +95,6 @@ public class TypesUploadServlet extends AbstractValidationsServlet {
 
     @POST
     @Path("/interfaceLifecycle")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Create Interface Lyfecycle Type from yaml", httpMethod = "POST", notes = "Returns created Interface Lifecycle Type", response = Response.class)
     @ApiResponses(value = { @ApiResponse(code = 201, message = "Interface Lifecycle Type created"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content"),
     @ApiResponse(code = 409, message = "Interface Lifecycle Type already exist") })
@@ -122,8 +105,6 @@ public class TypesUploadServlet extends AbstractValidationsServlet {
 
     @POST
     @Path("/categories")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Create Categories from yaml", httpMethod = "POST", notes = "Returns created categories", response = Response.class)
     @ApiResponses(value = { @ApiResponse(code = 201, message = "Categories created"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content"),
     @ApiResponse(code = 409, message = "Category already exist") })
@@ -134,73 +115,105 @@ public class TypesUploadServlet extends AbstractValidationsServlet {
 
     @POST
     @Path("/datatypes")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Create Categories from yaml", httpMethod = "POST", notes = "Returns created data types", response = Response.class)
     @ApiResponses(value = { @ApiResponse(code = 201, message = "Data types created"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content"),
     @ApiResponse(code = 409, message = "Data types already exist") })
     public Response uploadDataTypes(@ApiParam("FileInputStream") @FormDataParam("dataTypesZip") File file, @Context final HttpServletRequest request, @HeaderParam("USER_ID") String creator) {
-        ConsumerTwoParam<Wrapper<Response>, String> createElementsMethod = (responseWrapper, ymlPayload) -> createDataTypes(responseWrapper, ymlPayload);
+        ConsumerTwoParam<Wrapper<Response>, String> createElementsMethod = this::createDataTypes;
         return uploadElementTypeServletLogic(createElementsMethod, file, request, creator, NodeTypeEnum.DataType.getName());
     }
 
     @POST
     @Path("/grouptypes")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Create GroupTypes from yaml", httpMethod = "POST", notes = "Returns created group types", response = Response.class)
     @ApiResponses(value = { @ApiResponse(code = 201, message = "group types created"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content"),
     @ApiResponse(code = 409, message = "group types already exist") })
-    public Response uploadGroupTypes(@ApiParam("FileInputStream") @FormDataParam("groupTypesZip") File file, @Context final HttpServletRequest request, @HeaderParam("USER_ID") String creator) {
-        ConsumerTwoParam<Wrapper<Response>, String> createElementsMethod = (responseWrapper, ymlPayload) -> createGroupTypes(responseWrapper, ymlPayload);
-        return uploadElementTypeServletLogic(createElementsMethod, file, request, creator, NodeTypeEnum.GroupType.getName());
+    public Response uploadGroupTypes(@ApiParam("toscaTypeMetadata") @FormDataParam("toscaTypeMetadata") String toscaTypesMetaData,
+                                     @ApiParam("FileInputStream") @FormDataParam("groupTypesZip") File file,
+                                     @Context final HttpServletRequest request,
+                                     @HeaderParam("USER_ID") String creator) {
+        Map<String, ToscaTypeMetadata> typesMetadata = getTypesMetadata(toscaTypesMetaData);
+        return uploadTypesWithMetaData(this::createGroupTypes, typesMetadata, file, request, creator, NodeTypeEnum.GroupType.getName());
     }
 
     @POST
     @Path("/policytypes")
-    @Consumes(MediaType.MULTIPART_FORM_DATA)
-    @Produces(MediaType.APPLICATION_JSON)
     @ApiOperation(value = "Create PolicyTypes from yaml", httpMethod = "POST", notes = "Returns created policy types", response = Response.class)
-    @ApiResponses(value = { @ApiResponse(code = 201, message = "policy types created"), @ApiResponse(code = 403, message = "Restricted operation"), @ApiResponse(code = 400, message = "Invalid content / Missing content"),
+    @ApiResponses(value = { @ApiResponse(code = 201, message = "policy types created"),
+                            @ApiResponse(code = 403, message = "Restricted operation"),
+                            @ApiResponse(code = 400, message = "Invalid content / Missing content"),
     @ApiResponse(code = 409, message = "policy types already exist") })
-    public Response uploadPolicyTypes(@ApiParam("FileInputStream") @FormDataParam("policyTypesZip") File file, @Context final HttpServletRequest request, @HeaderParam("USER_ID") String creator) {
-        return uploadElementTypeServletLogic(this::createPolicyTypes, file, request, creator, NodeTypeEnum.PolicyType.getName());
+    public Response uploadPolicyTypes(
+            @ApiParam("toscaTypeMetadata") @FormDataParam("toscaTypeMetadata") String toscaTypesMetaData,
+            @ApiParam("FileInputStream") @FormDataParam("policyTypesZip") File file,
+            @Context final HttpServletRequest request, @HeaderParam("USER_ID") String creator) {
+        Map<String, ToscaTypeMetadata> typesMetadata = getTypesMetadata(toscaTypesMetaData);
+        return uploadTypesWithMetaData(this::createPolicyTypes, typesMetadata, file, request, creator, NodeTypeEnum.PolicyType.getName());
+    }
+
+    private Map<String, ToscaTypeMetadata> getTypesMetadata(String toscaTypesMetaData) {
+        return gson.fromJson(toscaTypesMetaData, new TypeToken<Map<String, ToscaTypeMetadata>>(){}.getType());
     }
 
     private Response uploadElementTypeServletLogic(ConsumerTwoParam<Wrapper<Response>, String> createElementsMethod, File file, final HttpServletRequest request, String creator, String elementTypeName) {
-        init(log);
+        init();
         String userId = initHeaderParam(creator, request, Constants.USER_ID_HEADER);
         try {
-            Wrapper<Response> responseWrapper = new Wrapper<>();
-            Wrapper<User> userWrapper = new Wrapper<>();
             Wrapper<String> yamlStringWrapper = new Wrapper<>();
 
             String url = request.getMethod() + " " + request.getRequestURI();
             log.debug("Start handle request of {}", url);
-
-            validateUserExist(responseWrapper, userWrapper, userId);
-
+            Wrapper<Response> responseWrapper = doUploadTypeValidations(request, userId, file);
             if (responseWrapper.isEmpty()) {
-                validateUserRole(responseWrapper, userWrapper.getInnerElement());
+                fillZipContents(yamlStringWrapper, file);
             }
-
             if (responseWrapper.isEmpty()) {
-                validateDataNotNull(responseWrapper, file);
+                createElementsMethod.accept(responseWrapper, yamlStringWrapper.getInnerElement());
             }
+            return responseWrapper.getInnerElement();
+        } catch (Exception e) {
+            log.debug("create {} failed with exception:", elementTypeName, e);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(CREATE + elementTypeName);
+            return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+        }
+    }
 
+    private Wrapper<Response> doUploadTypeValidations(final HttpServletRequest request, String userId, File file) {
+        Wrapper<Response> responseWrapper = new Wrapper<>();
+        Wrapper<User> userWrapper = new Wrapper<>();
+
+        String url = request.getMethod() + " " + request.getRequestURI();
+        log.debug("Start handle request of {}", url);
+
+        validateUserExist(responseWrapper, userWrapper, userId);
+
+        if (responseWrapper.isEmpty()) {
+            validateUserRole(responseWrapper, userWrapper.getInnerElement());
+        }
+
+        if (responseWrapper.isEmpty()) {
+            validateDataNotNull(responseWrapper, file);
+        }
+        return responseWrapper;
+    }
+
+    private Response uploadTypesWithMetaData(ConsumerTwoParam<Wrapper<Response>, ToscaTypeImportData> createElementsMethod, Map<String, ToscaTypeMetadata> typesMetaData, File file, final HttpServletRequest request, String creator, String elementTypeName) {
+        init();
+        String userId = initHeaderParam(creator, request, Constants.USER_ID_HEADER);
+        Wrapper<String> yamlStringWrapper = new Wrapper<>();
+        try {
+            Wrapper<Response> responseWrapper = doUploadTypeValidations(request, userId, file);
             if (responseWrapper.isEmpty()) {
                 fillZipContents(yamlStringWrapper, file);
             }
-
             if (responseWrapper.isEmpty()) {
-                createElementsMethod.accept(responseWrapper, yamlStringWrapper.getInnerElement());
+                ToscaTypeImportData toscaTypeImportData = new ToscaTypeImportData(yamlStringWrapper.getInnerElement(), typesMetaData);
+                createElementsMethod.accept(responseWrapper, toscaTypeImportData);
             }
-
             return responseWrapper.getInnerElement();
-
         } catch (Exception e) {
             log.debug("create {} failed with exception:", elementTypeName, e);
-            BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create " + elementTypeName);
+            BeEcompErrorManager.getInstance().logBeRestApiGeneralError(CREATE + elementTypeName);
             return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
     }
@@ -229,14 +242,14 @@ public class TypesUploadServlet extends AbstractValidationsServlet {
     }
 
     // group types
-    private void createGroupTypes(Wrapper<Response> responseWrapper, String groupTypesYml) {
-        final Supplier<Either<List<ImmutablePair<GroupTypeDefinition, Boolean>>, ResponseFormat>> generateElementTypeFromYml = () -> groupTypeImportManager.createGroupTypes(groupTypesYml);
+    private void createGroupTypes(Wrapper<Response> responseWrapper, ToscaTypeImportData toscaTypeImportData) {
+        final Supplier<Either<List<ImmutablePair<GroupTypeDefinition, Boolean>>, ResponseFormat>> generateElementTypeFromYml = () -> groupTypeImportManager.createGroupTypes(toscaTypeImportData);
         buildStatusForElementTypeCreate(responseWrapper, generateElementTypeFromYml, ActionStatus.GROUP_TYPE_ALREADY_EXIST, NodeTypeEnum.GroupType.name());
     }
 
     // policy types
-    private void createPolicyTypes(Wrapper<Response> responseWrapper, String policyTypesYml) {
-        final Supplier<Either<List<ImmutablePair<PolicyTypeDefinition, Boolean>>, ResponseFormat>> generateElementTypeFromYml = () -> policyTypeImportManager.createPolicyTypes(policyTypesYml);
+    private void createPolicyTypes(Wrapper<Response> responseWrapper, ToscaTypeImportData toscaTypeImportData) {
+        final Supplier<Either<List<ImmutablePair<PolicyTypeDefinition, Boolean>>, ResponseFormat>> generateElementTypeFromYml = () -> policyTypeImportManager.createPolicyTypes(toscaTypeImportData);
         buildStatusForElementTypeCreate(responseWrapper, generateElementTypeFromYml, ActionStatus.POLICY_TYPE_ALREADY_EXIST, NodeTypeEnum.PolicyType.name());
     }
 
@@ -279,7 +292,7 @@ public class TypesUploadServlet extends AbstractValidationsServlet {
                 responseWrapper.setInnerElement(response);
 
             } catch (IOException e) {
-                BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create " + elementTypeName);
+                BeEcompErrorManager.getInstance().logBeRestApiGeneralError(CREATE + elementTypeName);
                 log.debug("failed to convert {} to json", elementTypeName, e);
                 Response response = buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
                 responseWrapper.setInnerElement(response);
@@ -287,4 +300,5 @@ public class TypesUploadServlet extends AbstractValidationsServlet {
         }
     }
 
+
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java
index 7f7c1a8bbd..4d886be6c2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/UserAdminServlet.java
@@ -20,53 +20,39 @@
 
 package org.openecomp.sdc.be.servlets;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Singleton;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
+import com.jcabi.aspects.Loggable;
+import fj.data.Either;
+import io.swagger.annotations.*;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.jcabi.aspects.Loggable;
-
-import fj.data.Either;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
 @Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
 @Path("/v1/user")
 @Api(value = "User Administration", description = "User admininstarator operations")
 @Singleton
 public class UserAdminServlet extends BeGenericServlet {
 
-    private static final String ROLE_DELIMITER = ",";
-    private static final Logger log = LoggerFactory.getLogger(UserAdminServlet.class);
+    private static final String UTF_8 = "UTF-8";
+	private static final String START_HANDLE_REQUEST_OF = "Start handle request of {}";
+	private static final String ROLE_DELIMITER = ",";
+    private static final Logger log = Logger.getLogger(UserAdminServlet.class);
 
     /***************************************
      * API start
@@ -157,7 +143,7 @@ public class UserAdminServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         // get modifier id
         User modifier = new User();
@@ -202,7 +188,7 @@ public class UserAdminServlet extends BeGenericServlet {
         ServletContext context = request.getSession().getServletContext();
 
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         // get modifier id
         User modifier = new User();
@@ -250,10 +236,10 @@ public class UserAdminServlet extends BeGenericServlet {
             @HeaderParam("HTTP_CSP_EMAIL") String email) {
 
         try {
-            userId = userId != null ? URLDecoder.decode(userId, "UTF-8") : null;
-            firstName = firstName != null ? URLDecoder.decode(firstName, "UTF-8") : null;
-            lastName = lastName != null ? URLDecoder.decode(lastName, "UTF-8") : null;
-            email = email != null ? URLDecoder.decode(email, "UTF-8") : null;
+            userId = userId != null ? URLDecoder.decode(userId, UTF_8) : null;
+            firstName = firstName != null ? URLDecoder.decode(firstName, UTF_8) : null;
+            lastName = lastName != null ? URLDecoder.decode(lastName, UTF_8) : null;
+            email = email != null ? URLDecoder.decode(email, UTF_8) : null;
         } catch (UnsupportedEncodingException e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Authorize User - decode headers");
             ResponseFormat errorResponseWrapper = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
@@ -263,7 +249,7 @@ public class UserAdminServlet extends BeGenericServlet {
 
         ServletContext context = request.getSession().getServletContext();
         String url = request.getMethod() + " " + request.getRequestURI();
-        log.debug("Start handle request of {}", url);
+        log.debug(START_HANDLE_REQUEST_OF, url);
 
         User authUser = new User();
         authUser.setUserId(userId);
@@ -307,7 +293,7 @@ public class UserAdminServlet extends BeGenericServlet {
         UserBusinessLogic userAdminManager = getUserAdminManager(request.getSession().getServletContext());
 
         try {
-            Either<List<User>, ResponseFormat> either = userAdminManager.getAllAdminUsers(request.getSession().getServletContext());
+            Either<List<User>, ResponseFormat> either = userAdminManager.getAllAdminUsers();
 
             if (either.isRight()) {
                 log.debug("Failed to get all admin users");
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentExceptionMapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/ComponentExceptionMapper.java
index fb226bb842..4ec1915014 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentExceptionMapper.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/ComponentExceptionMapper.java
@@ -1,33 +1,36 @@
-package org.openecomp.sdc.be.servlets;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+package org.openecomp.sdc.be.servlets.exception;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
 
 @Component
 @Provider
 public class ComponentExceptionMapper implements ExceptionMapper<ComponentException> {
 
+    private static final Logger log = Logger.getLogger(ComponentExceptionMapper.class);
+    private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
     private final ComponentsUtils componentsUtils;
-    protected Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
     public ComponentExceptionMapper(ComponentsUtils componentsUtils) {
         this.componentsUtils = componentsUtils;
     }
 
     @Override
-    public Response toResponse(ComponentException componentException) {
-        ResponseFormat responseFormat = componentException.getResponseFormat();
-        if (componentException.getResponseFormat()==null) {
-            responseFormat = componentsUtils.getResponseFormat(componentException.getActionStatus(), componentException.getParams());
+    public Response toResponse(ComponentException exception) {
+        // TODO log this? BeEcompErrorManager.getInstance().logBeRestApiGeneralError(requestURI);
+        log.debug("#toResponse - An error occurred: ", exception);
+        ResponseFormat responseFormat = exception.getResponseFormat();
+        if (exception.getResponseFormat()==null) {
+            responseFormat = componentsUtils.getResponseFormat(exception.getActionStatus(), exception.getParams());
         }
 
         return Response.status(responseFormat.getStatus())
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DefaultExceptionMapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/DefaultExceptionMapper.java
index c362956b9d..d19a64ee65 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/DefaultExceptionMapper.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/DefaultExceptionMapper.java
@@ -1,21 +1,24 @@
-package org.openecomp.sdc.be.servlets;
+package org.openecomp.sdc.be.servlets.exception;
+
+import org.eclipse.jetty.http.HttpStatus;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.stereotype.Component;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.jetty.http.HttpStatus;
-import org.springframework.stereotype.Component;
-
 @Component
 @Provider
 public class DefaultExceptionMapper implements ExceptionMapper<Exception> {
 
+    private static final Logger log = Logger.getLogger(DefaultExceptionMapper.class);
+
     @Override
     public Response toResponse(Exception exception) {
+        log.debug("#toResponse - An error occurred: ", exception);
         return Response.status(HttpStatus.INTERNAL_SERVER_ERROR_500)
                 .entity(exception.getMessage())
                 .build();
     }
-
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/StorageExceptionMapper.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java
index 930cb909b9..0a56591f67 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/StorageExceptionMapper.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/exception/StorageExceptionMapper.java
@@ -1,25 +1,26 @@
-package org.openecomp.sdc.be.servlets;
+package org.openecomp.sdc.be.servlets.exception;
 
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.stereotype.Component;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
 
 @Component
 @Provider
 public class StorageExceptionMapper implements ExceptionMapper<StorageException>  {
 
+    private static final Logger log = Logger.getLogger(DefaultExceptionMapper.class);
+    private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
     private final ComponentsUtils componentsUtils;
-    protected Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
     public StorageExceptionMapper(ComponentsUtils componentsUtils) {
         this.componentsUtils = componentsUtils;
@@ -27,8 +28,9 @@ public class StorageExceptionMapper implements ExceptionMapper<StorageException>
 
     @Override
     public Response toResponse(StorageException exception) {
+        log.debug("#toResponse - An error occurred: ", exception);
         ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(exception.getStorageOperationStatus());
-        ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus);
+        ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus, exception.getParams());
         return Response.status(responseFormat.getStatus())
                 .entity(gson.toJson(responseFormat.getRequestError()))
                 .build();
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java b/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java
index c461970de1..fcca2697c2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/switchover/detector/SwitchoverDetector.java
@@ -20,18 +20,6 @@
 
 package org.openecomp.sdc.be.switchover.detector;
 
-import java.net.InetAddress;
-import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
@@ -39,17 +27,20 @@ import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.Configuration.SwitchoverDetectorConfig;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.common.http.client.api.HttpRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.net.InetAddress;
+import java.util.Properties;
+import java.util.concurrent.*;
+
 @Component("switchover-detector")
 public class SwitchoverDetector {
 
     protected static String SWITCHOVER_DETECTOR_LOG_CONTEXT = "switchover.detector";
 
-    private static final Logger switchoverLogger = LoggerFactory.getLogger(SWITCHOVER_DETECTOR_LOG_CONTEXT);
-
     private SwitchoverDetectorConfig switchoverDetectorConfig;
 
     private Properties authHeader = null;
@@ -64,7 +55,7 @@ public class SwitchoverDetector {
 
     private Boolean feMatch = null;
 
-    private static final Logger logger = LoggerFactory.getLogger(SwitchoverDetector.class);
+    private static final Logger logger = Logger.getLogger(SwitchoverDetector.class);
 
     private volatile String siteMode = SwitchoverDetectorState.UNKNOWN.getState();
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ArtifactTypes.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ArtifactTypes.java
deleted file mode 100644
index e52dc3a59c..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ArtifactTypes.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.openecomp.sdc.be.tosca;
-
-import java.util.List;
-
-import org.onap.sdc.generator.data.ArtifactType;
-
-
-public class ArtifactTypes {
-    private List<ArtifactType> artifactTypes;
-
-    public List<ArtifactType> getArtifactTypes() {
-        return artifactTypes;
-    }
-
-    public void setArtifactTypes(List<ArtifactType> artifactTypes) {
-        this.artifactTypes = artifactTypes;
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabilityRequirementConverter.java
index f544eed42d..6a06c943a0 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabilityRequirementConverter.java
@@ -20,55 +20,34 @@
 
 package org.openecomp.sdc.be.tosca;
 
-import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNoneBlank;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import fj.data.Either;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.RequirementDataDefinition;
-import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.ComponentParametersView;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.RequirementDefinition;
+import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.tosca.ToscaUtils.SubstituitionEntry;
-import org.openecomp.sdc.be.tosca.model.SubstitutionMapping;
-import org.openecomp.sdc.be.tosca.model.ToscaCapability;
-import org.openecomp.sdc.be.tosca.model.ToscaNodeTemplate;
-import org.openecomp.sdc.be.tosca.model.ToscaNodeType;
-import org.openecomp.sdc.be.tosca.model.ToscaProperty;
-import org.openecomp.sdc.be.tosca.model.ToscaRequirement;
-import org.openecomp.sdc.be.tosca.model.ToscaTemplateCapability;
-import org.openecomp.sdc.common.util.ValidationUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.be.model.utils.ComponentUtilities;
+import org.openecomp.sdc.be.tosca.ToscaUtils.SubstitutionEntry;
+import org.openecomp.sdc.be.tosca.model.*;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
-import fj.data.Either;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+import static org.apache.commons.lang3.StringUtils.isNoneBlank;
 
 /**
  * Allows to convert requirements\capabilities of a component to requirements\capabilities of a substitution mappings section of a tosca template
@@ -76,32 +55,38 @@ import fj.data.Either;
  */
 @org.springframework.stereotype.Component("capabilty-requirement-convertor")
 @Scope(value = "singleton")
-public class CapabiltyRequirementConvertor {
+public class CapabilityRequirementConverter {
 
     private static final String NO_CAPABILITIES = "No Capabilities for node type";
-    private static CapabiltyRequirementConvertor instance;
-    private static final Logger logger = LoggerFactory.getLogger(CapabiltyRequirementConvertor.class);
-    public static final String PATH_DELIMITER = ".";
+    private static CapabilityRequirementConverter instance;
+    private static final Logger logger = Logger.getLogger(CapabilityRequirementConverter.class);
+    private static final String PATH_DELIMITER = ".";
 
     @Autowired
     private ToscaOperationFacade toscaOperationFacade;
 
-    protected CapabiltyRequirementConvertor() {}
+    public CapabilityRequirementConverter() {}
 
-    public static synchronized CapabiltyRequirementConvertor getInstance() {
+    public static synchronized CapabilityRequirementConverter getInstance() {
         if (instance == null) {
-            instance = new CapabiltyRequirementConvertor();
+            instance = new CapabilityRequirementConverter();
         }
         return instance;
     }
 
     public String buildCapabilityNameForComponentInstance( Map<String,Component> componentCache , ComponentInstance componentInstance, CapabilityDefinition c) {
-
-        Either eitherName = buildSubstitutedName(componentCache, c.getName(), c.getPath(), c.getOwnerId(), componentInstance);
-
-        return eitherName.isLeft() ? (String) eitherName.left().value() : c.getName() ;
+        String prefix = buildCapReqNamePrefix(componentInstance.getNormalizedName());
+        if(ComponentUtilities.isNotUpdatedCapReqName(prefix, c.getName(), c.getPreviousName())){
+            return buildSubstitutedName(componentCache, c.getName(), c.getPreviousName(), c.getPath(), c.getOwnerId(), componentInstance)
+                    .left()
+                    .orValue(c.getName());
+        }
+        return c.getPreviousName();
     }
 
+    private String buildCapReqNamePrefix(String normalizedName) {
+        return normalizedName + PATH_DELIMITER;
+    }
 
     /**
      * Allows to convert capabilities of a component to capabilities of a substitution mappings section of a tosca template
@@ -110,7 +95,7 @@ public class CapabiltyRequirementConvertor {
      * @param nodeTemplate
      * @return
      */
-    public Either<ToscaNodeTemplate, ToscaError> convertComponentInstanceCapabilties(ComponentInstance componentInstance, Map<String, DataTypeDefinition> dataTypes, ToscaNodeTemplate nodeTemplate) {
+    public Either<ToscaNodeTemplate, ToscaError> convertComponentInstanceCapabilities(ComponentInstance componentInstance, Map<String, DataTypeDefinition> dataTypes, ToscaNodeTemplate nodeTemplate) {
 
         Map<String, List<CapabilityDefinition>> capabilitiesInst = componentInstance.getCapabilities();
         Map<String,Component> componentCache = new HashMap<>();
@@ -119,10 +104,9 @@ public class CapabiltyRequirementConvertor {
             capabilitiesInst.entrySet().forEach( e -> {
                 List<CapabilityDefinition> capList = e.getValue();
                 if ( capList != null && !capList.isEmpty() ) {
-                    capList.forEach( c -> {
-                        String capName = buildCapabilityNameForComponentInstance( componentCache , componentInstance , c ) ;
-                        convertOverridenProperties( componentInstance, dataTypes, capabilities, c , capName );
-                    } );
+                    capList.stream()
+                            .forEach( c -> convertOverridenProperties( componentInstance, dataTypes, capabilities, c ,
+                                buildCapabilityNameForComponentInstance( componentCache , componentInstance , c )));
                 }
             });
             if (MapUtils.isNotEmpty(capabilities)) {
@@ -137,13 +121,13 @@ public class CapabiltyRequirementConvertor {
             c.getProperties()
             .stream()
             .filter(p -> p.getValue() != null || p.getDefaultValue() != null)
-            .forEach(p -> convertOverridenProperty(componentInstance, dataTypes, capabilties , p ,capabilityName));
+            .forEach(p -> convertOverriddenProperty(componentInstance, dataTypes, capabilties , p ,capabilityName));
         }
     }
 
-    private void convertOverridenProperty(ComponentInstance componentInstance, Map<String, DataTypeDefinition> dataTypes, Map<String, ToscaTemplateCapability> capabilties, ComponentInstanceProperty p ,String capabilityName) {
+    private void convertOverriddenProperty(ComponentInstance componentInstance, Map<String, DataTypeDefinition> dataTypes, Map<String, ToscaTemplateCapability> capabilties, ComponentInstanceProperty p , String capabilityName) {
         if (logger.isDebugEnabled()) {
-            logger.debug("Exist overriden property {} for capabity {} with value {}", p.getName(), capabilityName, p.getValue());
+            logger.debug("Exist d property {} for capability {} with value {}", p.getName(), capabilityName, p.getValue());
         }
         ToscaTemplateCapability toscaTemplateCapability = capabilties.computeIfAbsent( capabilityName , key -> new ToscaTemplateCapability() );
 
@@ -164,7 +148,7 @@ public class CapabiltyRequirementConvertor {
             innerType = prop.getSchema().getProperty().getType();
         }
         String propValue = prop.getValue() == null ? prop.getDefaultValue() : prop.getValue();
-        return PropertyConvertor.getInstance().convertToToscaObject(propertyType, propValue, innerType, dataTypes);
+        return PropertyConvertor.getInstance().convertToToscaObject(propertyType, propValue, innerType, dataTypes, false);
     }
     /**
      * Allows to convert requirements of a node type to tosca template requirements representation
@@ -172,8 +156,8 @@ public class CapabiltyRequirementConvertor {
      * @param nodeType
      * @return
      */
-    public Either<ToscaNodeType, ToscaError> convertRequirements(Component component, ToscaNodeType nodeType) {
-        List<Map<String, ToscaRequirement>> toscaRequirements = convertRequirementsAsList(component);
+    public Either<ToscaNodeType, ToscaError> convertRequirements(Map<String, Component> componentsCache, Component component, ToscaNodeType nodeType) {
+        List<Map<String, ToscaRequirement>> toscaRequirements = convertRequirementsAsList(componentsCache, component);
         if (!toscaRequirements.isEmpty()) {
             nodeType.setRequirements(toscaRequirements);
         }
@@ -194,7 +178,7 @@ public class CapabiltyRequirementConvertor {
         Either<Map<String, String[]>, ToscaError> toscaRequirementsRes = convertSubstitutionMappingRequirementsAsMap(componentsCache, component);
         if(toscaRequirementsRes.isRight()){
             result = Either.right(toscaRequirementsRes.right().value());
-            logger.error("Failed convert requirements for the component {}. ", component.getName());
+            logger.debug("Failed convert requirements for the component {}. ", component.getName());
         } else if (MapUtils.isNotEmpty(toscaRequirementsRes.left().value())) {
             substitutionMappings.setRequirements(toscaRequirementsRes.left().value());
             result = Either.left(substitutionMappings);
@@ -203,13 +187,13 @@ public class CapabiltyRequirementConvertor {
         return result;
     }
 
-    private List<Map<String, ToscaRequirement>> convertRequirementsAsList(Component component) {
+    private List<Map<String, ToscaRequirement>> convertRequirementsAsList(Map<String, Component> componentsCache, Component component) {
         Map<String, List<RequirementDefinition>> requirements = component.getRequirements();
         List<Map<String, ToscaRequirement>> toscaRequirements = new ArrayList<>();
         if (requirements != null) {
             for (Map.Entry<String, List<RequirementDefinition>> entry : requirements.entrySet()) {
                 entry.getValue().stream().filter(r -> filter(component, r.getOwnerId())).forEach(r -> {
-                    ImmutablePair<String, ToscaRequirement> pair = convertRequirement(component, ModelConverter.isAtomicComponent(component), r);
+                    ImmutablePair<String, ToscaRequirement> pair = convertRequirement(componentsCache, component, ModelConverter.isAtomicComponent(component), r);
                     Map<String, ToscaRequirement> requirement = new HashMap<>();
 
                     requirement.put(pair.left, pair.right);
@@ -231,10 +215,6 @@ public class CapabiltyRequirementConvertor {
         return ModelConverter.isAtomicComponent(component) && component.getUniqueId().equals(ownerId);
     }
 
-    private String getSubPathByLastDelimiterAppearance(String path) {
-        return path.substring(path.lastIndexOf(PATH_DELIMITER) + 1);
-    }
-
     private String dropLast( String path, String delimiter ) {
         if (isBlank(path) || isBlank(delimiter)){
             return path;
@@ -261,10 +241,10 @@ public class CapabiltyRequirementConvertor {
         for (Map.Entry<String, List<RequirementDefinition>> entry : requirements.entrySet()) {
             Optional<RequirementDefinition> failedToAddRequirement = entry.getValue()
                     .stream()
-                    .filter(r->!addEntry(componentsCache, toscaRequirements, component, r.getName(), r.getParentName(), r.getOwnerId(), r.getPath()))
+                    .filter(r->!addEntry(componentsCache, toscaRequirements, component, new SubstitutionEntry(r.getName(), r.getParentName(), ""), r.getPreviousName(), r.getOwnerId(), r.getPath()))
                     .findAny();
             if(failedToAddRequirement.isPresent()){
-                logger.error("Failed to convert requirement {} for substitution mappings section of a tosca template of the component {}. ",
+                logger.debug("Failed to convert requirement {} for substitution mappings section of a tosca template of the component {}. ",
                         failedToAddRequirement.get().getName(), component.getName());
                 result = Either.right(ToscaError.NODE_TYPE_REQUIREMENT_ERROR);
             }
@@ -283,10 +263,10 @@ public class CapabiltyRequirementConvertor {
         for (Map.Entry<String, List<CapabilityDefinition>> entry : capabilities.entrySet()) {
             Optional<CapabilityDefinition> failedToAddRequirement = entry.getValue()
                     .stream()
-                    .filter(c->!addEntry(componentsCache, toscaRequirements, component, c.getName(), c.getParentName(), c.getOwnerId(), c.getPath()))
+                    .filter(c->!addEntry(componentsCache, toscaRequirements, component, new SubstitutionEntry(c.getName(), c.getParentName(), ""), c.getPreviousName(), c.getOwnerId(), c.getPath()))
                     .findAny();
             if(failedToAddRequirement.isPresent()){
-                logger.error("Failed to convert capalility {} for substitution mappings section of a tosca template of the component {}. ",
+                logger.debug("Failed to convert capalility {} for substitution mappings section of a tosca template of the component {}. ",
                         failedToAddRequirement.get().getName(), component.getName());
                 result = Either.right(ToscaError.NODE_TYPE_CAPABILITY_ERROR);
             }
@@ -298,11 +278,9 @@ public class CapabiltyRequirementConvertor {
         return result;
     }
 
-    private boolean addEntry(Map<String,Component> componentsCache, Map<String, String[]> capReqMap, Component component, String name, String parentName, String ownerId, List<String> path){
-
-        SubstituitionEntry entry = new SubstituitionEntry(name, parentName, "");
-
-        if(shouldBuildSubstitutionName(component, path) && !buildSubstitutedNamePerInstance(componentsCache, component, name, path, ownerId, entry)){
+    private boolean addEntry(Map<String, Component> componentsCache, Map<String, String[]> capReqMap, Component component, SubstitutionEntry entry, String previousName, String ownerId, List<String> path){
+    
+        if(shouldBuildSubstitutionName(component, path) && !buildSubstitutedNamePerInstance(componentsCache, component, entry.getFullName(), previousName, path, ownerId, entry)){
             return false;
         }
         logger.debug("The requirement/capability {} belongs to the component {} ", entry.getFullName(), component.getUniqueId());
@@ -315,96 +293,106 @@ public class CapabiltyRequirementConvertor {
     }
 
     private boolean shouldBuildSubstitutionName(Component component, List<String> path) {
-        return !ToscaUtils.isComplexVfc(component) && isNotEmpty(path) && path.iterator().hasNext();
-    }
+        return ToscaUtils.isNotComplexVfc(component) && isNotEmpty(path) && path.iterator().hasNext();
+    }
+
+    private boolean buildSubstitutedNamePerInstance(Map<String, Component> componentsCache, Component component, String name, String previousName, List<String> path, String ownerId, SubstitutionEntry entry) {
+        String fullName;
+        String sourceName;
+        String prefix;
+        if(CollectionUtils.isNotEmpty(component.getGroups())) {
+            Optional<GroupDefinition> groupOpt = component.getGroups().stream().filter(g -> g.getUniqueId().equals(ownerId)).findFirst();
+            if (groupOpt.isPresent()) {
+                prefix = buildCapReqNamePrefix(groupOpt.get().getNormalizedName());
+                if(ComponentUtilities.isNotUpdatedCapReqName(prefix, name, previousName)){
+                    sourceName = name;
+                    fullName = prefix + sourceName;
+                } else {
+                    sourceName = previousName;
+                    fullName = name;
+                }
+                entry.setFullName(fullName);
+                entry.setSourceName(sourceName);
+                entry.setOwner(groupOpt.get().getNormalizedName());
+                return true;
+            }
+        }
 
-    private boolean buildSubstitutedNamePerInstance(Map<String, Component> componentsCache, Component component, String name, List<String> path, String ownerId, SubstituitionEntry entry) {
         Optional<ComponentInstance> ci = component.getComponentInstances().stream().filter(c->c.getUniqueId().equals(Iterables.getLast(path))).findFirst();
         if(!ci.isPresent()){
-            logger.error("Failed to find ci in the path is {} component {}", path, component.getUniqueId());
+            logger.debug("Failed to find ci in the path is {} component {}", path, component.getUniqueId());
 
             Collections.reverse(path);
 
-            logger.error("try to reverse path {} component {}", path, component.getUniqueId());
+            logger.debug("try to reverse path {} component {}", path, component.getUniqueId());
             ci = component.getComponentInstances().stream().filter(c->c.getUniqueId().equals(Iterables.getLast(path))).findFirst();
         }
         if(ci.isPresent()){
-            Either<String, Boolean> buildSubstitutedName = buildSubstitutedName(componentsCache, name, path, ownerId, ci.get());
-            if(buildSubstitutedName.isRight()){
-                logger.error("Failed buildSubstitutedName name {}  path {} component {}", name, path, component.getUniqueId());
-                return false;
+            prefix = buildCapReqNamePrefix(ci.get().getNormalizedName());
+            if(ComponentUtilities.isNotUpdatedCapReqName(prefix, name, previousName)){
+                Either<String, Boolean> buildSubstitutedName = buildSubstitutedName(componentsCache, name, previousName, path, ownerId, ci.get());
+                if(buildSubstitutedName.isRight()){
+                    logger.debug("Failed buildSubstitutedName name {}  path {} component {}", name, path, component.getUniqueId());
+                    return false;
+                }
+                sourceName = buildSubstitutedName.left().value();
+                fullName = prefix + sourceName;
+            } else {
+                sourceName = previousName;
+                fullName = name;
             }
-            entry.setFullName(ci.get().getNormalizedName() + '.' + buildSubstitutedName.left().value());
-            entry.setSourceName(buildSubstitutedName.left().value());
+            entry.setFullName(fullName);
+            entry.setSourceName(sourceName);
         } else {
-            logger.error("Failed to find ci in the path is {} component {}", path, component.getUniqueId());
+            logger.debug("Failed to find ci in the path is {} component {}", path, component.getUniqueId());
             return false;
         }
         return true;
     }
 
-    private void addEntry(Map<String, String[]> toscaRequirements, Component component, List<String> capPath, SubstituitionEntry entry) {
-        Optional<ComponentInstance> findFirst = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(Iterables.getLast(capPath))).findFirst();
+    private void addEntry(Map<String, String[]> toscaRequirements, Component component, List<String> capPath, SubstitutionEntry entry) {
+        Optional<ComponentInstance> findFirst = component.safeGetComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(Iterables.getLast(capPath))).findFirst();
         if (findFirst.isPresent()) {
             entry.setOwner(findFirst.get().getNormalizedName());
         }
         toscaRequirements.put(entry.getFullName(), new String[] { entry.getOwner(), entry.getSourceName() });
     }
 
-    public Either<String, Boolean> buildSubstitutedName(Map<String, Component> componentsCache, String name, List<String> path, String ownerId, ComponentInstance instance) {
-
-        Either<String, Boolean> result = null;
+    public Either<String, Boolean> buildSubstitutedName(Map<String, Component> componentsCache, String name, String previousName, List<String> path, String ownerId, ComponentInstance instance) {
+        if(StringUtils.isNotEmpty(previousName)){
+            return Either.left(name);
+        }
         Either<Component, Boolean> getOriginRes = getOriginComponent(componentsCache, instance);
         if(getOriginRes.isRight()){
-            logger.error("Failed to build substituted name for the capability/requirement {}. Failed to get an origin component with uniqueId {}", name, instance.getComponentUid());
-            result = Either.right(false);
-        }
-        if(result == null){
-            List<String> reducedPath = ownerId !=null ? getReducedPathByOwner(path , ownerId ) : getReducedPath(path) ;
-            logger.debug("reducedPath for ownerId {}, reducedPath {} ", ownerId, reducedPath);
-            reducedPath.remove(reducedPath.size()-1);
-            result = buildSubstitutedName(componentsCache, getOriginRes.left().value(), reducedPath, name);
+            logger.debug("Failed to build substituted name for the capability/requirement {}. Failed to get an origin component with uniqueId {}", name, instance.getComponentUid());
+            return Either.right(false);
         }
-        return result;
+        List<String> reducedPath = ownerId !=null ? getReducedPathByOwner(path , ownerId ) : getReducedPath(path) ;
+        logger.debug("reducedPath for ownerId {}, reducedPath {} ", ownerId, reducedPath);
+        reducedPath.remove(reducedPath.size() - 1);
+        return buildSubstitutedName(componentsCache, getOriginRes.left().value(), reducedPath, name, previousName);
     }
 
-    private String getRequirementPath(Component component, RequirementDefinition r) {
-
-        // Evg : for the last in path take real instance name and not "decrypt" unique id. ( instance name can be change and not equal to id..)
-        // dirty quick fix. must be changed as capability redesign
-        List<String> capPath = r.getPath();
-        String lastInPath = capPath.get(capPath.size() - 1);
-        Optional<ComponentInstance> findFirst = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(lastInPath)).findFirst();
-        if (findFirst.isPresent()) {
-            String lastInPathName = findFirst.get().getNormalizedName();
-
-            if (capPath.size() > 1) {
-                List<String> pathArray = Lists.reverse(capPath.stream().map(path -> ValidationUtils.normalizeComponentInstanceName(getSubPathByLastDelimiterAppearance(path))).collect(Collectors.toList()));
-
-                return new StringBuilder().append(lastInPathName).append(PATH_DELIMITER).append(String.join(PATH_DELIMITER, pathArray.subList(1, pathArray.size() ))).append(PATH_DELIMITER).append(r.getName()).toString();
-            }else{
-                return new StringBuilder().append(lastInPathName).append(PATH_DELIMITER).append(r.getName()).toString();
-            }
-        }
-        return "";
+    private String buildReqNamePerOwnerByPath(Map<String, Component> componentsCache, Component component, RequirementDefinition r) {
+        return buildCapReqNamePerOwnerByPath(componentsCache, component, r.getName(), r.getPreviousName(), r.getPath());
     }
 
-    private ImmutablePair<String, ToscaRequirement> convertRequirement(Component component, boolean isNodeType, RequirementDefinition r) {
+    private ImmutablePair<String, ToscaRequirement> convertRequirement(Map<String, Component> componentsCache, Component component, boolean isNodeType, RequirementDefinition r) {
         String name = r.getName();
-        if (!isNodeType) {
-            name = getRequirementPath(component, r);
+        if (!isNodeType && ToscaUtils.isNotComplexVfc(component)) {
+            name = buildReqNamePerOwnerByPath(componentsCache, component, r);
         }
         logger.debug("the requirement {} belongs to resource {} ", name, component.getUniqueId());
         ToscaRequirement toscaRequirement = new ToscaRequirement();
 
-        List<Object> occurences = new ArrayList<>();
-        occurences.add(Integer.valueOf(r.getMinOccurrences()));
+        List<Object> occurrences = new ArrayList<>();
+        occurrences.add(Integer.valueOf(r.getMinOccurrences()));
         if (r.getMaxOccurrences().equals(RequirementDataDefinition.MAX_OCCURRENCES)) {
-            occurences.add(r.getMaxOccurrences());
+            occurrences.add(r.getMaxOccurrences());
         } else {
-            occurences.add(Integer.valueOf(r.getMaxOccurrences()));
+            occurrences.add(Integer.valueOf(r.getMaxOccurrences()));
         }
-        toscaRequirement.setOccurrences(occurences);
+        toscaRequirement.setOccurrences(occurrences);
         toscaRequirement.setNode(r.getNode());
         toscaRequirement.setCapability(r.getCapability());
         toscaRequirement.setRelationship(r.getRelationship());
@@ -418,13 +406,13 @@ public class CapabiltyRequirementConvertor {
      * @param dataTypes
      * @return
      */
-    public Map<String, ToscaCapability> convertCapabilities(Component component, Map<String, DataTypeDefinition> dataTypes) {
+    public Map<String, ToscaCapability> convertCapabilities(Map<String, Component> componentsCache, Component component, Map<String, DataTypeDefinition> dataTypes) {
         Map<String, List<CapabilityDefinition>> capabilities = component.getCapabilities();
         Map<String, ToscaCapability> toscaCapabilities = new HashMap<>();
         if (capabilities != null) {
             boolean isNodeType = ModelConverter.isAtomicComponent(component);
             for (Map.Entry<String, List<CapabilityDefinition>> entry : capabilities.entrySet()) {
-                entry.getValue().stream().filter(c -> filter(component, c.getOwnerId())).forEach(c -> convertCapabilty(component, toscaCapabilities, isNodeType, c, dataTypes , c.getName()));
+                entry.getValue().stream().filter(c -> filter(component, c.getOwnerId())).forEach(c -> convertCapability(componentsCache, component, toscaCapabilities, isNodeType, c, dataTypes , c.getName()));
             }
         } else {
             logger.debug(NO_CAPABILITIES);
@@ -447,7 +435,10 @@ public class CapabiltyRequirementConvertor {
         if (capabilities != null) {
             boolean isNodeType = ModelConverter.isAtomicComponent(component);
             for (Map.Entry<String, List<CapabilityDefinition>> entry : capabilities.entrySet()) {
-                entry.getValue().stream().forEach(c -> convertCapabilty(proxyComponent, toscaCapabilities, isNodeType, c, dataTypes , buildCapabilityNameForComponentInstance( componentCache , instanceProxy , c )));
+                entry.getValue()
+                        .stream()
+                        .forEach(c -> convertProxyCapability(toscaCapabilities, c, dataTypes ,
+                                buildCapabilityNameForComponentInstance( componentCache , instanceProxy , c )));
             }
         } else {
             logger.debug(NO_CAPABILITIES);
@@ -474,44 +465,55 @@ public class CapabiltyRequirementConvertor {
         return res;
     }
 
-    private String getCapabilityPath(CapabilityDefinition c, Component component) {
-        // Evg : for the last in path take real instance name and not "decrypt" unique id. ( instance name can be change and not equal to id..)
-        // dirty quick fix. must be changed as capability redesign
-        List<String> capPath = c.getPath();
-        String lastInPath = capPath.get(capPath.size() - 1);
-        Optional<ComponentInstance> findFirst = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(lastInPath)).findFirst();
-        if (findFirst.isPresent()) {
-            String lastInPathName = findFirst.get().getNormalizedName();
+    private String buildCapNamePerOwnerByPath(Map<String, Component> componentsCache, CapabilityDefinition c, Component component) {
+        return buildCapReqNamePerOwnerByPath(componentsCache, component, c.getName(), c.getPreviousName(), c.getPath());
+    }
 
-            if (capPath.size() > 1) {
-                List<String> pathArray = Lists.reverse(capPath.stream().map(path -> ValidationUtils.normalizeComponentInstanceName(getSubPathByLastDelimiterAppearance(path))).collect(Collectors.toList()));
+    private void convertProxyCapability(Map<String, ToscaCapability> toscaCapabilities, CapabilityDefinition c, Map<String, DataTypeDefinition> dataTypes, String capabilityName) {
+        ToscaCapability toscaCapability = new ToscaCapability();
+        toscaCapability.setDescription(c.getDescription());
+        toscaCapability.setType(c.getType());
 
-                return new StringBuilder().append(lastInPathName).append(PATH_DELIMITER).append(String.join(PATH_DELIMITER, pathArray.subList(1, pathArray.size() ))).append(PATH_DELIMITER).append(c.getName()).toString();
-            }else{
-                return new StringBuilder().append(lastInPathName).append(PATH_DELIMITER).append(c.getName()).toString();
+        List<Object> occurrences = new ArrayList<>();
+        occurrences.add(Integer.valueOf(c.getMinOccurrences()));
+        if (c.getMaxOccurrences().equals(CapabilityDataDefinition.MAX_OCCURRENCES)) {
+            occurrences.add(c.getMaxOccurrences());
+        } else {
+            occurrences.add(Integer.valueOf(c.getMaxOccurrences()));
+        }
+        toscaCapability.setOccurrences(occurrences);
+
+        toscaCapability.setValid_source_types(c.getValidSourceTypes());
+        List<ComponentInstanceProperty> properties = c.getProperties();
+        if (isNotEmpty(properties)) {
+            Map<String, ToscaProperty> toscaProperties = new HashMap<>();
+            for (PropertyDefinition property : properties) {
+                ToscaProperty toscaProperty = PropertyConvertor.getInstance().convertProperty(dataTypes, property, true);
+                toscaProperties.put(property.getName(), toscaProperty);
             }
+            toscaCapability.setProperties(toscaProperties);
         }
-        return "";
+        toscaCapabilities.put(capabilityName, toscaCapability);
     }
 
-    private void convertCapabilty(Component component, Map<String, ToscaCapability> toscaCapabilities, boolean isNodeType, CapabilityDefinition c, Map<String, DataTypeDefinition> dataTypes , String capabilityName) {
+    private void convertCapability(Map<String, Component> componentsCache, Component component, Map<String, ToscaCapability> toscaCapabilities, boolean isNodeType, CapabilityDefinition c, Map<String, DataTypeDefinition> dataTypes , String capabilityName) {
         String name = isNoneBlank(capabilityName) ? capabilityName : c.getName();
-        if (!isNodeType) {
-            name = getCapabilityPath(c, component);
+        if (!isNodeType && ToscaUtils.isNotComplexVfc(component)) {
+            name = buildCapNamePerOwnerByPath(componentsCache, c, component);
         }
-        logger.debug("the capabilty {} belongs to resource {} ", name, component.getUniqueId());
+        logger.debug("The capability {} belongs to resource {} ", name, component.getUniqueId());
         ToscaCapability toscaCapability = new ToscaCapability();
         toscaCapability.setDescription(c.getDescription());
         toscaCapability.setType(c.getType());
 
-        List<Object> occurences = new ArrayList<>();
-        occurences.add(Integer.valueOf(c.getMinOccurrences()));
+        List<Object> occurrences = new ArrayList<>();
+        occurrences.add(Integer.valueOf(c.getMinOccurrences()));
         if (c.getMaxOccurrences().equals(CapabilityDataDefinition.MAX_OCCURRENCES)) {
-            occurences.add(c.getMaxOccurrences());
+            occurrences.add(c.getMaxOccurrences());
         } else {
-            occurences.add(Integer.valueOf(c.getMaxOccurrences()));
+            occurrences.add(Integer.valueOf(c.getMaxOccurrences()));
         }
-        toscaCapability.setOccurrences(occurences);
+        toscaCapability.setOccurrences(occurrences);
 
         toscaCapability.setValid_source_types(c.getValidSourceTypes());
         List<ComponentInstanceProperty> properties = c.getProperties();
@@ -525,29 +527,63 @@ public class CapabiltyRequirementConvertor {
         }
         toscaCapabilities.put(name, toscaCapability);
     }
+
+    private String buildCapReqNamePerOwnerByPath(Map<String, Component> componentsCache, Component component, String name, String previousName, List<String> path) {
+        String ownerId = path.get(path.size() - 1);
+        String prefix;
+        if(CollectionUtils.isNotEmpty(component.getGroups())) {
+            Optional<GroupDefinition> groupOpt = component.getGroups().stream().filter(g -> g.getUniqueId().equals(ownerId)).findFirst();
+            if (groupOpt.isPresent()) {
+                prefix = buildCapReqNamePrefix(groupOpt.get().getNormalizedName());
+                if(ComponentUtilities.isNotUpdatedCapReqName(prefix, name, previousName)){
+                    return prefix + name;
+                }
+                return name;
+            }
+        }
+        Optional<ComponentInstance> ci = component.getComponentInstances().stream().filter(c->c.getUniqueId().equals(Iterables.getLast(path))).findFirst();
+        if(!ci.isPresent()){
+            logger.debug("Failed to find ci in the path is {} component {}", path, component.getUniqueId());
+
+            Collections.reverse(path);
+
+            logger.debug("try to reverse path {} component {}", path, component.getUniqueId());
+            ci = component.getComponentInstances().stream().filter(c->c.getUniqueId().equals(Iterables.getLast(path))).findFirst();
+        }
+        if(ci.isPresent()){
+            prefix = buildCapReqNamePrefix(ci.get().getNormalizedName());
+            if(ComponentUtilities.isNotUpdatedCapReqName(prefix, name, previousName)){
+                Either<String, Boolean> buildSubstitutedName = buildSubstitutedName(componentsCache, name, previousName, path, ownerId, ci.get());
+                if(buildSubstitutedName.isRight()){
+                    logger.debug("Failed buildSubstitutedName name {}  path {} component {}", name, path, component.getUniqueId());
+                }
+                return prefix + buildSubstitutedName.left().value();
+            }
+            return name;
+        }
+        return StringUtils.EMPTY;
+    }
     /**
      * Allows to build substituted name of capability\requirement of the origin component instance according to the path
      * @param componentsCache
      * @param originComponent
      * @param path
      * @param name
+     * @param previousName
      * @return
      */
-    public Either<String, Boolean> buildSubstitutedName(Map<String, Component> componentsCache, Component originComponent, List<String> path, String name) {
+    public Either<String, Boolean> buildSubstitutedName(Map<String, Component> componentsCache, Component originComponent, List<String> path, String name, String previousName) {
+        if(StringUtils.isNotEmpty(previousName)){
+            return Either.left(name);
+        }
         StringBuilder substitutedName = new StringBuilder();
         boolean nameBuiltSuccessfully = true;
-        Either<String, Boolean> result;
-        if(isNotEmpty(path) && !ToscaUtils.isComplexVfc(originComponent)){
+        if(isNotEmpty(path) && ToscaUtils.isNotComplexVfc(originComponent)){
             List<String> reducedPath = getReducedPath(path);
             Collections.reverse(reducedPath);
             nameBuiltSuccessfully = appendNameRecursively(componentsCache, originComponent, reducedPath.iterator(), substitutedName);
         }
-        if(nameBuiltSuccessfully){
-            result = Either.left(substitutedName.append(name).toString());
-        } else {
-            result = Either.right(nameBuiltSuccessfully);
-        }
-        return result;
+        return nameBuiltSuccessfully ? Either.left(substitutedName.append(name).toString()) : Either.right(nameBuiltSuccessfully);
     }
 
     protected List<String> getReducedPathByOwner(List<String> path , String ownerId) {
@@ -571,19 +607,27 @@ public class CapabiltyRequirementConvertor {
     }
 
     private boolean appendNameRecursively(Map<String, Component> componentsCache, Component originComponent, Iterator<String> instanceIdIter, StringBuilder substitutedName) {
-        if(isNotEmpty(originComponent.getComponentInstances()) && instanceIdIter.hasNext() && !ToscaUtils.isComplexVfc(originComponent)){
-            String instanceId = instanceIdIter.next();
-            Optional<ComponentInstance> instanceOpt = originComponent.getComponentInstances().stream().filter(i -> i.getUniqueId().equals(instanceId)).findFirst();
-            if(!instanceOpt.isPresent()){
-                logger.error("Failed to find an instance with uniqueId {} on a component with uniqueId {}", instanceId, originComponent.getUniqueId());
-                return false;
-            }
-            substitutedName.append(instanceOpt.get().getNormalizedName()).append('.');
-            Either<Component, Boolean> getOriginRes = getOriginComponent(componentsCache, instanceOpt.get());
-            if(getOriginRes.isRight()){
+        if(isNotEmpty(originComponent.getComponentInstances()) && instanceIdIter.hasNext() && ToscaUtils.isNotComplexVfc(originComponent)){
+            String ownerId = instanceIdIter.next();
+            Optional<ComponentInstance> instanceOpt = originComponent.getComponentInstances().stream().filter(i -> i.getUniqueId().equals(ownerId)).findFirst();
+            if(instanceOpt.isPresent()){
+                substitutedName.append(instanceOpt.get().getNormalizedName()).append(PATH_DELIMITER);
+                Either<Component, Boolean> getOriginRes = getOriginComponent(componentsCache, instanceOpt.get());
+                if(getOriginRes.isRight()){
+                    return false;
+                }
+                appendNameRecursively(componentsCache, getOriginRes.left().value(), instanceIdIter, substitutedName);
+            } else if(CollectionUtils.isNotEmpty(originComponent.getGroups())){
+                Optional<GroupDefinition> groupOpt = originComponent.getGroups().stream().filter(g -> g.getUniqueId().equals(ownerId)).findFirst();
+                if(!groupOpt.isPresent()){
+                    logger.debug("Failed to find an capability owner with uniqueId {} on a component with uniqueId {}", ownerId, originComponent.getUniqueId());
+                    return false;
+                }
+                substitutedName.append(groupOpt.get().getNormalizedName()).append(PATH_DELIMITER);
+            } else {
+                logger.debug("Failed to find an capability owner with uniqueId {} on a component with uniqueId {}", ownerId, originComponent.getUniqueId());
                 return false;
             }
-            appendNameRecursively(componentsCache, getOriginRes.left().value(), instanceIdIter, substitutedName);
         }
         return true;
     }
@@ -597,7 +641,7 @@ public class CapabiltyRequirementConvertor {
             ComponentParametersView filter = getFilter(instance);
             getOriginRes = toscaOperationFacade.getToscaElement(instance.getActualComponentUid(), filter);
             if(getOriginRes.isRight()){
-                logger.error("Failed to get an origin component with uniqueId {}", instance.getActualComponentUid());
+                logger.debug("Failed to get an origin component with uniqueId {}", instance.getActualComponentUid());
                 result = Either.right(false);
             } else {
                 result = Either.left(getOriginRes.left().value());
@@ -615,6 +659,9 @@ public class CapabiltyRequirementConvertor {
             filter.setIgnoreRequirements(false);
             filter.setIgnoreCategories(false);
         }
+        if(instance.getOriginType() == OriginTypeEnum.VF){
+            filter.setIgnoreGroups(false);
+        }
         return filter;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
index 19565ed020..066b657068 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
@@ -20,45 +20,15 @@
 
 package org.openecomp.sdc.be.tosca;
 
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
+import fj.data.Either;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.commons.lang.WordUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
-import org.onap.sdc.generator.data.AdditionalParams;
-import org.onap.sdc.generator.data.Artifact;
-import org.onap.sdc.generator.data.ArtifactType;
-import org.onap.sdc.generator.data.GenerationData;
-import org.onap.sdc.generator.impl.ArtifactGenerationServiceImpl;
-import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationEnum;
-import org.openecomp.sdc.be.components.impl.ArtifactsBusinessLogic.ArtifactOperationInfo;
 import org.openecomp.sdc.be.components.impl.ImportUtils;
-import org.openecomp.sdc.be.components.impl.ServiceBusinessLogic;
 import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -68,16 +38,7 @@ import org.openecomp.sdc.be.dao.cassandra.SdcSchemaFilesCassandraDao;
 import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.InterfaceDefinition;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Operation;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaElementLifecycleOperation;
+import org.openecomp.sdc.be.model.*;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
@@ -90,25 +51,30 @@ import org.openecomp.sdc.be.utils.CommonBeUtils;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.GeneralUtility;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.google.gson.Gson;
-
-import fj.data.Either;
-
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
 /**
  * @author tg851x
  *
  */
 @org.springframework.stereotype.Component("csar-utils")
 public class CsarUtils {
-
-	private static final Logger log = LoggerFactory.getLogger(CsarUtils.class);
+    private static final Logger log = Logger.getLogger(CsarUtils.class);
 
 	@Autowired
 	private SdcSchemaFilesCassandraDao sdcSchemaFilesCassandraDao;
@@ -119,18 +85,10 @@ public class CsarUtils {
 	@Autowired
 	private ToscaExportHandler toscaExportUtils;
 	@Autowired
-	private ArtifactsBusinessLogic artifactsBusinessLogic;
-	@Autowired
 	protected ToscaOperationFacade toscaOperationFacade;
 
-	@javax.annotation.Resource
-	private ServiceBusinessLogic serviceBusinessLogic;
-
-	private Gson gson = new Gson();
-
-	private String CONFORMANCE_LEVEL;
-	private String SDC_VERSION;
-
+    private String CONFORMANCE_LEVEL;
+    private String SDC_VERSION;
 	public static final Pattern UUID_NORMATIVE_NEW_VERSION = Pattern.compile("^\\d{1,}.0");
 	public static final String ARTIFACTS_PATH = "Artifacts/";
 	public static final String RESOURCES_PATH = "Resources/";
@@ -146,8 +104,8 @@ public class CsarUtils {
 	private static final String TOSCA_META_VERSION = "1.0";
 	private static final String CSAR_VERSION = "1.1";
 	public static final String ARTIFACTS = "Artifacts";
-	public static final String DEFINITION = "Definitions";
-	public static final String DEL_PATTERN = "([/\\\\]+)";
+    private static final String DEFINITION = "Definitions";
+    private static final String DEL_PATTERN = "([/\\\\]+)";
 	private static String versionFirstThreeOctates;
 
 	public static final String VFC_NODE_TYPE_ARTIFACTS_PATH_PATTERN = ARTIFACTS + DEL_PATTERN
@@ -168,6 +126,7 @@ public class CsarUtils {
 			"([\\w\\_\\-\\.\\s]+)";
 
 	public static final String ARTIFACT_CREATED_FROM_CSAR = "Artifact created from csar";
+    private static final String BLOCK_0_TEMPLATE = "SDC-TOSCA-Meta-File-Version: %s\nSDC-TOSCA-Definitions-Version: %s\n";
 
 	public CsarUtils() {
 		this.CONFORMANCE_LEVEL = ConfigurationManager.getConfigurationManager().getConfiguration()
@@ -211,8 +170,7 @@ public class CsarUtils {
 		final String toscaBlock0 = createToscaBlock0(TOSCA_META_VERSION, CSAR_VERSION, createdBy, fileName);
 		byte[] toscaBlock0Byte = toscaBlock0.getBytes();
 
-		Either<byte[], ResponseFormat> generateCsarZipResponse = generateCsarZip(csarBlock0Byte, toscaBlock0Byte,
-				component, getFromCS, isInCertificationRequest, mockGenerator);
+        Either<byte[], ResponseFormat> generateCsarZipResponse = generateCsarZip(csarBlock0Byte, toscaBlock0Byte, component, getFromCS, isInCertificationRequest);
 
 		if (generateCsarZipResponse.isRight()) {
 			return Either.right(generateCsarZipResponse.right().value());
@@ -221,19 +179,18 @@ public class CsarUtils {
 		return Either.left(generateCsarZipResponse.left().value());
 	}
 
-	private Either<byte[], ResponseFormat> generateCsarZip(byte[] csarBlock0Byte, byte[] toscaBlock0Byte,
-			Component component, boolean getFromCS, boolean isInCertificationRequest, boolean mockGenerator) {
-		try (ByteArrayOutputStream out = new ByteArrayOutputStream(); ZipOutputStream zip = new ZipOutputStream(out);) {
+    private Either<byte[], ResponseFormat> generateCsarZip(byte[] csarBlock0Byte, byte[] toscaBlock0Byte, Component component, boolean getFromCS, boolean isInCertificationRequest) {
+        try (ByteArrayOutputStream out = new ByteArrayOutputStream();
+             ZipOutputStream zip = new ZipOutputStream(out)) {
 			zip.putNextEntry(new ZipEntry(CSAR_META_PATH_FILE_NAME));
 			zip.write(csarBlock0Byte);
 			zip.putNextEntry(new ZipEntry(TOSCA_META_PATH_FILE_NAME));
 			zip.write(toscaBlock0Byte);
-			Either<ZipOutputStream, ResponseFormat> populateZip = populateZip(component, getFromCS, zip,
-					isInCertificationRequest, mockGenerator);
-			if (populateZip.isRight()) {
-				log.debug("Failed to populate CSAR zip file {}", populateZip.right().value());
-				return Either.right(populateZip.right().value());
-			}
+            Either<ZipOutputStream, ResponseFormat> populateZip = populateZip(component, getFromCS, zip, isInCertificationRequest);
+            if (populateZip.isRight()) {
+                log.debug("Failed to populate CSAR zip file {}", populateZip.right().value());
+                return Either.right(populateZip.right().value());
+            }
 
 			zip.finish();
 			byte[] byteArray = out.toByteArray();
@@ -247,8 +204,7 @@ public class CsarUtils {
 		}
 	}
 
-	private Either<ZipOutputStream, ResponseFormat> populateZip(Component component, boolean getFromCS,
-			ZipOutputStream zip, boolean isInCertificationRequest, boolean mockGenerator) throws IOException {
+    private Either<ZipOutputStream, ResponseFormat> populateZip(Component component, boolean getFromCS, ZipOutputStream zip, boolean isInCertificationRequest) throws IOException {
 
 		LifecycleStateEnum lifecycleState = component.getLifecycleState();
 		String componentYaml;
@@ -256,7 +212,6 @@ public class CsarUtils {
 		byte[] mainYaml;
 		// <file name, cassandraId, component>
 		List<Triple<String, String, Component>> dependencies = null;
-		List<ImmutablePair<Component, byte[]>> generatorInputs = new LinkedList<>();
 
 		Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
 		ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
@@ -297,8 +252,6 @@ public class CsarUtils {
 			writeComponentInterface(component, zip, fileName);
 		}
 
-		generatorInputs.add(new ImmutablePair<Component, byte[]>(component, mainYaml));
-
 		if (dependencies == null) {
 			Either<ToscaTemplate, ToscaError> dependenciesRes = toscaExportUtils.getDependencies(component);
 			if (dependenciesRes.isRight()) {
@@ -330,9 +283,6 @@ public class CsarUtils {
 				fileName = d.getLeft();
 				addComponentToCache(innerComponentsCache, cassandraId, fileName, childComponent);
 				addInnerComponentsToCache(innerComponentsCache, childComponent);
-
-				byte[] content = entryData.left().value();
-				generatorInputs.add(new ImmutablePair<Component, byte[]>(childComponent, content));
 			}
 
 			// add inner components to CSAR
@@ -379,33 +329,6 @@ public class CsarUtils {
 			return addSchemaFilesFromCassandra;
 		}
 
-		// Artifact Generation
-		if (component.getComponentType() == ComponentTypeEnum.SERVICE && isInCertificationRequest) {
-
-			List<ArtifactDefinition> aiiArtifactList;
-
-			Either<List<ArtifactDefinition>, ResponseFormat> handleAAIArtifacts = handleAAIArtifacts(component,
-					mockGenerator, generatorInputs);
-
-			if (handleAAIArtifacts.isLeft()) {
-				aiiArtifactList = handleAAIArtifacts.left().value();
-			} else {
-				log.debug("AAI Artifacts handling failed");
-				return Either.right(handleAAIArtifacts.right().value());
-			}
-
-			if (isInCertificationRequest) {
-				Either<ActionStatus, ResponseFormat> handleAllAAIArtifactsInDataModel = handleAllAAIArtifactsInDataModel(
-						component, aiiArtifactList, false, true);
-
-				if (handleAllAAIArtifactsInDataModel.isRight()) {
-					log.debug("AAI Artifacts handling (create, update, delete) failed");
-					return Either.right(handleAllAAIArtifactsInDataModel.right().value());
-				}
-			}
-
-		}
-
 		Either<CsarDefinition, ResponseFormat> collectedComponentCsarDefinition = collectComponentCsarDefinition(
 				component);
 
@@ -426,10 +349,9 @@ public class CsarUtils {
 
 		try (ZipInputStream zipStream = new ZipInputStream(new ByteArrayInputStream(schemaFileZip));
 				ByteArrayOutputStream out = new ByteArrayOutputStream();
-				BufferedOutputStream bos = new BufferedOutputStream(out, initSize);) {
-
-			ZipEntry entry = null;
+             BufferedOutputStream bos = new BufferedOutputStream(out, initSize)) {
 
+            ZipEntry entry;
 			while ((entry = zipStream.getNextEntry()) != null) {
 
 				String entryName = entry.getName();
@@ -470,7 +392,7 @@ public class CsarUtils {
 					Either<Resource, StorageOperationStatus> resource = toscaOperationFacade
 							.getToscaElement(ci.getComponentUid());
 					if (resource == null || resource.isRight()) {
-						log.debug("Failed to fetch resource with id {} for instance {}");
+                                             log.debug("Failed to fetch resource with id {} for instance {}", ci.getComponentUid(), ci.getName());
 					} else {
 						Component componentRI = resource.left().value();
 
@@ -500,7 +422,7 @@ public class CsarUtils {
 		if (cachedComponent == null || CommonBeUtils.compareAsdcComponentVersions(component.getVersion(),
 				cachedComponent.getRight().getVersion())) {
 			componentCache.put(component.getInvariantUUID(),
-					new ImmutableTriple<String, String, Component>(id, fileName, component));
+                    new ImmutableTriple<>(id, fileName, component));
 
 			if (cachedComponent != null) {
 				// overwriting component with newer version
@@ -530,262 +452,6 @@ public class CsarUtils {
 		return Either.left(zip);
 	}
 
-	private Either<List<ArtifactDefinition>, ResponseFormat> handleAAIArtifacts(Component component,
-			boolean mockGenerator, List<ImmutablePair<Component, byte[]>> generatorInputs) {
-
-		ComponentTypeEnum componentType = component.getComponentType();
-		List<Artifact> generatedArtifacts;
-		List<ArtifactDefinition> aaiArtifacts = new LinkedList<>();
-
-		if (componentType == ComponentTypeEnum.SERVICE && !generatorInputs.isEmpty()) {
-			List<Artifact> convertedGeneratorInputs = convertToGeneratorArtifactsInput(generatorInputs);
-
-			Either<List<Artifact>, String> generatorResponse;
-
-			if (mockGenerator) {
-				generatorResponse = artifactGenerator(convertedGeneratorInputs, ArtifactType.OTHER, component);
-			} else {
-				generatorResponse = artifactGenerator(convertedGeneratorInputs, ArtifactType.AAI, component);
-			}
-
-			if (generatorResponse.isRight()) {
-				ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-						ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, component.getComponentType().getValue(),
-						component.getName(), generatorResponse.right().value());
-				return Either.right(responseFormat);
-			}
-
-			generatedArtifacts = generatorResponse.left().value();
-
-			aaiArtifacts = convertToArtifactDefinitionFromArtifactGeneratedData(generatedArtifacts);
-
-		}
-
-		return Either.left(aaiArtifacts);
-	}
-
-	private Either<ActionStatus, ResponseFormat> handleAllAAIArtifactsInDataModel(Component component,
-			List<ArtifactDefinition> artifactsFromAAI, boolean shouldLock, boolean inTransaction) {
-
-		Either<ActionStatus, ResponseFormat> handleAAIArtifactsResponse;
-		User lastComponentUpdater;
-
-		List<ArtifactDefinition> aaiArtifatcsToCreate = getAAIArtifatcsForCreate(artifactsFromAAI, component);
-		List<ArtifactDefinition> aaiArtifatcsToDelete = getAAIArtifatcsForDelete(artifactsFromAAI, component);
-		List<ArtifactDefinition> aaiArtifatcsToUpdate = getAAIArtifatcsForUpdate(artifactsFromAAI, component);
-
-		String lastUpdaterUserId = component.getLastUpdaterUserId();
-		Either<User, ResponseFormat> validateUserExists = artifactsBusinessLogic.validateUserExists(lastUpdaterUserId,
-				"CSAR creation util", true);
-
-		if (validateUserExists.isRight()) {
-			ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-					ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, component.getComponentType().getValue(),
-					component.getName(), "User not found");
-			return Either.right(responseFormat);
-		}
-
-		lastComponentUpdater = validateUserExists.left().value();
-
-		handleAAIArtifactsResponse = handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToDelete,
-				artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.DELETE),
-				lastComponentUpdater, shouldLock, inTransaction);
-
-		if (handleAAIArtifactsResponse.isRight()) {
-			return handleAAIArtifactsResponse;
-		}
-
-		handleAAIArtifactsResponse = handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToCreate,
-				artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.CREATE),
-				lastComponentUpdater, shouldLock, inTransaction);
-
-		if (handleAAIArtifactsResponse.isRight()) {
-			return handleAAIArtifactsResponse;
-		}
-
-		return handleAAIArtifactsInDataModelByOperationType(component, aaiArtifatcsToUpdate,
-				artifactsBusinessLogic.new ArtifactOperationInfo(false, false, ArtifactOperationEnum.UPDATE),
-				lastComponentUpdater, shouldLock, inTransaction);
-	}
-
-	private List<ArtifactDefinition> getAAIArtifatcsForUpdate(List<ArtifactDefinition> artifactsFromAAI,
-			Component component) {
-
-		Set<String> componetDeploymentArtifactLables = component.getDeploymentArtifacts().keySet();
-		Set<String> componetInformationalArtifactLables = component.getArtifacts().keySet();
-
-		return artifactsFromAAI.stream()
-				.filter(e -> componetDeploymentArtifactLables.contains(e.getArtifactLabel())
-						|| componetInformationalArtifactLables.contains(e.getArtifactLabel()))
-				.filter(e -> checkAaiForUpdate(component, e)).collect(Collectors.toList());
-	}
-
-	private boolean checkAaiForUpdate(Component component, ArtifactDefinition artifactDefinition) {
-		ArtifactDefinition artifactDefinitionComp = component.getDeploymentArtifacts()
-				.get(artifactDefinition.getArtifactLabel());
-
-		if (artifactDefinitionComp == null) {
-			log.warn("Failed to get {} artifact", artifactDefinition.getArtifactLabel());
-			return false;
-		}
-
-		// Old Artifacts before the generated flag introduction if contains "aai" ignore
-		// case prefix updated
-		if (artifactDefinitionComp.getGenerated() == null) {
-			if (artifactDefinitionComp.getArtifactLabel().toLowerCase().startsWith("aai")) {
-				return true;
-			} else {
-				log.warn("The artifact {} flag is null but AAI prefix is abssent Not updated",
-						artifactDefinition.getArtifactLabel());
-			}
-		} else {
-			if (artifactDefinition.getGenerated()) {
-				return true;
-			} else {
-				log.warn("Generated artifact {} was already uploaded manually", artifactDefinition.getArtifactLabel());
-			}
-		}
-		return false;
-	}
-
-	private List<ArtifactDefinition> getAAIArtifatcsForDelete(List<ArtifactDefinition> artifactsFromAAI,
-			Component component) {
-
-		Set<String> aaiLabels = artifactsFromAAI.stream().map(ArtifactDefinition::getArtifactLabel)
-				.collect(Collectors.toSet());
-
-		List<ArtifactDefinition> artifactsForDeleteDeployment = component.getDeploymentArtifacts().values().stream()
-				// Filter Out Artifacts that are not contained in artifacts returned
-				// from AAI API
-				.filter(e -> !aaiLabels.contains(e.getArtifactLabel())).collect(Collectors.toList());
-
-		List<ArtifactDefinition> artifactsForDeleteInformational = component.getArtifacts().values().stream()
-				// Filter Out Artifacts that are not contained in artifacts returned
-				// from AAI API
-				.filter(e -> !aaiLabels.contains(e.getArtifactLabel())).collect(Collectors.toList());
-
-		artifactsForDeleteDeployment.addAll(artifactsForDeleteInformational);
-
-		return artifactsForDeleteDeployment.stream()
-				.filter(e -> (e.getGenerated() != null && e.getGenerated().equals(Boolean.TRUE))
-						|| (e.getGenerated() == null && e.getArtifactLabel().toLowerCase().startsWith("aai")))
-				.collect(Collectors.toList());
-	}
-
-	private List<ArtifactDefinition> getAAIArtifatcsForCreate(List<ArtifactDefinition> artifactsFromAAI,
-			Component component) {
-
-		Set<String> componentDeploymentLabels = component.getDeploymentArtifacts().keySet();
-		Set<String> componentInfoLabels = component.getArtifacts().keySet();
-
-		// If the artifact label does not exist in the service -
-		// store the artifact (generate uuid and version, "generated" flag is TRUE)
-		return artifactsFromAAI.stream().filter(e -> !componentDeploymentLabels.contains(e.getArtifactLabel())
-				&& !componentInfoLabels.contains(e.getArtifactLabel())).collect(Collectors.toList());
-	}
-
-	private Either<ActionStatus, ResponseFormat> handleAAIArtifactsInDataModelByOperationType(Component component,
-			List<ArtifactDefinition> generatedArtifactsDefinitions, ArtifactOperationInfo operationType, User user,
-			boolean shouldLock, boolean inTransaction) {
-
-		String componentUniqueId = component.getUniqueId();
-		ComponentTypeEnum componentType = component.getComponentType();
-		Either<ActionStatus, ResponseFormat> result = Either.left(ActionStatus.OK);
-
-		for (ArtifactDefinition artDef : generatedArtifactsDefinitions) {
-			String data = gson.toJson(artDef);
-			String dataMD5 = GeneralUtility.calculateMD5Base64EncodedByString(data);
-			String artifactUniqueId = null;
-
-			if ((operationType.getArtifactOperationEnum() == ArtifactOperationEnum.UPDATE)
-					|| (operationType.getArtifactOperationEnum() == ArtifactOperationEnum.DELETE)) {
-				String artifactLabel = artDef.getArtifactLabel();
-				ArtifactDefinition artifactDefinition = component.getDeploymentArtifacts().get(artifactLabel);
-				if (artifactDefinition != null) {
-					artifactUniqueId = artifactDefinition.getUniqueId();
-				}
-			}
-
-			Either<Either<ArtifactDefinition, Operation>, ResponseFormat> validateAndHandleArtifact = artifactsBusinessLogic
-					.validateAndHandleArtifact(componentUniqueId, componentType, operationType, artifactUniqueId,
-							artDef, dataMD5, data, null, null, user, component, shouldLock, inTransaction, false);
-
-			if (validateAndHandleArtifact.isRight()) {
-				if (ArtifactOperationEnum.isCreateOrLink(operationType.getArtifactOperationEnum())
-						|| ArtifactOperationEnum.UPDATE == operationType.getArtifactOperationEnum()) {
-					ResponseFormat responseFormat = componentsUtils.getResponseFormat(
-							ActionStatus.AAI_ARTIFACT_GENERATION_FAILED, componentType.getValue(), component.getName(),
-							validateAndHandleArtifact.right().value().toString());
-
-					result = Either.right(responseFormat);
-				} else {
-					log.warn("Generated artifact {} could not be deleted", artDef.getArtifactLabel());
-				}
-			}
-		}
-
-		return result;
-	}
-
-	private List<ArtifactDefinition> convertToArtifactDefinitionFromArtifactGeneratedData(
-			List<Artifact> generatorOutput) {
-		List<ArtifactDefinition> artifactDefList = new LinkedList<>();
-
-		for (Artifact artifact : generatorOutput) {
-			ArtifactDefinition newEntry = new ArtifactDefinition();
-			newEntry.setArtifactName(artifact.getName());
-			newEntry.setArtifactType(artifact.getType());
-			newEntry.setArtifactGroupType(ArtifactGroupTypeEnum.findType(artifact.getGroupType()));
-			newEntry.setDescription(artifact.getDescription());
-
-			// Normalizing the artifact label to match those stored in DB
-			String normalizeArtifactLabel = ValidationUtils.normalizeArtifactLabel(artifact.getLabel());
-			newEntry.setArtifactLabel(normalizeArtifactLabel);
-			newEntry.setPayload(Base64.decodeBase64(artifact.getPayload()));
-			newEntry.setArtifactChecksum(artifact.getChecksum());
-			// Flag that set to true in case that the artifact is generated by AI&I
-			// generator
-			newEntry.setGenerated(Boolean.TRUE);
-
-			artifactDefList.add(newEntry);
-		}
-
-		return artifactDefList;
-	}
-
-	// List<ImmutablePair<Component, byte[] artifactBytes>>
-	// artifact stored by label
-	private List<Artifact> convertToGeneratorArtifactsInput(List<ImmutablePair<Component, byte[]>> inputs) {
-		List<Artifact> listOfArtifactsInput = new LinkedList<>();
-		for (ImmutablePair<Component, byte[]> triple : inputs) {
-			Component component = triple.getLeft();
-
-			Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
-			ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
-
-			String artifactName = artifactDefinition.getArtifactName();
-			String artifactType = artifactDefinition.getArtifactType();
-			String artifactGroupType = artifactDefinition.getArtifactGroupType().getType();
-			String artifactDescription = artifactDefinition.getDescription();
-			String artifactLabel = artifactDefinition.getArtifactLabel();
-			byte[] right = triple.getRight();
-			// The md5 calculated on the uncoded data
-			String md5Hex = DigestUtils.md5Hex(right);
-			byte[] payload = Base64.encodeBase64(right);
-			String artifactVersion = artifactDefinition.getArtifactVersion();
-
-			Artifact convertedArtifact = new Artifact(artifactType, artifactGroupType, md5Hex, payload);
-			convertedArtifact.setName(artifactName);
-			convertedArtifact.setDescription(artifactDescription);
-			convertedArtifact.setLabel(artifactLabel);
-			convertedArtifact.setVersion(artifactVersion);
-
-			listOfArtifactsInput.add(convertedArtifact);
-		}
-
-		return listOfArtifactsInput;
-	}
-
 	private Either<byte[], ActionStatus> getEntryData(String cassandraId, Component childComponent) {
 		byte[] content;
 		if (cassandraId == null || cassandraId.isEmpty()) {
@@ -852,9 +518,7 @@ public class CsarUtils {
 	}
 
 	private String createCsarBlock0(String metaFileVersion, String toscaConformanceLevel) {
-		final String BLOCK_0_TEMPLATE = "SDC-TOSCA-Meta-File-Version: %s\nSDC-TOSCA-Definitions-Version: %s\n";
-		String readyBlock = String.format(BLOCK_0_TEMPLATE, metaFileVersion, toscaConformanceLevel);
-		return readyBlock;
+        return String.format(BLOCK_0_TEMPLATE, metaFileVersion, toscaConformanceLevel);
 	}
 
 	private String createToscaBlock0(String metaFileVersion, String csarVersion, String createdBy, String entryDef) {
@@ -862,59 +526,6 @@ public class CsarUtils {
 		return String.format(block0template, metaFileVersion, csarVersion, createdBy, entryDef);
 	}
 
-	private Either<List<Artifact>, String> artifactGenerator(List<Artifact> artifactList, ArtifactType type,
-			Component component) {
-
-		ArtifactGenerationServiceImpl artifactGenerationServiceImpl = new ArtifactGenerationServiceImpl();
-		ArtifactTypes artifactTypes = new ArtifactTypes();
-		List<ArtifactType> artifactTypesList = new LinkedList<>();
-		ArtifactType otherType;
-
-		if (type == null) {
-			otherType = ArtifactType.OTHER;
-		} else {
-			otherType = type;
-		}
-
-		artifactTypesList.add(otherType);
-		artifactTypes.setArtifactTypes(artifactTypesList);
-
-		String configJson = gson.toJson(artifactTypes);
-		Map<String, String> additionalParams = new HashMap<>();
-		String version;
-
-		if (UUID_NORMATIVE_NEW_VERSION.matcher(component.getVersion()).matches()) {
-			version = component.getVersion();
-		} else {
-			String[] versionParts = component.getVersion()
-					.split(ToscaElementLifecycleOperation.VERSION_DELIMETER_REGEXP);
-			Integer majorVersion = Integer.parseInt(versionParts[0]);
-
-			version = (majorVersion + 1) + ToscaElementLifecycleOperation.VERSION_DELIMETER + "0";
-		}
-
-		additionalParams.put(AdditionalParams.ServiceVersion.getName(), version);
-		GenerationData generatedArtifacts = artifactGenerationServiceImpl.generateArtifact(artifactList, configJson,
-				additionalParams);
-
-		Map<String, List<String>> errorData = generatedArtifacts.getErrorData();
-
-		if (!errorData.isEmpty()) {
-			Set<String> keySet = errorData.keySet();
-			StringBuilder error = new StringBuilder();
-
-			for (String key : keySet) {
-				List<String> errorList = errorData.get(key);
-				log.debug("The Artifact Generator Failed - {} with following: {}", key, errorList);
-				error.append(key + errorList);
-			}
-
-			return Either.right(error.toString());
-		}
-
-		return Either.left(generatedArtifacts.getResultData());
-	}
-
 	/**
 	 * Extracts artifacts of VFCs from CSAR
 	 *
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/GroupExportParser.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/GroupExportParser.java
new file mode 100644
index 0000000000..3294bb84b9
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/GroupExportParser.java
@@ -0,0 +1,15 @@
+package org.openecomp.sdc.be.tosca;
+
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.GroupInstance;
+import org.openecomp.sdc.be.tosca.model.ToscaGroupTemplate;
+
+import java.util.Map;
+
+public interface GroupExportParser {
+
+	Map<String, ToscaGroupTemplate> getGroups(Component component);
+	
+	ToscaGroupTemplate getToscaGroupTemplate(GroupInstance groupInstance, String invariantName) ;
+	
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/GroupExportParserImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/GroupExportParserImpl.java
new file mode 100644
index 0000000000..d7adb54c08
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/GroupExportParserImpl.java
@@ -0,0 +1,234 @@
+package org.openecomp.sdc.be.tosca;
+
+import fj.data.Either;
+import org.apache.commons.lang.StringUtils;
+import org.openecomp.sdc.be.components.impl.exceptions.SdcResourceNotFoundException;
+import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
+import org.openecomp.sdc.be.model.utils.ComponentUtilities;
+import org.openecomp.sdc.be.model.utils.GroupUtils;
+import org.openecomp.sdc.be.tosca.model.*;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toMap;
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections.MapUtils.isEmpty;
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.apache.commons.lang.StringUtils.isNotEmpty;
+import static org.openecomp.sdc.be.model.utils.ComponentUtilities.getComponentInstanceNameByInstanceId;
+
+@Service
+public class GroupExportParserImpl implements GroupExportParser {
+
+    private static final Logger log = Logger.getLogger(GroupExportParserImpl.class);
+
+    private Map<String, DataTypeDefinition> dataTypes;
+    private ApplicationDataTypeCache dataTypeCache;
+    private PropertyConvertor propertyConvertor = PropertyConvertor.getInstance();
+    
+    @Autowired
+	public GroupExportParserImpl(ApplicationDataTypeCache dataTypeCache) {
+		this.dataTypeCache = dataTypeCache;
+		this.dataTypes = getDataTypes();
+	}
+    
+    private Map<String, DataTypeDefinition> getDataTypes()  {
+		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> dataTypesEither = dataTypeCache.getAll();
+		if (dataTypesEither.isRight()) {
+			log.error("Failed to retrieve all data types {}", dataTypesEither.right().value()); 
+			throw new SdcResourceNotFoundException(); 
+		}
+		
+		return dataTypesEither.left().value();
+	}
+    
+	@Override
+	public Map<String, ToscaGroupTemplate> getGroups(Component component) {
+		List<GroupDefinition> groups = component.getGroups();
+
+		if (isEmpty(groups)) {
+			return null;
+		}
+		
+		return groups.stream()
+				.collect(toMap(GroupDefinition::getName,
+						  group -> getToscaGroupTemplate(component, group)));
+	}
+	
+	@Override
+	public ToscaGroupTemplate getToscaGroupTemplate(GroupInstance groupInstance, String componentInstanceInvariantName) {
+		
+		String groupName = groupInstance.getName();
+		if (StringUtils.isNotEmpty(componentInstanceInvariantName)) {
+			String prefix = componentInstanceInvariantName + Constants.GROUP_POLICY_NAME_DELIMETER;
+			if (groupName.startsWith(prefix)) {
+				groupName = groupName.substring(prefix.length());
+			}
+		}
+		String invariantUUID = groupInstance.getInvariantUUID();
+		String groupUUID = groupInstance.getGroupUUID();
+		String version = groupInstance.getVersion();
+		List<GroupInstanceProperty> groupInstanceProperties = groupInstance.convertToGroupInstancesProperties();
+		String groupType = groupInstance.getType();
+		String customizationUUID = groupInstance.getCustomizationUUID();
+
+		IToscaMetadata toscaMetadata = getToscaGroupTemplateMetadata(groupName, invariantUUID, groupUUID, version, groupType, customizationUUID);		
+		Map<String, Object> properties = getToscaGroupTemplateProperties(groupInstanceProperties);
+		
+        return new ToscaGroupTemplate(groupType, toscaMetadata, properties);
+	}
+
+	private ToscaGroupTemplate getToscaGroupTemplate(Component component, GroupDefinition groupDefinition) {
+
+		String groupName = groupDefinition.getName();
+		String invariantUUID = groupDefinition.getInvariantUUID();
+		String groupUUID = groupDefinition.getGroupUUID();
+		String version = groupDefinition.getVersion();
+		String groupType = groupDefinition.getType();
+		List<PropertyDataDefinition> groupDefinitionProperties = groupDefinition.getProperties();
+		
+		List<String> members = getToscaGroupTemplateMembers(component, groupDefinition.getMembers());
+		IToscaMetadata toscaMetadata = getToscaGroupTemplateMetadata(groupName, invariantUUID, groupUUID, version,groupType, null);		
+		Map<String, Object> properties = getToscaGroupTemplateProperties(groupDefinitionProperties);
+		Map<String, ToscaTemplateCapability> capabilities = getToscaGroupTemplateCapabilities(groupDefinition);
+
+		return new ToscaGroupTemplate(groupType, members, toscaMetadata, properties, capabilities);
+	}
+	
+	private Map<String, ToscaTemplateCapability> getToscaGroupTemplateCapabilities(GroupDefinition group) {
+		if (isEmpty(group.getCapabilities())) {
+			return null;
+		}
+
+		Map<String, ToscaTemplateCapability> toscaGroupTemplateCapabilities = group.getCapabilities().values()
+				.stream()
+				.flatMap(Collection::stream)
+				.filter(c -> isNotEmptyProperties(c.getProperties()))
+				.collect(toMap(c-> getCapabilityName(c, group), this::getToscaTemplateCapability));
+
+		if (isNotEmpty(toscaGroupTemplateCapabilities)) {
+			return toscaGroupTemplateCapabilities;
+		} else {
+			return null;
+		}
+	}
+
+	private String getCapabilityName(CapabilityDefinition capability, GroupDefinition group) {
+    	if(ComponentUtilities.isNotUpdatedCapReqName(group.getNormalizedName() + ".", capability.getName(), capability.getPreviousName())){
+    		return capability.getName();
+		}
+		return capability.getPreviousName();
+	}
+
+	private boolean isNotEmptyProperties(List<ComponentInstanceProperty> properties) {
+    	return isNotEmpty(properties) && properties.stream()
+				.filter(isComponentInstancePropertiesNotEmpty())
+				.findFirst()
+				.isPresent();
+	}
+
+	private ToscaTemplateCapability getToscaTemplateCapability(CapabilityDefinition capability) {
+		ToscaTemplateCapability toscaTemplateCapability = new ToscaTemplateCapability();
+		Map<String, Object> toscaCapabilityProperties = capability.getProperties().stream()
+				.filter(isComponentInstancePropertiesNotEmpty())
+				.collect(toMap(ComponentInstanceProperty::getName,
+										  this::fetchCapabilityValue));
+		if(isNotEmpty(toscaCapabilityProperties)) {
+			toscaTemplateCapability.setProperties(toscaCapabilityProperties);
+		}
+		return toscaTemplateCapability;
+	}
+
+	private Predicate<? super ComponentInstanceProperty> isComponentInstancePropertiesNotEmpty() {
+		return c -> {
+			return (c.getName() != null && (c.getValue() != null || c.getDefaultValue() != null));
+		};
+	}
+
+	private String fetchCapabilityValue(ComponentInstanceProperty componentInstanceProperty) {
+		if(componentInstanceProperty.getValue() != null) {
+			return componentInstanceProperty.getValue();
+		}else {
+			return componentInstanceProperty.getDefaultValue();
+		}
+	}
+
+	private List<String> getToscaGroupTemplateMembers(Component component, Map<String, String> members) {
+		if (members == null) {
+			return null;
+		}
+		return members.values()
+				.stream()
+				.map(memberId -> getMemberNameByMemberId(component, memberId))
+				.filter(Optional::isPresent)
+				.map(Optional::get)
+				.collect(toList());
+	}
+
+	private Optional<String> getMemberNameByMemberId(Component component, String memberId) {
+    	return getComponentInstanceNameByInstanceId(component, memberId);
+	}
+
+	private IToscaMetadata getToscaGroupTemplateMetadata(String groupName,String invariantUUID,
+			                                             String groupUUID,String version,String type, String customizationUUID) {
+				
+		IToscaMetadata toscaMetadata = getToscaMetadataByType(type);
+		
+		toscaMetadata.setName(groupName);
+		toscaMetadata.setInvariantUUID(invariantUUID);
+		toscaMetadata.setUUID(groupUUID);
+		toscaMetadata.setVersion(version);
+		toscaMetadata.setCustomizationUUID(customizationUUID);
+		return toscaMetadata;
+	}
+
+	private IToscaMetadata getToscaMetadataByType(String type) {
+		IToscaMetadata toscaMetadata;
+		if (GroupUtils.isVfModule(type)) {
+			toscaMetadata = new VfModuleToscaMetadata();
+		} else {
+			toscaMetadata = new ToscaMetadata();
+		}
+		return toscaMetadata;
+	}
+
+	private Map<String, Object> getToscaGroupTemplateProperties(List<? extends PropertyDataDefinition> tempProperties) {
+				
+		if (isEmpty(tempProperties)) {
+			return null;
+		}
+				
+		Map<String, Object> props = new HashMap<>();
+
+		tempProperties.forEach(input -> 
+			propertyConvertor.convertAndAddValue(dataTypes, props, input, getPropertyValue(input))
+		);
+
+		if (props.isEmpty()) {
+			return null;
+		} else {
+			return props;
+		}	
+	}
+
+	private Supplier<String> getPropertyValue(PropertyDataDefinition propertyDataDefinition) {
+		return () -> {
+			if (isNotEmpty(propertyDataDefinition.getValue())) {
+				return propertyDataDefinition.getValue();
+			} else {
+				return propertyDataDefinition.getDefaultValue();
+			}
+		};
+	}
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PolicyExportParser.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PolicyExportParser.java
new file mode 100644
index 0000000000..509c1a4113
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PolicyExportParser.java
@@ -0,0 +1,11 @@
+package org.openecomp.sdc.be.tosca;
+
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.tosca.model.ToscaPolicyTemplate;
+
+import java.util.Map;
+
+public interface PolicyExportParser {
+
+	Map<String, ToscaPolicyTemplate> getPolicies(Component component);
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PolicyExportParserImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PolicyExportParserImpl.java
new file mode 100644
index 0000000000..0ebdf0e362
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PolicyExportParserImpl.java
@@ -0,0 +1,185 @@
+package org.openecomp.sdc.be.tosca;
+
+
+import fj.data.Either;
+import org.openecomp.sdc.be.components.impl.exceptions.SdcResourceNotFoundException;
+import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.datatypes.elements.PolicyTargetType;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
+import org.openecomp.sdc.be.tosca.model.IToscaMetadata;
+import org.openecomp.sdc.be.tosca.model.ToscaMetadata;
+import org.openecomp.sdc.be.tosca.model.ToscaPolicyTemplate;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.apache.commons.lang.StringUtils.isNotEmpty;
+
+@Service
+public class PolicyExportParserImpl implements PolicyExportParser {
+
+	private static final Logger log = Logger.getLogger(PolicyExportParserImpl.class);
+   
+	private ApplicationDataTypeCache dataTypeCache;
+	private Map<String, DataTypeDefinition> dataTypes;
+	private PropertyConvertor propertyConvertor = PropertyConvertor.getInstance();
+	
+	@Autowired
+	public PolicyExportParserImpl(ApplicationDataTypeCache dataTypeCache) {
+		this.dataTypeCache = dataTypeCache;
+		this.dataTypes = getDataTypes();
+	}
+	
+	private Map<String, DataTypeDefinition> getDataTypes()  {
+		Either<Map<String, DataTypeDefinition>, TitanOperationStatus> dataTypesEither = dataTypeCache.getAll();
+		if (dataTypesEither.isRight()) {
+			log.error("Failed to retrieve all data types {}", dataTypesEither.right().value()); 
+			throw new SdcResourceNotFoundException(); 
+		}
+		
+		return dataTypesEither.left().value();
+	}
+	
+	@Override
+	public Map<String, ToscaPolicyTemplate> getPolicies(Component component) {
+		Map<String, ToscaPolicyTemplate> toscaPolicies = null;
+		Map<String, PolicyDefinition> policies = component.getPolicies();		
+		if (isNotEmpty(policies)) {
+
+			 toscaPolicies = policies.values().stream().collect(
+					 Collectors.toMap(
+							 PolicyDefinition::getName,
+							 policy->getToscaPolicyTemplate(policy,component)));
+			log.debug("policies converted");
+		}	
+		return toscaPolicies;	
+	}
+	
+	private ToscaPolicyTemplate getToscaPolicyTemplate(PolicyDefinition policyDefinition,Component component) {
+		
+		 String type = policyDefinition.getPolicyTypeName();
+	     IToscaMetadata metadata = getToscaPolicyTemplateMetadata(policyDefinition);
+	     Map<String, Object> properties = getToscaPolicyTemplateProperties(policyDefinition);
+	     List<String> targets = getToscaPolicyTemplateTargets(
+	    		 policyDefinition,component.getComponentInstances(),component.getGroups());
+				
+		return new ToscaPolicyTemplate(type, metadata, properties, targets);
+	}
+	
+	private List<String> getToscaPolicyTemplateTargets(PolicyDefinition policyDefinition,
+			List<ComponentInstance> componentInstances, List<GroupDefinition> groups) {
+
+		Map<PolicyTargetType, List<String>> targets = policyDefinition.getTargets();
+		List<String> targetNames = null;
+
+		if (targets == null || targets.isEmpty()) {
+			return null;
+		}
+
+		List<String> componentInstancesTargets = targets.get(PolicyTargetType.COMPONENT_INSTANCES);
+		List<String> groupTargets = targets.get(PolicyTargetType.GROUPS);
+		
+		if (isNotEmpty(componentInstancesTargets) && isNotEmpty(componentInstances)) {	
+			// get target names by Id from component instances
+			Map<String, String> targetNamesByIdFromComponentInstances = 
+					getTargetNamesByIdFromComponentInstances(componentInstances);
+			targetNames = targetNamesLazyInstantiation(targetNames);
+			addTargetNames(componentInstancesTargets, targetNames, targetNamesByIdFromComponentInstances);
+			
+		}
+		
+		if (isNotEmpty(groupTargets) && isNotEmpty(groups)) {
+			// get target names by id from group definitions
+			Map<String, String> targetNamesByIdFromGroupDefinitions = getTargetNamesByIdFromGroupDefinitions(groups);
+			targetNames = targetNamesLazyInstantiation(targetNames);
+			addTargetNames(groupTargets, targetNames, targetNamesByIdFromGroupDefinitions);
+			
+		}
+
+		return targetNames;
+	}
+
+	private List<String> targetNamesLazyInstantiation(List<String> targetNames) {
+		if (targetNames == null) {
+			targetNames = new ArrayList<>();
+		}
+		return targetNames;
+	}
+
+	private void addTargetNames(List<String> targets, List<String> targetNames,
+			Map<String, String> targetNamesById) {
+		
+		if (!targetNamesById.isEmpty()) {
+			
+			for (String id : targets) {
+				String name = targetNamesById.get(id);
+				if (name != null) {
+					targetNames.add(name);
+				}
+			}
+		}
+	}
+
+	private Map<String, String> getTargetNamesByIdFromGroupDefinitions(List<GroupDefinition> groups) {	
+		return groups.stream().collect(
+				Collectors.toMap(GroupDefinition::getUniqueId, GroupDefinition::getName));		
+	}
+
+	private Map<String, String> getTargetNamesByIdFromComponentInstances(List<ComponentInstance> componentInstances) {
+		return componentInstances.stream().collect(
+				Collectors.toMap(ComponentInstance::getUniqueId,ComponentInstance::getName));
+	}
+
+	private Map<String, Object> getToscaPolicyTemplateProperties(PolicyDefinition policyDefinition) {
+		
+		List<PropertyDataDefinition> tempProperties = policyDefinition.getProperties();
+		
+		if (isEmpty(tempProperties)) {
+			return null;
+		}
+				
+		Map<String, Object> props = new HashMap<>();
+
+		tempProperties.forEach(input -> 
+			propertyConvertor.convertAndAddValue(dataTypes, props, input, getPropertyValue(input))
+		);
+
+		if (props.isEmpty()) {
+			return null;
+		} else {
+			return props;
+		}	
+	}
+
+	private Supplier<String> getPropertyValue(PropertyDataDefinition propertyDataDefinition) {
+		return () -> {
+			if (isNotEmpty(propertyDataDefinition.getValue())) {
+				return propertyDataDefinition.getValue();
+			} else {
+				return propertyDataDefinition.getDefaultValue();
+			}
+		};
+	}
+
+	private IToscaMetadata getToscaPolicyTemplateMetadata(PolicyDefinition policyDefinition) {
+		IToscaMetadata metadata = new ToscaMetadata();
+		metadata.setInvariantUUID(policyDefinition.getInvariantUUID());
+		metadata.setUUID(policyDefinition.getPolicyUUID());
+		metadata.setName(policyDefinition.getName());
+		metadata.setVersion(policyDefinition.getVersion());
+		return metadata;
+	}
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java
index f40ebf0e64..a3ee69d681 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/PropertyConvertor.java
@@ -20,12 +20,13 @@
 
 package org.openecomp.sdc.be.tosca;
 
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.google.gson.stream.JsonReader;
+import fj.data.Either;
 import org.apache.commons.lang3.StringUtils;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
@@ -34,24 +35,23 @@ import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.model.tosca.converters.DataTypePropertyConverter;
 import org.openecomp.sdc.be.model.tosca.converters.ToscaMapValueConverter;
+import org.openecomp.sdc.be.model.tosca.converters.ToscaValueBaseConverter;
 import org.openecomp.sdc.be.model.tosca.converters.ToscaValueConverter;
 import org.openecomp.sdc.be.tosca.model.EntrySchema;
 import org.openecomp.sdc.be.tosca.model.ToscaNodeType;
 import org.openecomp.sdc.be.tosca.model.ToscaProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.google.gson.stream.JsonReader;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import fj.data.Either;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
 
 public class PropertyConvertor {
     private static PropertyConvertor instance;
     private JsonParser jsonParser = new JsonParser();
-    private static final Logger log = LoggerFactory.getLogger(PropertyConvertor.class);
+    private static final Logger log = Logger.getLogger(PropertyConvertor.class);
     Gson gson = new Gson();
     protected PropertyConvertor() {
 
@@ -84,7 +84,7 @@ public class PropertyConvertor {
         return Either.left(toscaNodeType);
     }
 
-    public ToscaProperty convertProperty(Map<String, DataTypeDefinition> dataTypes, PropertyDefinition property, boolean isCapabiltyProperty) {
+    public ToscaProperty convertProperty(Map<String, DataTypeDefinition> dataTypes, PropertyDataDefinition property, boolean isCapabiltyProperty) {
         ToscaProperty prop = new ToscaProperty();
 
         String innerType = null;
@@ -96,8 +96,13 @@ public class PropertyConvertor {
             eschema.setDescription(schema.getProperty().getDescription());
             prop.setEntry_schema(eschema);
         }
+        return getToscaProperty(dataTypes, property, isCapabiltyProperty, prop, innerType);
+
+    }
+
+    private ToscaProperty getToscaProperty(Map<String, DataTypeDefinition> dataTypes, PropertyDataDefinition property, boolean isCapabiltyProperty, ToscaProperty prop, String innerType) {
         log.trace("try to convert property {} from type {} with default value [{}]", property.getName(), property.getType(), property.getDefaultValue());
-        Object convertedObj = convertToToscaObject(property.getType(), property.getDefaultValue(), innerType, dataTypes);
+        Object convertedObj = convertToToscaObject(property.getType(), property.getDefaultValue(), innerType, dataTypes, false);
         if (convertedObj != null) {
             prop.setDefaultp(convertedObj);
         }
@@ -108,10 +113,10 @@ public class PropertyConvertor {
             prop.setRequired(property.isRequired());
         }
         return prop;
-
     }
+    
 
-    public Object convertToToscaObject(String propertyType, String value, String innerType, Map<String, DataTypeDefinition> dataTypes) {
+    public Object convertToToscaObject(String propertyType, String value, String innerType, Map<String, DataTypeDefinition> dataTypes, boolean preserveEmptyValue) {
         log.trace("try to convert propertyType {} , value [{}], innerType {}", propertyType, value, innerType);
         if (StringUtils.isEmpty(value)) {
             value = DataTypePropertyConverter.getInstance().getDataTypePropertiesDefaultValuesRec(propertyType, dataTypes);
@@ -178,7 +183,7 @@ public class PropertyConvertor {
                         if (innerConverter != null) {
                             convertedValue = innerConverter.convertToToscaValue(value, innerType, dataTypes);
                         } else {
-                            convertedValue = mapConverterInst.convertDataTypeToToscaObject(innerType, dataTypes, innerConverter, isScalar, jsonElement);
+                            convertedValue = mapConverterInst.convertDataTypeToToscaObject(innerType, dataTypes, innerConverter, isScalar, jsonElement, preserveEmptyValue);
                         }
                     }
                 }
@@ -195,5 +200,23 @@ public class PropertyConvertor {
     private boolean valueStartsWithNonJsonChar(String value) {
         return value.startsWith("/") || value.startsWith(":");
     }
+    
+    public void convertAndAddValue(Map<String, DataTypeDefinition> dataTypes,
+            Map<String, Object> props, PropertyDataDefinition prop, Supplier<String> supplier) {
+        Object convertedValue = convertValue(dataTypes, prop, supplier);
+        if (!ToscaValueBaseConverter.isEmptyObjectValue(convertedValue)) {
+            props.put(prop.getName(), convertedValue);
+        }
+    }
+
+    private <T extends PropertyDataDefinition> Object convertValue(Map<String, DataTypeDefinition> dataTypes,
+             T input, Supplier<String> supplier) {
+        String propertyType = input.getType();
+        String innerType = null;
+        if (input.getSchema() != null && input.getSchema().getProperty() != null) {
+            innerType = input.getSchema().getProperty().getType();
+        }
+        return convertToToscaObject(propertyType, supplier.get(), innerType, dataTypes, false);
+    }
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index 4455c3205a..e5e5f1648a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -1,47 +1,34 @@
 /*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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
- *
+* ============LICENSE_START=======================================================
+* SDC
+* ================================================================================
+* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+* ================================================================================
+* 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=========================================================
- */
+* 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.openecomp.sdc.be.tosca;
 
 import static org.openecomp.sdc.be.tosca.utils.InterfacesOperationsToscaUtil.addInterfaceDefinitionElement;
 import static org.openecomp.sdc.be.tosca.utils.InterfacesOperationsToscaUtil.addInterfaceTypeElement;
 
-import java.beans.IntrospectionException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import fj.data.Either;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
+import org.openecomp.sdc.be.components.impl.exceptions.SdcResourceNotFoundException;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
@@ -56,9 +43,7 @@ import org.openecomp.sdc.be.model.ComponentInstanceInput;
 import org.openecomp.sdc.be.model.ComponentInstanceProperty;
 import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.GroupDefinition;
 import org.openecomp.sdc.be.model.GroupInstance;
-import org.openecomp.sdc.be.model.GroupProperty;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.RelationshipInfo;
@@ -71,23 +56,20 @@ import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
-import org.openecomp.sdc.be.model.tosca.converters.ToscaValueBaseConverter;
-import org.openecomp.sdc.be.tosca.model.IToscaMetadata;
 import org.openecomp.sdc.be.tosca.model.SubstitutionMapping;
 import org.openecomp.sdc.be.tosca.model.ToscaCapability;
 import org.openecomp.sdc.be.tosca.model.ToscaGroupTemplate;
 import org.openecomp.sdc.be.tosca.model.ToscaMetadata;
 import org.openecomp.sdc.be.tosca.model.ToscaNodeTemplate;
 import org.openecomp.sdc.be.tosca.model.ToscaNodeType;
+import org.openecomp.sdc.be.tosca.model.ToscaPolicyTemplate;
 import org.openecomp.sdc.be.tosca.model.ToscaProperty;
 import org.openecomp.sdc.be.tosca.model.ToscaTemplate;
 import org.openecomp.sdc.be.tosca.model.ToscaTemplateRequirement;
 import org.openecomp.sdc.be.tosca.model.ToscaTopolgyTemplate;
-import org.openecomp.sdc.be.tosca.model.VfModuleToscaMetadata;
 import org.openecomp.sdc.be.tosca.utils.ForwardingPathToscaUtil;
-import org.openecomp.sdc.common.api.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.openecomp.sdc.be.tosca.utils.InputConverter;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.DumperOptions.FlowStyle;
@@ -102,38 +84,60 @@ import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Represent;
 import org.yaml.snakeyaml.representer.Representer;
 
-import fj.data.Either;
+import java.beans.IntrospectionException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.apache.commons.lang.StringUtils.isNotEmpty;
 
 @org.springframework.stereotype.Component("tosca-export-handler")
 public class ToscaExportHandler {
 
-    @Autowired
     private ApplicationDataTypeCache dataTypeCache;
-
-    @Autowired
-    private ToscaOperationFacade toscaOperationFacade;
-    @Autowired
-    private CapabiltyRequirementConvertor capabiltyRequirementConvertor;
-    private PropertyConvertor propertyConvertor = PropertyConvertor.getInstance();
-
-    private static final Logger log = LoggerFactory.getLogger(ToscaExportHandler.class);
+    private ToscaOperationFacade toscaOperationFacade;  
+    private CapabilityRequirementConverter capabilityRequirementConverter;
+    private PolicyExportParser policyExportParser;
+    private GroupExportParser groupExportParser;
+    private PropertyConvertor propertyConvertor;
+    private InputConverter inputConverter;
+
+    @Autowired 
+    public ToscaExportHandler(ApplicationDataTypeCache dataTypeCache, ToscaOperationFacade toscaOperationFacade,
+                              CapabilityRequirementConverter capabilityRequirementConverter, PolicyExportParser policyExportParser,
+                              GroupExportParser groupExportParser, InputConverter inputConverter) {
+            this.dataTypeCache = dataTypeCache;
+            this.toscaOperationFacade = toscaOperationFacade;
+            this.capabilityRequirementConverter = capabilityRequirementConverter;
+            this.policyExportParser = policyExportParser;
+            this.groupExportParser = groupExportParser;
+            this.propertyConvertor = PropertyConvertor.getInstance();
+            this.inputConverter =  inputConverter;
+      }
+
+
+    private static final Logger log = Logger.getLogger(ToscaExportHandler.class);
 
     public static final String TOSCA_VERSION = "tosca_simple_yaml_1_1";
     private static final String SERVICE_NODE_TYPE_PREFIX = "org.openecomp.service.";
     private static final String IMPORTS_FILE_KEY = "file";
-    public static final String TOSCA_TEMPLATE_NAME = "-template.yml";
     private static final String TOSCA_INTERFACE_NAME = "-interface.yml";
-    static final String ASSET_TOSCA_TEMPLATE = "assettoscatemplate";
-    private static final String VF_MODULE_TYPE_KEY = "vf_module_type";
-    private static final String VF_MODULE_DESC_KEY = "vf_module_description";
-    public static final String VOLUME_GROUP_KEY = "volume_group";
-    private static final String VF_MODULE_TYPE_BASE = "Base";
-    private static final String VF_MODULE_TYPE_EXPANSION = "Expansion";
-    private static final String FAILED_TO_GET_DEFAULT_IMPORTS_CONFIGURATION =
-            "convertToToscaTemplate - failed to get Default Imports section from configuration";
+    public static final String ASSET_TOSCA_TEMPLATE = "assettoscatemplate";
+    private static final String FAILED_TO_GET_DEFAULT_IMPORTS_CONFIGURATION = "convertToToscaTemplate - failed to get Default Imports section from configuration";
     private static final String NOT_SUPPORTED_COMPONENT_TYPE = "Not supported component type {}";
-    protected static final List<Map<String, Map<String, String>>> DEFAULT_IMPORTS =
-            ConfigurationManager.getConfigurationManager().getConfiguration().getDefaultImports();
+    private static final List<Map<String, Map<String, String>>> DEFAULT_IMPORTS = ConfigurationManager
+            .getConfigurationManager().getConfiguration().getDefaultImports();
 
     public Either<ToscaRepresentation, ToscaError> exportComponent(Component component) {
 
@@ -156,8 +160,8 @@ public class ToscaExportHandler {
         ToscaTemplate toscaTemplate = new ToscaTemplate(TOSCA_VERSION);
         toscaTemplate.setImports(new ArrayList<>(DEFAULT_IMPORTS));
         Map<String, ToscaNodeType> nodeTypes = new HashMap<>();
-        Either<ToscaTemplate, ToscaError> toscaTemplateRes =
-                convertInterfaceNodeType(component, toscaTemplate, nodeTypes);
+        Either<ToscaTemplate, ToscaError> toscaTemplateRes = convertInterfaceNodeType(new HashMap<>(), component, toscaTemplate,
+                nodeTypes);
         if (toscaTemplateRes.isRight()) {
             return Either.right(toscaTemplateRes.right().value());
         }
@@ -197,8 +201,8 @@ public class ToscaExportHandler {
 
     public Either<ToscaTemplate, ToscaError> getDependencies(Component component) {
         ToscaTemplate toscaTemplate = new ToscaTemplate(null);
-        Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> fillImports =
-                fillImports(component, toscaTemplate);
+        Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> fillImports = fillImports(component,
+                toscaTemplate);
         if (fillImports.isRight()) {
             return Either.right(fillImports.right().value());
         }
@@ -219,7 +223,7 @@ public class ToscaExportHandler {
         Map<String, ToscaNodeType> nodeTypes = new HashMap<>();
         if (ModelConverter.isAtomicComponent(component)) {
             log.trace("convert component as node type");
-            return convertNodeType(component, toscaTemplate, nodeTypes);
+            return convertNodeType(new HashMap<>(), component, toscaTemplate, nodeTypes);
         } else {
             log.trace("convert component as topology template");
             return convertToscaTemplate(component, toscaTemplate);
@@ -229,15 +233,14 @@ public class ToscaExportHandler {
 
     private Either<ToscaTemplate, ToscaError> convertToscaTemplate(Component component, ToscaTemplate toscaNode) {
 
-        Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> importsRes =
-                fillImports(component, toscaNode);
+        Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> importsRes = fillImports(component,
+                toscaNode);
         if (importsRes.isRight()) {
             return Either.right(importsRes.right().value());
         }
         toscaNode = importsRes.left().value().left;
         Map<String, Component> componentCache = importsRes.left().value().right;
-        Either<Map<String, ToscaNodeType>, ToscaError> nodeTypesMapEither =
-                createProxyNodeTypes(componentCache, component);
+        Either<Map<String, ToscaNodeType>, ToscaError> nodeTypesMapEither = createProxyNodeTypes(componentCache , component );
         if (nodeTypesMapEither.isRight()) {
             log.debug("Failed to fetch normative service proxy resource by tosca name, error {}",
                     nodeTypesMapEither.right().value());
@@ -255,24 +258,21 @@ public class ToscaExportHandler {
             return Either.right(ToscaError.GENERAL_ERROR);
         }
         Map<String, DataTypeDefinition> dataTypes = dataTypesEither.left().value();
-
         ToscaTopolgyTemplate topologyTemplate = new ToscaTopolgyTemplate();
+        List<InputDefinition> inputDef = component.getInputs();
+        Map<String, ToscaProperty> inputs = inputConverter.convertInputs(inputDef, dataTypes);
 
-        Either<ToscaTopolgyTemplate, ToscaError> inputs = fillInputs(component, topologyTemplate, dataTypes);
-        if (inputs.isRight()) {
-            return Either.right(inputs.right().value());
+        if (!inputs.isEmpty()) {
+            topologyTemplate.setInputs(inputs);
         }
-        topologyTemplate = inputs.left().value();
 
         List<ComponentInstance> componentInstances = component.getComponentInstances();
-        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties =
-                component.getComponentInstancesProperties();
-        List<GroupDefinition> groups = component.getGroups();
+        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = component
+                .getComponentInstancesProperties();
         if (componentInstances != null && !componentInstances.isEmpty()) {
 
-            Either<Map<String, ToscaNodeTemplate>, ToscaError> nodeTemplates =
-                    convertNodeTemplates(component, componentInstances, componentInstancesProperties, componentCache,
-                            dataTypes, topologyTemplate);
+            Either<Map<String, ToscaNodeTemplate>, ToscaError> nodeTemplates = convertNodeTemplates(component,
+                    componentInstances, componentInstancesProperties, componentCache, dataTypes, topologyTemplate);
             if (nodeTemplates.isRight()) {
                 return Either.right(nodeTemplates.right().value());
             }
@@ -280,55 +280,43 @@ public class ToscaExportHandler {
 
             topologyTemplate.setNode_templates(nodeTemplates.left().value());
         }
-        Map<String, ToscaGroupTemplate> groupsMap;
-        if (groups != null && !groups.isEmpty()) {
-            groupsMap = new HashMap<>();
-            for (GroupDefinition group : groups) {
-                boolean addToTosca = true;
-                if (group.getType().equals(Constants.DEFAULT_GROUP_VF_MODULE)) {
-                    List<String> artifacts = group.getArtifacts();
-                    if (artifacts == null || artifacts.isEmpty()) {
-                        addToTosca = false;
-                    }
-                }
-                if (addToTosca) {
-                    ToscaGroupTemplate toscaGroup = convertGroup(group);
-                    groupsMap.put(group.getName(), toscaGroup);
-                }
-
+        
+        
+        addGroupsToTopologyTemplate(component, topologyTemplate);
+            
+        try {
+             addPoliciesToTopologyTemplate(component, topologyTemplate);
+            } catch (SdcResourceNotFoundException e) {
+                  log.debug("Fail to add policies to topology template:",e);
+                  Either.right(ToscaError.GENERAL_ERROR);
             }
-            log.debug("groups converted");
-            topologyTemplate.addGroups(groupsMap);
-        }
+            
+            
         SubstitutionMapping substitutionMapping = new SubstitutionMapping();
         String toscaResourceName;
         switch (component.getComponentType()) {
-            case RESOURCE:
-                toscaResourceName = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition()
-                                                                               .getMetadataDataDefinition())
-                                            .getToscaResourceName();
-                break;
-            case SERVICE:
-                toscaResourceName = SERVICE_NODE_TYPE_PREFIX + component.getComponentMetadataDefinition()
-                                                                        .getMetadataDataDefinition().getSystemName();
-                break;
-            default:
-                log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
-                return Either.right(ToscaError.NOT_SUPPORTED_TOSCA_TYPE);
+        case RESOURCE:
+            toscaResourceName = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition()
+                    .getMetadataDataDefinition()).getToscaResourceName();
+            break;
+        case SERVICE:
+            toscaResourceName = SERVICE_NODE_TYPE_PREFIX
+                    + component.getComponentMetadataDefinition().getMetadataDataDefinition().getSystemName();
+            break;
+        default:
+            log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
+            return Either.right(ToscaError.NOT_SUPPORTED_TOSCA_TYPE);
         }
         substitutionMapping.setNode_type(toscaResourceName);
 
-        Either<SubstitutionMapping, ToscaError> capabilities =
-                convertCapabilities(component, substitutionMapping, componentCache);
+        Either<SubstitutionMapping, ToscaError> capabilities = convertCapabilities(component, substitutionMapping, componentCache);
         if (capabilities.isRight()) {
             return Either.right(capabilities.right().value());
         }
         substitutionMapping = capabilities.left().value();
 
-        Either<SubstitutionMapping, ToscaError> requirements = capabiltyRequirementConvertor
-                                                                       .convertSubstitutionMappingRequirements(
-                                                                               componentCache, component,
-                                                                               substitutionMapping);
+        Either<SubstitutionMapping, ToscaError> requirements = capabilityRequirementConverter
+                .convertSubstitutionMappingRequirements(componentCache, component, substitutionMapping);
         if (requirements.isRight()) {
             return Either.right(requirements.right().value());
         }
@@ -340,25 +328,22 @@ public class ToscaExportHandler {
         return Either.left(toscaNode);
     }
 
-    private Either<ToscaTopolgyTemplate, ToscaError> fillInputs(Component component,
-            ToscaTopolgyTemplate topologyTemplate, Map<String, DataTypeDefinition> dataTypes) {
-        if (log.isDebugEnabled()) {
-            log.debug("fillInputs for component {}", component.getUniqueId());
-        }
-        List<InputDefinition> inputDef = component.getInputs();
-        Map<String, ToscaProperty> inputs = new HashMap<>();
+      private void addGroupsToTopologyTemplate(Component component, ToscaTopolgyTemplate topologyTemplate) {
+            
+            
+            Map<String, ToscaGroupTemplate> groups = groupExportParser.getGroups(component);
+            if(groups!= null) {
+                  topologyTemplate.addGroups(groups);
+            }
+      }
 
-        if (inputDef != null) {
-            inputDef.forEach(i -> {
-                ToscaProperty property = propertyConvertor.convertProperty(dataTypes, i, false);
-                inputs.put(i.getName(), property);
-            });
-            if (!inputs.isEmpty()) {
-                topologyTemplate.setInputs(inputs);
+      private void addPoliciesToTopologyTemplate(Component component, ToscaTopolgyTemplate topologyTemplate)
+                  throws SdcResourceNotFoundException {
+            Map<String, ToscaPolicyTemplate> policies = policyExportParser.getPolicies(component);
+            if(policies!= null) {
+                  topologyTemplate.addPolicies(policies);
             }
-        }
-        return Either.left(topologyTemplate);
-    }
+      }
 
     private ToscaMetadata convertMetadata(Component component) {
         return convertMetadata(component, false, null);
@@ -379,8 +364,8 @@ public class ToscaExportHandler {
         if (isInstance) {
             toscaMetadata.setVersion(component.getVersion());
             toscaMetadata.setCustomizationUUID(componentInstance.getCustomizationUUID());
-            if (componentInstance.getSourceModelInvariant() != null && !componentInstance.getSourceModelInvariant()
-                                                                                         .isEmpty()) {
+            if (componentInstance.getSourceModelInvariant() != null
+                    && !componentInstance.getSourceModelInvariant().isEmpty()) {
                 toscaMetadata.setVersion(componentInstance.getComponentVersion());
                 toscaMetadata.setSourceModelInvariant(componentInstance.getSourceModelInvariant());
                 toscaMetadata.setSourceModelUuid(componentInstance.getSourceModelUuid());
@@ -392,38 +377,48 @@ public class ToscaExportHandler {
 
         }
         switch (component.getComponentType()) {
-            case RESOURCE:
-                Resource resource = (Resource) component;
+        case RESOURCE:
+            Resource resource = (Resource) component;
 
-                if (isInstance && componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy) {
-                    toscaMetadata.setType(componentInstance.getOriginType().getDisplayValue());
-                } else {
-                    toscaMetadata.setType(resource.getResourceType().name());
-                }
-                toscaMetadata.setSubcategory(categoryDefinition.getSubcategories().get(0).getName());
-                toscaMetadata.setResourceVendor(resource.getVendorName());
-                toscaMetadata.setResourceVendorRelease(resource.getVendorRelease());
-                toscaMetadata.setResourceVendorModelNumber(resource.getResourceVendorModelNumber());
-                break;
-            case SERVICE:
-                Service service = (Service) component;
-                toscaMetadata.setType(component.getComponentType().getValue());
-                toscaMetadata.setServiceType(service.getServiceType());
-                toscaMetadata.setServiceRole(service.getServiceRole());
-                toscaMetadata.setEnvironmentContext(service.getEnvironmentContext());
-                if (!isInstance) {
-                    // DE268546
-                    toscaMetadata.setServiceEcompNaming(((Service) component).isEcompGeneratedNaming());
-                    toscaMetadata.setEcompGeneratedNaming(((Service) component).isEcompGeneratedNaming());
-                    toscaMetadata.setNamingPolicy(((Service) component).getNamingPolicy());
-                }
-                break;
-            default:
-                log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
+            if (isInstance && componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy) {
+                toscaMetadata.setType(componentInstance.getOriginType().getDisplayValue());
+            } else {
+                toscaMetadata.setType(resource.getResourceType().name());
+            }
+            toscaMetadata.setSubcategory(categoryDefinition.getSubcategories().get(0).getName());
+            toscaMetadata.setResourceVendor(resource.getVendorName());
+            toscaMetadata.setResourceVendorRelease(resource.getVendorRelease());
+            toscaMetadata.setResourceVendorModelNumber(resource.getResourceVendorModelNumber());
+            break;
+        case SERVICE:
+            Service service = (Service) component;
+            toscaMetadata.setType(component.getComponentType().getValue());
+            toscaMetadata.setServiceType(service.getServiceType());
+            toscaMetadata.setServiceRole(service.getServiceRole());
+            toscaMetadata.setEnvironmentContext(service.getEnvironmentContext());
+            resolveInstantiationTypeAndSetItToToscaMetaData(toscaMetadata, service);
+            if (!isInstance) {
+                // DE268546
+                toscaMetadata.setServiceEcompNaming(((Service) component).isEcompGeneratedNaming());
+                toscaMetadata.setEcompGeneratedNaming(((Service) component).isEcompGeneratedNaming());
+                toscaMetadata.setNamingPolicy(((Service) component).getNamingPolicy());
+            }
+            break;
+        default:
+            log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
         }
         return toscaMetadata;
     }
 
+      private void resolveInstantiationTypeAndSetItToToscaMetaData(ToscaMetadata toscaMetadata, Service service) {
+            if (service.getInstantiationType() != null) {
+                        toscaMetadata.setInstantiationType(service.getInstantiationType());
+            }
+            else {
+                        toscaMetadata.setInstantiationType(StringUtils.EMPTY);
+            }
+      }
+
     private Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> fillImports(Component component,
             ToscaTemplate toscaTemplate) {
 
@@ -437,9 +432,8 @@ public class ToscaExportHandler {
             List<ComponentInstance> componentInstances = component.getComponentInstances();
             if (componentInstances != null && !componentInstances.isEmpty()) {
 
-                List<Map<String, Map<String, String>>> additionalImports =
-                        toscaTemplate.getImports() == null ? new ArrayList<>(DEFAULT_IMPORTS) :
-                                new ArrayList<>(toscaTemplate.getImports());
+                List<Map<String, Map<String, String>>> additionalImports = toscaTemplate.getImports() == null
+                        ? new ArrayList<>(DEFAULT_IMPORTS) : new ArrayList<>(toscaTemplate.getImports());
 
                 List<Triple<String, String, Component>> dependecies = new ArrayList<>();
 
@@ -464,7 +458,7 @@ public class ToscaExportHandler {
         } else {
             log.debug("currently imports supported for VF and service only");
         }
-        return Either.left(new ImmutablePair<ToscaTemplate, Map<String, Component>>(toscaTemplate, componentCache));
+        return Either.left(new ImmutablePair<>(toscaTemplate, componentCache));
     }
 
     private void createDependency(Map<String, Component> componentCache, List<Map<String, Map<String, String>>> imports,
@@ -476,23 +470,21 @@ public class ToscaExportHandler {
         Component componentRI = componentCache.get(ci.getComponentUid());
         if (componentRI == null) {
             // all resource must be only once!
-            Either<Component, StorageOperationStatus> resource =
-                    toscaOperationFacade.getToscaFullElement(ci.getComponentUid());
+            Either<Component, StorageOperationStatus> resource = toscaOperationFacade
+                    .getToscaFullElement(ci.getComponentUid());
             if ((resource.isRight()) && (log.isDebugEnabled())) {
-                log.debug("Failed to fetch resource with id {} for instance {}", ci.getComponentUid(),
-                        ci.getUniqueId());
-                return;
+                log.debug("Failed to fetch resource with id {} for instance {}",ci.getComponentUid() ,ci.getUniqueId());
+                return ;
             }
 
             Component fetchedComponent = resource.left().value();
             componentCache.put(fetchedComponent.getUniqueId(), fetchedComponent);
 
-            if (ci.getOriginType() == OriginTypeEnum.ServiceProxy) {
-                Either<Component, StorageOperationStatus> sourceService =
-                        toscaOperationFacade.getToscaFullElement(ci.getSourceModelUid());
+            if (ci.getOriginType() == OriginTypeEnum.ServiceProxy){
+                Either<Component, StorageOperationStatus> sourceService = toscaOperationFacade
+                        .getToscaFullElement(ci.getSourceModelUid());
                 if (sourceService.isRight() && (log.isDebugEnabled())) {
-                    log.debug("Failed to fetch source service with id {} for proxy {}", ci.getSourceModelUid(),
-                            ci.getUniqueId());
+                    log.debug("Failed to fetch source service with id {} for proxy {}", ci.getSourceModelUid(), ci.getUniqueId());
                 }
                 Component fetchedSource = sourceService.left().value();
                 componentCache.put(fetchedSource.getUniqueId(), fetchedSource);
@@ -511,9 +503,8 @@ public class ToscaExportHandler {
                 keyNameBuilder.append(ci.getComponentName());
                 importsListMember.put(keyNameBuilder.toString(), files);
                 imports.add(importsListMember);
-                dependecies
-                        .add(new ImmutableTriple<String, String, Component>(artifactName, artifactDefinition.getEsId(),
-                                fetchedComponent));
+                dependecies.add(new ImmutableTriple<>(artifactName,
+                        artifactDefinition.getEsId(), fetchedComponent));
 
                 if (!ModelConverter.isAtomicComponent(componentRI)) {
                     importsListMember = new HashMap<>();
@@ -531,7 +522,7 @@ public class ToscaExportHandler {
         return artifactName.substring(0, artifactName.lastIndexOf('.')) + ToscaExportHandler.TOSCA_INTERFACE_NAME;
     }
 
-    private Either<ToscaTemplate, ToscaError> convertNodeType(Component component, ToscaTemplate toscaNode,
+    private Either<ToscaTemplate, ToscaError> convertNodeType(Map<String, Component> componentsCache, Component component, ToscaTemplate toscaNode,
             Map<String, ToscaNodeType> nodeTypes) {
         log.debug("start convert node type for {}", component.getUniqueId());
         ToscaNodeType toscaNodeType = createNodeType(component);
@@ -543,8 +534,8 @@ public class ToscaExportHandler {
         }
 
         Map<String, DataTypeDefinition> dataTypes = dataTypesEither.left().value();
-        Either<ToscaNodeType, ToscaError> properties =
-                propertyConvertor.convertProperties(component, toscaNodeType, dataTypes);
+        Either<ToscaNodeType, ToscaError> properties = propertyConvertor.convertProperties(component, toscaNodeType,
+                dataTypes);
         if (properties.isRight()) {
             return Either.right(properties.right().value());
         }
@@ -552,15 +543,13 @@ public class ToscaExportHandler {
         log.debug("Properties converted for {}", component.getUniqueId());
 
         // Extracted to method for code reuse
-        return convertReqCapAndTypeName(component, toscaNode, nodeTypes, toscaNodeType, dataTypes);
+        return convertReqCapAndTypeName(componentsCache, component, toscaNode, nodeTypes, toscaNodeType, dataTypes);
     }
 
-    private Either<ToscaTemplate, ToscaError> convertInterfaceNodeType(Component component, ToscaTemplate toscaNode,
+    private Either<ToscaTemplate, ToscaError> convertInterfaceNodeType(Map<String, Component> componentsCache, Component component, ToscaTemplate toscaNode,
             Map<String, ToscaNodeType> nodeTypes) {
         log.debug("start convert node type for {}", component.getUniqueId());
-
-
-        toscaNode.setInterface_types(addInterfaceTypeElement(component));
+        ToscaNodeType toscaNodeType = createNodeType(component);
 
         Either<Map<String, DataTypeDefinition>, TitanOperationStatus> dataTypesEither = dataTypeCache.getAll();
         if (dataTypesEither.isRight()) {
@@ -572,7 +561,7 @@ public class ToscaExportHandler {
 
         List<InputDefinition> inputDef = component.getInputs();
         Map<String, ToscaProperty> inputs = new HashMap<>();
-        ToscaNodeType toscaNodeType = createNodeType(component);
+
         if (inputDef != null) {
             inputDef.forEach(i -> {
                 ToscaProperty property = propertyConvertor.convertProperty(dataTypes, i, false);
@@ -583,25 +572,21 @@ public class ToscaExportHandler {
                 addInterfaceDefinitionElement(component, toscaNodeType);
             }
         }
-
-
-
-        // Extracted to method for code reuse
-        return convertReqCapAndTypeName(component, toscaNode, nodeTypes, toscaNodeType, dataTypes);
+        return convertReqCapAndTypeName(componentsCache, component, toscaNode, nodeTypes, toscaNodeType, dataTypes);
     }
 
-    private Either<ToscaTemplate, ToscaError> convertReqCapAndTypeName(Component component, ToscaTemplate toscaNode,
+    private Either<ToscaTemplate, ToscaError> convertReqCapAndTypeName(Map<String, Component> componentsCache, Component component, ToscaTemplate toscaNode,
             Map<String, ToscaNodeType> nodeTypes, ToscaNodeType toscaNodeType,
             Map<String, DataTypeDefinition> dataTypes) {
-        Either<ToscaNodeType, ToscaError> capabilities = convertCapabilities(component, toscaNodeType, dataTypes);
+        Either<ToscaNodeType, ToscaError> capabilities = convertCapabilities(componentsCache, component, toscaNodeType, dataTypes);
         if (capabilities.isRight()) {
             return Either.right(capabilities.right().value());
         }
         toscaNodeType = capabilities.left().value();
         log.debug("Capabilities converted for {}", component.getUniqueId());
 
-        Either<ToscaNodeType, ToscaError> requirements =
-                capabiltyRequirementConvertor.convertRequirements(component, toscaNodeType);
+        Either<ToscaNodeType, ToscaError> requirements = capabilityRequirementConverter.convertRequirements(componentsCache, component,
+                toscaNodeType);
         if (requirements.isRight()) {
             return Either.right(requirements.right().value());
         }
@@ -610,18 +595,17 @@ public class ToscaExportHandler {
 
         String toscaResourceName;
         switch (component.getComponentType()) {
-            case RESOURCE:
-                toscaResourceName = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition()
-                                                                               .getMetadataDataDefinition())
-                                            .getToscaResourceName();
-                break;
-            case SERVICE:
-                toscaResourceName = SERVICE_NODE_TYPE_PREFIX + component.getComponentMetadataDefinition()
-                                                                        .getMetadataDataDefinition().getSystemName();
-                break;
-            default:
-                log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
-                return Either.right(ToscaError.NOT_SUPPORTED_TOSCA_TYPE);
+        case RESOURCE:
+            toscaResourceName = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition()
+                    .getMetadataDataDefinition()).getToscaResourceName();
+            break;
+        case SERVICE:
+            toscaResourceName = SERVICE_NODE_TYPE_PREFIX
+                    + component.getComponentMetadataDefinition().getMetadataDataDefinition().getSystemName();
+            break;
+        default:
+            log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
+            return Either.right(ToscaError.NOT_SUPPORTED_TOSCA_TYPE);
         }
 
         nodeTypes.put(toscaResourceName, toscaNodeType);
@@ -647,16 +631,15 @@ public class ToscaExportHandler {
             ToscaNodeTemplate nodeTemplate = new ToscaNodeTemplate();
             nodeTemplate.setType(componentInstance.getToscaComponentName());
 
-            Either<Component, Boolean> originComponentRes =
-                    capabiltyRequirementConvertor.getOriginComponent(componentCache, componentInstance);
+            Either<Component, Boolean> originComponentRes = capabilityRequirementConverter
+                    .getOriginComponent(componentCache, componentInstance);
             if (originComponentRes.isRight()) {
                 convertNodeTemplatesRes = Either.right(ToscaError.NODE_TYPE_REQUIREMENT_ERROR);
                 break;
             }
-            Either<ToscaNodeTemplate, ToscaError> requirements =
-                    convertComponentInstanceRequirements(component, componentInstance,
-                            component.getComponentInstancesRelations(), nodeTemplate, originComponentRes.left().value(),
-                            componentCache);
+            Either<ToscaNodeTemplate, ToscaError> requirements = convertComponentInstanceRequirements(component,
+                    componentInstance, component.getComponentInstancesRelations(), nodeTemplate,
+                    originComponentRes.left().value(), componentCache);
             if (requirements.isRight()) {
                 convertNodeTemplatesRes = Either.right(requirements.right().value());
                 break;
@@ -668,17 +651,15 @@ public class ToscaExportHandler {
 
             Component originalComponent = componentCache.get(componentInstance.getActualComponentUid());
 
-            if (componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy) {
+            if (componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy){
                 Component componentOfProxy = componentCache.get(componentInstance.getComponentUid());
                 nodeTemplate.setMetadata(convertMetadata(componentOfProxy, true, componentInstance));
             } else {
                 nodeTemplate.setMetadata(convertMetadata(originalComponent, true, componentInstance));
             }
 
-            Either<ToscaNodeTemplate, ToscaError> capabilities = capabiltyRequirementConvertor
-                                                                         .convertComponentInstanceCapabilties(
-                                                                                 componentInstance, dataTypes,
-                                                                                 nodeTemplate);
+            Either<ToscaNodeTemplate, ToscaError> capabilities = capabilityRequirementConverter
+                    .convertComponentInstanceCapabilities(componentInstance, dataTypes, nodeTemplate);
             if (capabilities.isRight()) {
                 convertNodeTemplatesRes = Either.right(capabilities.right().value());
                 break;
@@ -690,19 +671,19 @@ public class ToscaExportHandler {
 
             if (originalComponent.getComponentType() == ComponentTypeEnum.RESOURCE) {
                 // Adds the properties of parent component to map
-                addPropertiesOfParentComponent(dataTypes, componentInstance, originalComponent, props);
+                addPropertiesOfParentComponent(dataTypes, originalComponent, props);
             }
 
             if (null != componentInstancesProperties && componentInstancesProperties.containsKey(instanceUniqueId)) {
-                addPropertiesOfComponentInstance(componentInstancesProperties, dataTypes, componentInstance,
+                addPropertiesOfComponentInstance(componentInstancesProperties, dataTypes,
                         instanceUniqueId, props);
             }
 
             if (componentInstancesInputs != null && componentInstancesInputs.containsKey(instanceUniqueId)) {
-                addComponentInstanceInputs(dataTypes, componentInstancesInputs, componentInstance, instanceUniqueId,
+                addComponentInstanceInputs(dataTypes, componentInstancesInputs, instanceUniqueId,
                         props);
             }
-            if (props != null && !props.isEmpty()) {
+            if (!props.isEmpty()) {
                 nodeTemplate.setProperties(props);
             }
 
@@ -720,7 +701,7 @@ public class ToscaExportHandler {
                     }
 
                     if (addToTosca) {
-                        ToscaGroupTemplate toscaGroup = convertGroupInstance(groupInst);
+                        ToscaGroupTemplate toscaGroup = groupExportParser.getToscaGroupTemplate(groupInst, componentInstance.getInvariantName());
                         groupsMap.put(groupInst.getName(), toscaGroup);
                     }
                 }
@@ -732,13 +713,10 @@ public class ToscaExportHandler {
             log.debug("instance groups added");
             topologyTemplate.addGroups(groupsMap);
         }
-        if (component.getComponentType() == ComponentTypeEnum.SERVICE && MapUtils.isNotEmpty(
-                ((Service) component).getForwardingPaths())) {
+        if (component.getComponentType() == ComponentTypeEnum.SERVICE && isNotEmpty(((Service) component).getForwardingPaths())) {
             log.debug("Starting converting paths for component {}, name {}", component.getUniqueId(),
                     component.getName());
-            ForwardingPathToscaUtil
-                    .addForwardingPaths((Service) component, nodeTemplates, capabiltyRequirementConvertor,
-                            componentCache, toscaOperationFacade);
+            ForwardingPathToscaUtil.addForwardingPaths((Service) component, nodeTemplates, capabilityRequirementConverter, componentCache, toscaOperationFacade);
             log.debug("Finished converting paths for component {}, name {}", component.getUniqueId(),
                     component.getName());
         }
@@ -751,215 +729,76 @@ public class ToscaExportHandler {
     }
 
     private void addComponentInstanceInputs(Map<String, DataTypeDefinition> dataTypes,
-            Map<String, List<ComponentInstanceInput>> componentInstancesInputs, ComponentInstance componentInstance,
-            String instanceUniqueId, Map<String, Object> props) {
+                                            Map<String, List<ComponentInstanceInput>> componentInstancesInputs,
+                                            String instanceUniqueId, Map<String, Object> props) {
 
         List<ComponentInstanceInput> instanceInputsList = componentInstancesInputs.get(instanceUniqueId);
         if (instanceInputsList != null) {
             instanceInputsList.forEach(input -> {
 
-                Supplier<String> supplier =
-                        () -> input.getValue() != null && !input.getValue().isEmpty() ? input.getValue() :
-                                      input.getDefaultValue();
-                convertAndAddValue(dataTypes, componentInstance, props, input, supplier);
+                Supplier<String> supplier = () -> input.getValue() != null && !input.getValue().isEmpty()
+                        ? input.getValue() : input.getDefaultValue();
+                        propertyConvertor.convertAndAddValue(dataTypes, props, input, supplier);
             });
         }
     }
 
     private void addPropertiesOfComponentInstance(
             Map<String, List<ComponentInstanceProperty>> componentInstancesProperties,
-            Map<String, DataTypeDefinition> dataTypes, ComponentInstance componentInstance, String instanceUniqueId,
+            Map<String, DataTypeDefinition> dataTypes, String instanceUniqueId,
             Map<String, Object> props) {
 
-        if (!MapUtils.isEmpty(componentInstancesProperties)) {
-            componentInstancesProperties.get(instanceUniqueId).stream()
-                                        // Collects filtered properties to List
-                                        .collect(Collectors.toList()).stream()
-                                        // Converts and adds each value to property map
-                                        .forEach(prop -> convertAndAddValue(dataTypes, componentInstance, props, prop,
-                                                () -> prop.getValue()));
+        if (isNotEmpty(componentInstancesProperties)) {
+            componentInstancesProperties.get(instanceUniqueId)
+                    // Converts and adds each value to property map
+                    .forEach(prop -> propertyConvertor.convertAndAddValue(dataTypes, props, prop,
+                            prop::getValue));
         }
     }
 
     private void addPropertiesOfParentComponent(Map<String, DataTypeDefinition> dataTypes,
-            ComponentInstance componentInstance, Component componentOfInstance, Map<String, Object> props) {
+                                                Component componentOfInstance, Map<String, Object> props) {
 
         List<PropertyDefinition> componentProperties = ((Resource) componentOfInstance).getProperties();
-        if (!CollectionUtils.isEmpty(componentProperties)) {
+        if (isNotEmpty(componentProperties)) {
             componentProperties.stream()
-                               // Filters out properties with empty default values
-                               .filter(prop -> !StringUtils.isEmpty(prop.getDefaultValue()))
-                               // Collects filtered properties to List
-                               .collect(Collectors.toList()).stream()
-                               // Converts and adds each value to property map
-                               .forEach(prop -> convertAndAddValue(dataTypes, componentInstance, props, prop,
-                                       () -> prop.getDefaultValue()));
-        }
-    }
-
-    /**
-     * @param dataTypes
-     * @param componentInstance
-     * @param props
-     * @param prop
-     * @param supplier
-     */
-    private void convertAndAddValue(Map<String, DataTypeDefinition> dataTypes, ComponentInstance componentInstance,
-            Map<String, Object> props, PropertyDefinition prop, Supplier<String> supplier) {
-        Object convertedValue = convertValue(dataTypes, componentInstance, prop, supplier);
-        if (!ToscaValueBaseConverter.isEmptyObjectValue(convertedValue)) {
-            props.put(prop.getName(), convertedValue);
+                    // Filters out properties with empty default values
+                    .filter(prop -> isNotEmpty(prop.getDefaultValue()))
+                    // Converts and adds each value to property map
+                    .forEach(prop -> propertyConvertor.convertAndAddValue(dataTypes, props, prop,
+                            prop::getDefaultValue));
         }
     }
 
-    private <T extends PropertyDefinition> Object convertValue(Map<String, DataTypeDefinition> dataTypes,
-            ComponentInstance componentInstance, T input, Supplier<String> supplier) {
-        log.debug("Convert property or input value {} for instance {}", input.getName(),
-                componentInstance.getUniqueId());
-        String propertyType = input.getType();
-        String innerType = null;
-        if (input.getSchema() != null && input.getSchema().getProperty() != null) {
-            innerType = input.getSchema().getProperty().getType();
-        }
-        return propertyConvertor.convertToToscaObject(propertyType, supplier.get(), innerType, dataTypes);
-    }
-
-    private ToscaGroupTemplate convertGroup(GroupDefinition group) {
-        ToscaGroupTemplate toscaGroup = new ToscaGroupTemplate();
-        Map<String, String> members = group.getMembers();
-        if (members != null) {
-            toscaGroup.setMembers(new ArrayList<String>(members.keySet()));
-        }
-
-        Supplier<String> supplGroupType = () -> group.getType();
-        Supplier<String> supplDescription = () -> group.getDescription();
-        Supplier<List<? extends GroupProperty>> supplProperties = () -> group.convertToGroupProperties();
-        Supplier<String> supplgroupName = () -> group.getName();
-        Supplier<String> supplInvariantUUID = () -> group.getInvariantUUID();
-        Supplier<String> supplGroupUUID = () -> group.getGroupUUID();
-        Supplier<String> supplVersion = () -> group.getVersion();
-
-        IToscaMetadata toscaMetadata =
-                fillGroup(toscaGroup, supplProperties, supplDescription, supplgroupName, supplInvariantUUID,
-                        supplGroupUUID, supplVersion, supplGroupType);
-        toscaGroup.setMetadata(toscaMetadata);
-        return toscaGroup;
-    }
-
-    private ToscaGroupTemplate convertGroupInstance(GroupInstance groupInstance) {
-        ToscaGroupTemplate toscaGroup = new ToscaGroupTemplate();
-
-        Supplier<String> supplGroupType = () -> groupInstance.getType();
-        Supplier<String> supplDescription = () -> groupInstance.getDescription();
-        Supplier<List<? extends GroupProperty>> supplProperties =
-                () -> groupInstance.convertToGroupInstancesProperties();
-        Supplier<String> supplgroupName = () -> groupInstance.getGroupName();
-        Supplier<String> supplInvariantUUID = () -> groupInstance.getInvariantUUID();
-        Supplier<String> supplGroupUUID = () -> groupInstance.getGroupUUID();
-        Supplier<String> supplVersion = () -> groupInstance.getVersion();
-
-        IToscaMetadata toscaMetadata =
-                fillGroup(toscaGroup, supplProperties, supplDescription, supplgroupName, supplInvariantUUID,
-                        supplGroupUUID, supplVersion, supplGroupType);
-
-        toscaMetadata.setCustomizationUUID(groupInstance.getCustomizationUUID());
-        toscaGroup.setMetadata(toscaMetadata);
-        return toscaGroup;
-    }
-
-    private IToscaMetadata fillGroup(ToscaGroupTemplate toscaGroup, Supplier<List<? extends GroupProperty>> props,
-            Supplier<String> description, Supplier<String> groupName, Supplier<String> invariantUUID,
-            Supplier<String> groupUUID, Supplier<String> version, Supplier<String> groupType) {
-        boolean isVfModule = groupType.get().equals(Constants.DEFAULT_GROUP_VF_MODULE) ? true : false;
-        toscaGroup.setType(groupType.get());
-
-        IToscaMetadata toscaMetadata;
-        if (!isVfModule) {
-            toscaMetadata = new ToscaMetadata();
-        } else {
-            toscaMetadata = new VfModuleToscaMetadata();
-
-            Map<String, Object> properties = fillGroupProperties(props.get());
-            if (!properties.containsKey(VF_MODULE_DESC_KEY) || StringUtils.isEmpty(
-                    (String) properties.get(VF_MODULE_DESC_KEY))) {
-                properties.put(VF_MODULE_DESC_KEY, description.get());
-            }
-            toscaGroup.setProperties(properties);
-        }
-        toscaMetadata.setName(groupName.get());
-        toscaMetadata.setInvariantUUID(invariantUUID.get());
-        toscaMetadata.setUUID(groupUUID.get());
-        toscaMetadata.setVersion(version.get());
-        return toscaMetadata;
-    }
-
-    private Map<String, Object> fillGroupProperties(List<? extends GroupProperty> groupProps) {
-        Map<String, Object> properties = new HashMap<>();
-        if (groupProps != null) {
-            for (GroupProperty gp : groupProps) {
-                if (gp.getName().equals(Constants.IS_BASE)) {
-                    Boolean isBase = Boolean.parseBoolean(gp.getValue());
-                    String type = isBase ? VF_MODULE_TYPE_BASE : VF_MODULE_TYPE_EXPANSION;
-                    properties.put(VF_MODULE_TYPE_KEY, type);
-                } else {
-                    Object value = null;
-                    String type = gp.getType();
-
-                    switch (type) {
-                        case "integer":
-                            if (gp.getValue() != null) {
-                                value = Integer.valueOf(gp.getValue());
-                            }
-                            break;
-                        case "boolean":
-                            if (gp.getValue() != null) {
-                                value = Boolean.valueOf(gp.getValue());
-                            }
-                            break;
-
-                        default:
-                            value = gp.getValue();
-                            break;
-                    }
-                    properties.put(gp.getName(), value);
-                }
-            }
-        }
-        return properties;
-    }
-
     private ToscaNodeType createNodeType(Component component) {
         ToscaNodeType toscaNodeType = new ToscaNodeType();
         if (ModelConverter.isAtomicComponent(component)) {
             if (((Resource) component).getDerivedFrom() != null) {
                 toscaNodeType.setDerived_from(((Resource) component).getDerivedFrom().get(0));
             }
-            toscaNodeType.setDescription(component.getDescription()); // or
-            // name??
+            toscaNodeType.setDescription(component.getDescription());
         } else {
-            String derivedFrom = null != component.getDerivedFromGenericType() ? component.getDerivedFromGenericType() :
-                                         "tosca.nodes.Root";
+            String derivedFrom = null != component.getDerivedFromGenericType() ? component.getDerivedFromGenericType()
+                    : "tosca.nodes.Root";
             toscaNodeType.setDerived_from(derivedFrom);
         }
         return toscaNodeType;
     }
 
-    private Either<Map<String, ToscaNodeType>, ToscaError> createProxyNodeTypes(Map<String, Component> componentCache,
-            Component container) {
+    private Either<Map<String, ToscaNodeType>, ToscaError> createProxyNodeTypes(Map<String, Component> componentCache ,Component container  ) {
 
-        Map<String, ToscaNodeType> nodeTypesMap = null;
+        Map<String, ToscaNodeType> nodeTypesMap = new HashMap<>();
         Either<Map<String, ToscaNodeType>, ToscaError> res = Either.left(nodeTypesMap);
 
-        List<ComponentInstance> componetInstances = container.getComponentInstances();
+        List<ComponentInstance> componentInstances = container.getComponentInstances();
 
-        if (componetInstances == null || componetInstances.isEmpty()) {
+        if (componentInstances == null || componentInstances.isEmpty()) {
             return res;
         }
         Map<String, ComponentInstance> serviceProxyInstanceList = new HashMap<>();
-        List<ComponentInstance> proxyInst = componetInstances.stream().filter(p -> p.getOriginType().name()
-                                                                                    .equals(OriginTypeEnum.ServiceProxy
-                                                                                                    .name()))
-                                                             .collect(Collectors.toList());
+        List<ComponentInstance> proxyInst = componentInstances.stream()
+                .filter(p -> p.getOriginType().name().equals(OriginTypeEnum.ServiceProxy.name()))
+                .collect(Collectors.toList());
         if (proxyInst != null && !proxyInst.isEmpty()) {
             for (ComponentInstance inst : proxyInst) {
                 serviceProxyInstanceList.put(inst.getToscaComponentName(), inst);
@@ -972,8 +811,8 @@ public class ToscaExportHandler {
         ComponentParametersView filter = new ComponentParametersView(true);
         filter.setIgnoreCapabilities(false);
         filter.setIgnoreComponentInstances(false);
-        Either<Resource, StorageOperationStatus> serviceProxyOrigin =
-                toscaOperationFacade.getLatestByName("serviceProxy");
+        Either<Resource, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade
+                .getLatestByName("serviceProxy");
         if (serviceProxyOrigin.isRight()) {
             log.debug("Failed to fetch normative service proxy resource by tosca name, error {}",
                     serviceProxyOrigin.right().value());
@@ -981,30 +820,28 @@ public class ToscaExportHandler {
         }
         Component origComponent = serviceProxyOrigin.left().value();
 
-        nodeTypesMap = new HashMap<>();
         for (Entry<String, ComponentInstance> entryProxy : serviceProxyInstanceList.entrySet()) {
             Component serviceComponent = null;
             ComponentParametersView componentParametersView = new ComponentParametersView();
             componentParametersView.disableAll();
             componentParametersView.setIgnoreCategories(false);
-            Either<Component, StorageOperationStatus> service = toscaOperationFacade.getToscaElement(
-                    entryProxy.getValue().getSourceModelUid(), componentParametersView);
+            Either<Component, StorageOperationStatus> service = toscaOperationFacade
+                    .getToscaElement(entryProxy.getValue().getSourceModelUid(), componentParametersView);
             if (service.isRight()) {
-                log.debug("Failed to fetch resource with id {} for instance {}");
+                log.debug("Failed to fetch resource with id {} for instance {}", entryProxy.getValue().getSourceModelUid(),  entryProxy.getValue().getName());
             } else {
                 serviceComponent = service.left().value();
             }
 
-            ToscaNodeType toscaNodeType =
-                    createProxyNodeType(componentCache, origComponent, serviceComponent, entryProxy.getValue());
+            ToscaNodeType toscaNodeType = createProxyNodeType(componentCache , origComponent, serviceComponent, entryProxy.getValue());
             nodeTypesMap.put(entryProxy.getKey(), toscaNodeType);
         }
 
         return Either.left(nodeTypesMap);
     }
 
-    private ToscaNodeType createProxyNodeType(Map<String, Component> componentCache, Component origComponent,
-            Component proxyComponent, ComponentInstance instance) {
+    private ToscaNodeType createProxyNodeType(Map<String, Component> componentCache , Component origComponent, Component proxyComponent,
+            ComponentInstance instance) {
         ToscaNodeType toscaNodeType = new ToscaNodeType();
         String derivedFrom = ((Resource) origComponent).getToscaResourceName();
 
@@ -1014,9 +851,8 @@ public class ToscaExportHandler {
             log.debug("Failed to retrieve all data types {}", dataTypesEither.right().value());
         }
         Map<String, DataTypeDefinition> dataTypes = dataTypesEither.left().value();
-        Map<String, ToscaCapability> capabilities = this.capabiltyRequirementConvertor
-                                                            .convertProxyCapabilities(componentCache, origComponent,
-                                                                    proxyComponent, instance, dataTypes);
+        Map<String, ToscaCapability> capabilities = this.capabilityRequirementConverter
+                .convertProxyCapabilities( componentCache ,origComponent, proxyComponent, instance, dataTypes);
 
         toscaNodeType.setCapabilities(capabilities);
 
@@ -1028,8 +864,7 @@ public class ToscaExportHandler {
             ToscaNodeTemplate nodeTypeTemplate, Component originComponent, Map<String, Component> componentCache) {
 
         List<Map<String, ToscaTemplateRequirement>> toscaRequirements = new ArrayList<>();
-        if (!addRequirements(component, componentInstance, relations, originComponent, toscaRequirements,
-                componentCache)) {
+        if (!addRequirements(component, componentInstance, relations, originComponent, toscaRequirements, componentCache)) {
             log.debug("Failed to convert component instance requirements for the component instance {}. ",
                     componentInstance.getName());
             return Either.right(ToscaError.NODE_TYPE_REQUIREMENT_ERROR);
@@ -1044,17 +879,11 @@ public class ToscaExportHandler {
     private boolean addRequirements(Component component, ComponentInstance componentInstance,
             List<RequirementCapabilityRelDef> relations, Component originComponent,
             List<Map<String, ToscaTemplateRequirement>> toscaRequirements, Map<String, Component> componentCache) {
-        boolean result;
-        List<RequirementCapabilityRelDef> filteredRelations =
-                relations.stream().filter(p -> componentInstance.getUniqueId().equals(p.getFromNode()))
-                         .collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(filteredRelations)) {
-            result = true;
-        } else {
-            result = !filteredRelations.stream().filter(rel -> !addRequirement(componentInstance, originComponent,
-                    component.getComponentInstances(), rel, toscaRequirements, componentCache)).findFirst().isPresent();
-        }
-        return result;
+        List<RequirementCapabilityRelDef> filteredRelations = relations.stream()
+                .filter(p -> componentInstance.getUniqueId().equals(p.getFromNode())).collect(Collectors.toList());
+        return isEmpty(filteredRelations) ||
+                filteredRelations.stream()
+                        .allMatch(rel -> addRequirement(componentInstance, originComponent, component.getComponentInstances(), rel, toscaRequirements, componentCache));
     }
 
     private boolean addRequirement(ComponentInstance fromInstance, Component fromOriginComponent,
@@ -1065,12 +894,12 @@ public class ToscaExportHandler {
         Map<String, List<RequirementDefinition>> reqMap = fromOriginComponent.getRequirements();
         RelationshipInfo reqAndRelationshipPair = rel.getRelationships().get(0).getRelation();
         Either<Component, StorageOperationStatus> getOriginRes = null;
-        Optional<RequirementDefinition> reqOpt = null;
+        Optional<RequirementDefinition> reqOpt = Optional.empty();
         Component toOriginComponent = null;
-        Optional<CapabilityDefinition> cap = null;
+        Optional<CapabilityDefinition> capOpt = Optional.empty();
 
-        ComponentInstance toInstance =
-                instancesList.stream().filter(i -> rel.getToNode().equals(i.getUniqueId())).findFirst().orElse(null);
+        ComponentInstance toInstance = instancesList.stream().filter(i -> rel.getToNode().equals(i.getUniqueId()))
+                .findFirst().orElse(null);
         if (toInstance == null) {
             log.debug("Failed to find a relation from the node {} to the node {}", fromInstance.getName(),
                     rel.getToNode());
@@ -1088,106 +917,80 @@ public class ToscaExportHandler {
             ComponentParametersView filter = new ComponentParametersView(true);
             filter.setIgnoreComponentInstances(false);
             filter.setIgnoreCapabilities(false);
+            filter.setIgnoreGroups(false);
             getOriginRes = toscaOperationFacade.getToscaElement(toInstance.getActualComponentUid(), filter);
             if (getOriginRes.isRight()) {
-                log.debug(
-                        "Failed to build substituted name for the requirement {}. Failed to get an origin component with uniqueId {}",
+                log.debug("Failed to build substituted name for the requirement {}. Failed to get an origin component with uniqueId {}",
                         reqOpt.get().getName(), toInstance.getActualComponentUid());
                 result = false;
             }
         }
         if (result) {
             toOriginComponent = getOriginRes.left().value();
-            cap = toOriginComponent.getCapabilities().get(reqOpt.get().getCapability()).stream()
-                                   .filter(c -> isCapabilityBelongToRelation(reqAndRelationshipPair, c)).findFirst();
-            if (!cap.isPresent()) {
-                cap = findCapability(reqAndRelationshipPair, toOriginComponent, fromOriginComponent, reqOpt.get(),
-                        fromInstance);
-                if (!cap.isPresent()) {
-                    result = false;
-                    log.debug("Failed to find a capability with name {} on a component with uniqueId {}",
-                            reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
+            capOpt = toOriginComponent.getCapabilities().get(reqOpt.get().getCapability()).stream()
+                    .filter(c -> isCapabilityBelongToRelation(reqAndRelationshipPair, c)).findFirst();
+            if (!capOpt.isPresent()) {
+                capOpt = findCapability(reqAndRelationshipPair, toOriginComponent, fromOriginComponent, reqOpt.get());
+                if(!capOpt.isPresent()){
+                result = false;
+                log.debug("Failed to find a capability with name {} on a component with uniqueId {}",
+                        reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
                 }
             }
         }
         if (result) {
-            result = buildAndAddRequirement(toscaRequirements, fromOriginComponent, toOriginComponent, cap.get(),
+            result = buildAndAddRequirement(toscaRequirements, fromOriginComponent, toOriginComponent, capOpt.get(),
                     reqOpt.get(), reqAndRelationshipPair, toInstance, componentCache);
         }
         return result;
     }
 
-    private boolean isCapabilityBelongToRelation(RelationshipInfo reqAndRelationshipPair,
-            CapabilityDefinition capability) {
-        return capability.getName().equals(reqAndRelationshipPair.getCapability()) && (capability.getOwnerId() != null
-                                                                                               && capability
-                                                                                                          .getOwnerId()
-                                                                                                          .equals(reqAndRelationshipPair
-                                                                                                                          .getCapabilityOwnerId()));
+    private boolean isCapabilityBelongToRelation(RelationshipInfo reqAndRelationshipPair, CapabilityDefinition capability) {
+        return capability.getName().equals(reqAndRelationshipPair.getCapability()) && (capability.getOwnerId() !=null && capability.getOwnerId().equals(reqAndRelationshipPair.getCapabilityOwnerId()));
     }
 
-    private Optional<CapabilityDefinition> findCapability(RelationshipInfo reqAndRelationshipPair,
-            Component toOriginComponent, Component fromOriginComponent, RequirementDefinition requirement,
-            ComponentInstance fromInstance) {
-        Optional<CapabilityDefinition> cap =
-                toOriginComponent.getCapabilities().get(requirement.getCapability()).stream()
-                                 .filter(c -> c.getType().equals(requirement.getCapability())).findFirst();
+    private Optional<CapabilityDefinition> findCapability(RelationshipInfo reqAndRelationshipPair, Component toOriginComponent, Component fromOriginComponent, RequirementDefinition requirement) {
+        Optional<CapabilityDefinition> cap = toOriginComponent.getCapabilities().get(requirement.getCapability()).stream().filter(c -> c.getType().equals(requirement.getCapability())).findFirst();
         if (!cap.isPresent()) {
-            log.debug("Failed to find a capability with name {} on a component with uniqueId {}",
-                    reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
+            log.debug("Failed to find a capability with name {} on a component with uniqueId {}", reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
         }
         return cap;
     }
 
-    private boolean buildAndAddRequirement(List<Map<String, ToscaTemplateRequirement>> toscaRequirements,
-            Component fromOriginComponent, Component toOriginComponent, CapabilityDefinition capability,
-            RequirementDefinition requirement, RelationshipInfo reqAndRelationshipPair, ComponentInstance toInstance,
-            Map<String, Component> componentCache) {
-        boolean result = true;
-        Either<String, Boolean> buildReqNameRes = null;
+    private boolean buildAndAddRequirement(List<Map<String, ToscaTemplateRequirement>> toscaRequirements, Component fromOriginComponent, Component toOriginComponent, CapabilityDefinition capability, RequirementDefinition requirement, RelationshipInfo reqAndRelationshipPair, ComponentInstance toInstance, Map<String, Component> componentCache) {
         List<String> reducedPath = capability.getPath();
-        if (capability.getOwnerId() != null) {
-            reducedPath =
-                    capabiltyRequirementConvertor.getReducedPathByOwner(capability.getPath(), capability.getOwnerId());
+        if(capability.getOwnerId() !=null){
+            reducedPath =   capabilityRequirementConverter.getReducedPathByOwner(capability.getPath() , capability.getOwnerId() );
         }
-        Either<String, Boolean> buildCapNameRes = capabiltyRequirementConvertor
-                                                          .buildSubstitutedName(componentCache, toOriginComponent,
-                                                                  reducedPath, reqAndRelationshipPair.getCapability());
+        Either<String, Boolean> buildCapNameRes = capabilityRequirementConverter.buildSubstitutedName(componentCache,
+                toOriginComponent, reducedPath, reqAndRelationshipPair.getCapability(), capability.getPreviousName());
         if (buildCapNameRes.isRight()) {
             log.debug(
                     "Failed to build a substituted capability name for the capability with name {} on a component with uniqueId {}",
                     reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
-            result = false;
-        }
-        if (result) {
-            buildReqNameRes = capabiltyRequirementConvertor
-                                      .buildSubstitutedName(componentCache, fromOriginComponent, requirement.getPath(),
-                                              reqAndRelationshipPair.getRequirement());
-            if (buildReqNameRes.isRight()) {
-                log.debug(
-                        "Failed to build a substituted requirement name for the requirement with name {} on a component with uniqueId {}",
-                        reqAndRelationshipPair.getRequirement(), fromOriginComponent.getUniqueId());
-                result = false;
-            }
+            return false;
         }
-        if (result) {
-            ToscaTemplateRequirement toscaRequirement = new ToscaTemplateRequirement();
-            Map<String, ToscaTemplateRequirement> toscaReqMap = new HashMap<>();
-            toscaRequirement.setNode(toInstance.getName());
-            toscaRequirement.setCapability(buildCapNameRes.left().value());
-            toscaReqMap.put(buildReqNameRes.left().value(), toscaRequirement);
-            toscaRequirements.add(toscaReqMap);
+        Either<String, Boolean> buildReqNameRes  = capabilityRequirementConverter.buildSubstitutedName(componentCache, fromOriginComponent,
+                requirement.getPath(), reqAndRelationshipPair.getRequirement(), requirement.getPreviousName());
+        if (buildReqNameRes.isRight()) {
+            log.debug(
+                    "Failed to build a substituted requirement name for the requirement with name {} on a component with uniqueId {}",
+                    reqAndRelationshipPair.getRequirement(), fromOriginComponent.getUniqueId());
+            return false;
         }
-        return result;
+        ToscaTemplateRequirement toscaRequirement = new ToscaTemplateRequirement();
+        Map<String, ToscaTemplateRequirement> toscaReqMap = new HashMap<>();
+        toscaRequirement.setNode(toInstance.getName());
+        toscaRequirement.setCapability(buildCapNameRes.left().value());
+        toscaReqMap.put(buildReqNameRes.left().value(), toscaRequirement);
+        toscaRequirements.add(toscaReqMap);
+        return true;
     }
 
-    private Optional<RequirementDefinition> findRequirement(Component fromOriginComponent,
-            Map<String, List<RequirementDefinition>> reqMap, RelationshipInfo reqAndRelationshipPair,
-            String fromInstanceId) {
-        for (List<RequirementDefinition> reqList : reqMap.values()) {
-            Optional<RequirementDefinition> reqOpt = reqList.stream().filter(r -> isRequirementBelongToRelation(
-                    fromOriginComponent, reqAndRelationshipPair, r, fromInstanceId)).findFirst();
-            if (reqOpt.isPresent()) {
+    private Optional<RequirementDefinition> findRequirement(Component fromOriginComponent, Map<String, List<RequirementDefinition>> reqMap, RelationshipInfo reqAndRelationshipPair,  String fromInstanceId) {
+        for(List<RequirementDefinition> reqList: reqMap.values()){
+            Optional<RequirementDefinition> reqOpt = reqList.stream().filter(r -> isRequirementBelongToRelation(fromOriginComponent, reqAndRelationshipPair, r, fromInstanceId)).findFirst();
+            if(reqOpt.isPresent()){
                 return reqOpt;
             }
         }
@@ -1202,43 +1005,35 @@ public class ToscaExportHandler {
      * requirement equals to requirementOwnerId of the relation OR uniqueId of
      * toInstance equals to capabilityOwnerId of the relation
      */
-    private boolean isRequirementBelongToRelation(Component originComponent, RelationshipInfo reqAndRelationshipPair,
-            RequirementDefinition requirement, String fromInstanceId) {
+    private boolean isRequirementBelongToRelation(Component originComponent, RelationshipInfo reqAndRelationshipPair, RequirementDefinition requirement, String fromInstanceId) {
         if (!StringUtils.equals(requirement.getName(), reqAndRelationshipPair.getRequirement())) {
-            log.debug("Failed to find a requirement with name {} and  reqAndRelationshipPair {}", requirement.getName(),
-                    reqAndRelationshipPair.getRequirement());
+            log.debug("Failed to find a requirement with name {} and  reqAndRelationshipPair {}",
+                    requirement.getName(), reqAndRelationshipPair.getRequirement());
             return false;
         }
-        if (!ModelConverter.isAtomicComponent(originComponent)) {
-            return isRequirementBelongToOwner(reqAndRelationshipPair, requirement, fromInstanceId, originComponent);
-        }
-        return true;
+        return ModelConverter.isAtomicComponent(originComponent) ||
+                isRequirementBelongToOwner(reqAndRelationshipPair, requirement, fromInstanceId, originComponent);
     }
 
-    private boolean isRequirementBelongToOwner(RelationshipInfo reqAndRelationshipPair,
-            RequirementDefinition requirement, String fromInstanceId, Component originComponent) {
-        return StringUtils.equals(requirement.getOwnerId(), reqAndRelationshipPair.getRequirementOwnerId()) || (
-                isCvfc(originComponent) && StringUtils.equals(fromInstanceId,
-                        reqAndRelationshipPair.getRequirementOwnerId()));
+    private boolean isRequirementBelongToOwner(RelationshipInfo reqAndRelationshipPair, RequirementDefinition requirement, String fromInstanceId, Component originComponent) {
+        return StringUtils.equals(requirement.getOwnerId(), reqAndRelationshipPair.getRequirementOwnerId()) || (isCvfc(originComponent) && StringUtils.equals(fromInstanceId, reqAndRelationshipPair.getRequirementOwnerId()));
     }
 
     private boolean isCvfc(Component component) {
-        if (component.getComponentType() != ComponentTypeEnum.RESOURCE) {
-            return false;
-        }
-        return ((Resource) component).getResourceType() == ResourceTypeEnum.CVFC;
+        return component.getComponentType() == ComponentTypeEnum.RESOURCE &&
+                ((Resource) component).getResourceType() == ResourceTypeEnum.CVFC;
     }
 
     private Either<SubstitutionMapping, ToscaError> convertCapabilities(Component component,
             SubstitutionMapping substitutionMappings, Map<String, Component> componentCache) {
 
         Either<SubstitutionMapping, ToscaError> result = Either.left(substitutionMappings);
-        Either<Map<String, String[]>, ToscaError> toscaCapabilitiesRes =
-                capabiltyRequirementConvertor.convertSubstitutionMappingCapabilities(componentCache, component);
+        Either<Map<String, String[]>, ToscaError> toscaCapabilitiesRes = capabilityRequirementConverter
+                .convertSubstitutionMappingCapabilities(componentCache, component);
         if (toscaCapabilitiesRes.isRight()) {
             result = Either.right(toscaCapabilitiesRes.right().value());
-            log.error("Failed convert capabilities for the component {}. ", component.getName());
-        } else if (MapUtils.isNotEmpty(toscaCapabilitiesRes.left().value())) {
+            log.debug("Failed convert capabilities for the component {}. ", component.getName());
+        } else if (isNotEmpty(toscaCapabilitiesRes.left().value())) {
             substitutionMappings.setCapabilities(toscaCapabilitiesRes.left().value());
             log.debug("Finish convert capabilities for the component {}. ", component.getName());
         }
@@ -1246,10 +1041,10 @@ public class ToscaExportHandler {
         return result;
     }
 
-    private Either<ToscaNodeType, ToscaError> convertCapabilities(Component component, ToscaNodeType nodeType,
+    private Either<ToscaNodeType, ToscaError> convertCapabilities(Map<String, Component> componentsCache, Component component, ToscaNodeType nodeType,
             Map<String, DataTypeDefinition> dataTypes) {
-        Map<String, ToscaCapability> toscaCapabilities =
-                capabiltyRequirementConvertor.convertCapabilities(component, dataTypes);
+        Map<String, ToscaCapability> toscaCapabilities = capabilityRequirementConverter.convertCapabilities(componentsCache, component,
+                dataTypes);
         if (!toscaCapabilities.isEmpty()) {
             nodeType.setCapabilities(toscaCapabilities);
         }
@@ -1258,8 +1053,7 @@ public class ToscaExportHandler {
         return Either.left(nodeType);
     }
 
-    public static class CustomRepresenter extends Representer {
-
+    private static class CustomRepresenter extends Representer {
         public CustomRepresenter() {
             super();
             // null representer is exceptional and it is stored as an instance
@@ -1280,8 +1074,8 @@ public class ToscaExportHandler {
                 }
                 NodeTuple defaultNode = super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);
 
-                return "_defaultp_".equals(property.getName()) ?
-                               new NodeTuple(representData("default"), defaultNode.getValueNode()) : defaultNode;
+                return "_defaultp_".equals(property.getName())
+                        ? new NodeTuple(representData("default"), defaultNode.getValueNode()) : defaultNode;
             }
         }
 
@@ -1296,7 +1090,6 @@ public class ToscaExportHandler {
         }
 
         private class RepresentNull implements Represent {
-
             @Override
             public Node representData(Object data) {
                 // possible values are here http://yaml.org/type/null.html
@@ -1305,10 +1098,9 @@ public class ToscaExportHandler {
         }
     }
 
-    public static class UnsortedPropertyUtils extends PropertyUtils {
-
+    private static class UnsortedPropertyUtils extends PropertyUtils {
         @Override
-        protected Set<Property> createPropertySet(Class<? extends Object> type, BeanAccess bAccess)
+        protected Set<Property> createPropertySet(Class type, BeanAccess bAccess)
                 throws IntrospectionException {
             Collection<Property> fields = getPropertiesMap(type, BeanAccess.FIELD).values();
             return new LinkedHashSet<>(fields);
@@ -1316,3 +1108,4 @@ public class ToscaExportHandler {
     }
 
 }
+
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java
index 4dc60fc871..49fd91cfed 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaRepresentation.java
@@ -20,11 +20,11 @@
 
 package org.openecomp.sdc.be.tosca;
 
-import java.util.List;
-
 import org.apache.commons.lang3.tuple.Triple;
 import org.openecomp.sdc.be.model.Component;
 
+import java.util.List;
+
 public class ToscaRepresentation {
 
     private String mainYaml;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java
index 5119177477..59dd8d0f00 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaUtils.java
@@ -20,31 +20,31 @@
 
 package org.openecomp.sdc.be.tosca;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import org.apache.commons.lang3.StringUtils;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
 import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElement;
+import org.openecomp.sdc.be.model.jsontitan.datamodel.ToscaElementTypeEnum;
 
+import java.lang.reflect.Field;
+import java.util.*;
 public class ToscaUtils {
 
-    public static boolean isComplexVfc(Component component) {
+    private ToscaUtils() {}
+
+    public static boolean isNotComplexVfc(Component component) {
         if (ComponentTypeEnum.RESOURCE == component.getComponentType()) {
             ResourceTypeEnum resourceType = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition().getMetadataDataDefinition()).getResourceType();
             if (ResourceTypeEnum.CVFC == resourceType) {
-                return true;
+                return false;
             }
         }
-        return false;
+        return true;
     }
 
-    public static Map<String, Object> objectToMap(Object objectToConvert, Class<?> clazz) throws IllegalArgumentException, IllegalAccessException {
+    public static Map<String, Object> objectToMap(Object objectToConvert, Class<?> clazz) throws IllegalAccessException {
         Map<String, Object> map = new HashMap<>();
         List<Field> fields = new ArrayList<>();
 
@@ -57,30 +57,30 @@ public class ToscaUtils {
         return map;
     }
 
-    public static List<Field> getAllFields(List<Field> fields, Class<?> type) {
+    private static List<Field> getAllFields(List<Field> fields, Class<?> type) {
         fields.addAll(Arrays.asList(type.getDeclaredFields()));
-
         if (type.getSuperclass() != null) {
-            fields = getAllFields(fields, type.getSuperclass());
+            return getAllFields(fields, type.getSuperclass());
         }
         return fields;
     }
 
-    public static class SubstituitionEntry{
+    public static class SubstitutionEntry {
 
         private String fullName = "";
         private String sourceName = "";
         private String owner = "";
 
-        public SubstituitionEntry() {}
-
-        public SubstituitionEntry(String fullName, String sourceName, String owner) {
-            if(fullName != null)
+        SubstitutionEntry(String fullName, String sourceName, String owner) {
+            if(fullName != null) {
                 this.fullName = fullName;
-            if(sourceName != null)
+            }
+            if(sourceName != null) {
                 this.sourceName = sourceName;
-            if(owner != null)
+            }
+            if(owner != null) {
                 this.owner = owner;
+            }
         }
 
         public String getFullName() {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaAnnotation.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaAnnotation.java
new file mode 100644
index 0000000000..2b1b792b1e
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaAnnotation.java
@@ -0,0 +1,47 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToscaAnnotation {
+    private String type;
+
+    private Map<String ,Object> properties ;
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    private String description;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+    
+    public void addProperty(String name, Object property){
+        if ( properties == null ){
+            properties = new HashMap<>();
+        }
+        properties.put(name, property);
+    }
+
+    public void setProperties(Map<String, Object> properties) {
+        this.properties = properties;
+    }
+
+    public Map<String, Object> getProperties() {
+        return properties;
+    }
+
+
+
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaGroupTemplate.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaGroupTemplate.java
index 2c5e095b8f..605d41e847 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaGroupTemplate.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaGroupTemplate.java
@@ -25,16 +25,28 @@ import java.util.Map;
 
 public class ToscaGroupTemplate {
     private String type;
-    List<String> members;
+    private List<String> members;
     private IToscaMetadata metadata;
     private Map<String, Object> properties;
+    private Map<String, ToscaTemplateCapability> capabilities;
+    
+    public ToscaGroupTemplate(String type, List<String> members, IToscaMetadata metadata, Map<String, Object> properties, Map<String, ToscaTemplateCapability> capabilities) {
+		this.type = type;
+		this.members = members;
+		this.metadata = metadata;
+		this.properties = properties;
+		this.capabilities = capabilities;
+	}
+    
+    public ToscaGroupTemplate(String type, IToscaMetadata metadata, Map<String, Object> properties) {
+		this.type = type;
+		this.metadata = metadata;
+		this.properties = properties;
+	}
+    
+    
 
-    public ToscaGroupTemplate() {
-        super();
-
-    }
-
-    public String getType() {
+	public String getType() {
         return type;
     }
 
@@ -65,5 +77,13 @@ public class ToscaGroupTemplate {
     public void setProperties(Map<String, Object> properties) {
         this.properties = properties;
     }
+    
+	public Map<String, ToscaTemplateCapability> getCapabilities() {
+		return capabilities;
+	}
+
+	public void setCapabilities(Map<String, ToscaTemplateCapability> capabilities) {
+		this.capabilities = capabilities;
+	}
 
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaInput.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaInput.java
new file mode 100644
index 0000000000..dc82839d42
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaInput.java
@@ -0,0 +1,30 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToscaInput extends ToscaProperty {
+    private  Map<String,ToscaAnnotation> annotations;
+
+    //copy constructor
+    public ToscaInput(ToscaProperty toscaProperty){
+        super(toscaProperty);
+    }
+
+
+    public Map<String, ToscaAnnotation> getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Map<String, ToscaAnnotation> annotations) {
+        this.annotations = annotations;
+    }
+    public void addAnnotation(String name, ToscaAnnotation annotaion){
+        if ( annotations == null ){
+            annotations = new HashMap<>();
+        }
+        annotations.put(name, annotaion);
+
+
+    }
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java
index 69907beaec..426522c6d4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaMetadata.java
@@ -35,6 +35,7 @@ public class ToscaMetadata implements IToscaMetadata {
     private String resourceVendorModelNumber;
     private String serviceType;
     private String serviceRole;
+    private String instantiationType;
     private Boolean serviceEcompNaming;
     private Boolean ecompGeneratedNaming;
     private String namingPolicy;
@@ -138,6 +139,14 @@ public class ToscaMetadata implements IToscaMetadata {
     public String getServiceRole() {
         return serviceRole;
     }
+    
+    public void setInstantiationType(String instantiationType) {
+        this.instantiationType = instantiationType;
+    }
+
+    public String getInstantiationType() {
+        return instantiationType;
+    }
 
     public void setServiceRole(String serviceRole) {
         this.serviceRole = serviceRole;
@@ -208,8 +217,6 @@ public class ToscaMetadata implements IToscaMetadata {
         this.sourceModelUuid = sourceModelUuid;
     }
 
-
-
     public String getEnvironmentContext() {
         return environmentContext;
     }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaPolicyTemplate.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaPolicyTemplate.java
new file mode 100644
index 0000000000..66ba43074f
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaPolicyTemplate.java
@@ -0,0 +1,53 @@
+package org.openecomp.sdc.be.tosca.model;
+
+import java.util.List;
+import java.util.Map;
+
+public class ToscaPolicyTemplate {
+	private String type;
+    private IToscaMetadata metadata;
+    private Map<String, Object> properties;
+    private List<String> targets;
+    
+    public ToscaPolicyTemplate(String type, IToscaMetadata metadata, Map<String, Object> properties, List<String> targets) {
+		this.type = type;
+		this.metadata = metadata;
+		this.properties = properties;
+		this.targets = targets;
+	}
+
+	public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public IToscaMetadata getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(IToscaMetadata metadata) {
+        this.metadata = metadata;
+    }
+
+    public Map<String, Object> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, Object> properties) {
+        this.properties = properties;
+    }
+
+	public List<String> getTargets() {
+		return targets;
+	}
+
+	public void setTargets(List<String> targets) {
+		this.targets = targets;
+	}
+    
+    
+    
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaProperty.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaProperty.java
index fff2cba6ec..812cb4cbe2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaProperty.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaProperty.java
@@ -28,6 +28,16 @@ public class ToscaProperty {
     private String description;
     private Boolean required;
     private EntrySchema entry_schema;
+
+    public ToscaProperty(ToscaProperty toscaProperty) {
+        this.type = toscaProperty.type;
+        this._defaultp_ = toscaProperty._defaultp_;
+        this.description = toscaProperty.description;
+        this.required = toscaProperty.required;
+        this.entry_schema = toscaProperty.entry_schema;
+        this.status = toscaProperty.status;
+    }
+
     private String status;
 
     public EntrySchema getEntry_schema() {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplate.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplate.java
index f13fd1c963..65a6dbf282 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplate.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplate.java
@@ -20,12 +20,12 @@
 
 package org.openecomp.sdc.be.tosca.model;
 
-import java.util.List;
-import java.util.Map;
-
 import org.apache.commons.lang3.tuple.Triple;
 import org.openecomp.sdc.be.model.Component;
 
+import java.util.List;
+import java.util.Map;
+
 public class ToscaTemplate {
 
     private String tosca_definitions_version;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateCapability.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateCapability.java
index 68341079c1..4ec457a6ff 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateCapability.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTemplateCapability.java
@@ -24,15 +24,15 @@ import java.util.List;
 import java.util.Map;
 
 public class ToscaTemplateCapability {
-    private List<String> valid_source_types;
+    private List<String> validSourceTypes;
     private Map<String, Object> properties;
 
-    public List<String> getValid_source_types() {
-        return valid_source_types;
+    public List<String> getValidSourceTypes() {
+        return validSourceTypes;
     }
 
-    public void setValid_source_types(List<String> valid_source_types) {
-        this.valid_source_types = valid_source_types;
+    public void setValidSourceTypes(List<String> validSourceTypes) {
+        this.validSourceTypes = validSourceTypes;
     }
 
     public Map<String, Object> getProperties() {
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTopolgyTemplate.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTopolgyTemplate.java
index 8ef32cb06f..0d62521e59 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTopolgyTemplate.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/model/ToscaTopolgyTemplate.java
@@ -27,6 +27,7 @@ public class ToscaTopolgyTemplate {
     private Map<String, ToscaProperty> inputs;
     private Map<String, ToscaNodeTemplate> node_templates;
     private Map<String, ToscaGroupTemplate> groups;
+    private Map<String, ToscaPolicyTemplate> policies;
     private SubstitutionMapping substitution_mappings;
 
     public Map<String, ToscaNodeTemplate> getNode_templates() {
@@ -64,4 +65,14 @@ public class ToscaTopolgyTemplate {
         this.inputs = inputs;
     }
 
+	public void addPolicies(Map<String, ToscaPolicyTemplate> policiesMap) {
+		if ( this.policies == null ){
+            this.policies = new HashMap<>();
+        }
+        this.policies.putAll(policiesMap);		
+	}
+
+	public Map<String, ToscaPolicyTemplate> getPolicies() {
+		return policies;
+	}
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtil.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtil.java
index eb187e0120..a332e6401a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtil.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/ForwardingPathToscaUtil.java
@@ -1,13 +1,6 @@
 package org.openecomp.sdc.be.tosca.utils;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
+import fj.data.Either;
 import org.apache.commons.collections.MapUtils;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathElementDataDefinition;
@@ -16,11 +9,12 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstance;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.tosca.CapabiltyRequirementConvertor;
+import org.openecomp.sdc.be.tosca.CapabilityRequirementConverter;
 import org.openecomp.sdc.be.tosca.model.ToscaNodeTemplate;
 import org.openecomp.sdc.be.tosca.model.ToscaTemplateRequirement;
 
-import fj.data.Either;
+import java.util.*;
+import java.util.Collection;
 
 /**
  * @author KATYR
@@ -35,7 +29,7 @@ public class ForwardingPathToscaUtil {
     public static final String FORWARDER = "forwarder";
 
     public static void addForwardingPaths(Service service, Map<String, ToscaNodeTemplate>
-            nodeTemplates, CapabiltyRequirementConvertor capabiltyRequirementConvertor, Map<String, Component> originComponents, ToscaOperationFacade toscaOperationFacade) {
+            nodeTemplates, CapabilityRequirementConverter capabiltyRequirementConvertor, Map<String, Component> originComponents, ToscaOperationFacade toscaOperationFacade) {
         for (String forwardingPathName : service.getForwardingPaths().keySet()) {
             ToscaNodeTemplate forwardingPathNodeTemplate =
                     new ToscaNodeTemplate();
@@ -70,7 +64,7 @@ public class ForwardingPathToscaUtil {
     }
 
     private static List<Map<String, ToscaTemplateRequirement>> convertPathElementsToRequirements(
-        List<ForwardingPathElementDataDefinition> pathElements, Service service, CapabiltyRequirementConvertor capabiltyRequirementConvertor, Map<String, Component> originComponents,ToscaOperationFacade toscaOperationFacade) {
+            List<ForwardingPathElementDataDefinition> pathElements, Service service, CapabilityRequirementConverter capabiltyRequirementConvertor, Map<String, Component> originComponents, ToscaOperationFacade toscaOperationFacade) {
         List<Map<String, ToscaTemplateRequirement>> toscaRequirements = new ArrayList<>();
         for (int i = 0; i <= pathElements.size() -1 ; i++) {
                 final ForwardingPathElementDataDefinition element = pathElements.get(i);
@@ -85,8 +79,8 @@ public class ForwardingPathToscaUtil {
     }
 
     private static String fetchNodeName(Service service, String nodeId) {
-        if (service.getComponentInstanceById(nodeId).isPresent()) {
-            return service.getComponentInstanceById(nodeId).get().getName();
+        if (service.getComponentInstanceByName(nodeId).isPresent()) {
+            return service.getComponentInstanceByName(nodeId).get().getName();
         } else {
             return "";
         }
@@ -108,8 +102,8 @@ public class ForwardingPathToscaUtil {
     /**
      * @todo handle errors.
      */
-    private static String fetchCPName(Service service, String nodeID, String cpName, CapabiltyRequirementConvertor capabiltyRequirementConvertor, Map<String, Component> originComponents,  ToscaOperationFacade toscaOperationFacade) {
-        Optional<ComponentInstance> componentInstance = service.getComponentInstanceById(nodeID);
+    private static String fetchCPName(Service service, String nodeID, String cpName, CapabilityRequirementConverter capabiltyRequirementConvertor, Map<String, Component> originComponents, ToscaOperationFacade toscaOperationFacade) {
+        Optional<ComponentInstance> componentInstance = service.getComponentInstanceByName(nodeID);
         ComponentInstance componentInstanceVal = componentInstance.get();
         String name = componentInstanceVal.getNormalizedName();
         Component component = originComponents.get(componentInstanceVal.getComponentUid());
@@ -120,12 +114,12 @@ public class ForwardingPathToscaUtil {
             }
 
         }
-        CapabilityDefinition capability = componentInstanceVal.getCapabilities().values().stream().flatMap(capabilityDefinitions -> capabilityDefinitions.stream())
-                .filter(capabilityDefinition -> capabilityDefinition.getUniqueId().equals(cpName)).findAny().get();
+        CapabilityDefinition capability = componentInstanceVal.getCapabilities().values().stream().flatMap(Collection::stream)
+                .filter(capabilityDefinition -> capabilityDefinition.getName().equals(cpName)).findAny().get();
         List<String> path = capability.getPath();
         List<String> reducedPath = new ArrayList<>(path);
         reducedPath.remove(reducedPath.size() - 1);
-        Either<String, Boolean> stringBooleanEither = capabiltyRequirementConvertor.buildSubstitutedName(originComponents, component, reducedPath, capability.getName());
+        Either<String, Boolean> stringBooleanEither = capabiltyRequirementConvertor.buildSubstitutedName(originComponents, component, reducedPath, capability.getName(), null);
         return name + "." + stringBooleanEither.left().value();
     }
 }
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java
new file mode 100644
index 0000000000..f6619b9aaa
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/InputConverter.java
@@ -0,0 +1,80 @@
+package org.openecomp.sdc.be.tosca.utils;
+
+import org.openecomp.sdc.be.datatypes.elements.Annotation;
+import org.openecomp.sdc.be.model.DataTypeDefinition;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.tosca.PropertyConvertor;
+import org.openecomp.sdc.be.tosca.ToscaExportHandler;
+import org.openecomp.sdc.be.tosca.model.ToscaAnnotation;
+import org.openecomp.sdc.be.tosca.model.ToscaInput;
+import org.openecomp.sdc.be.tosca.model.ToscaProperty;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@org.springframework.stereotype.Component
+public class InputConverter {
+    private PropertyConvertor propertyConvertor;
+    private static final Logger log = Logger.getLogger(ToscaExportHandler.class);
+
+
+    public InputConverter() {
+        this.propertyConvertor = PropertyConvertor.getInstance();
+
+    }
+    /**
+     * This is the converter made for input
+     * input is derived from properties and  is similar to properties
+     * now that it was added annotations , we created a new convertetor for it
+     * Input
+     *    List of annotation
+     *          Annotation:
+     *              name
+     *              type
+     *              description
+     *              list of properties */
+    public Map<String, ToscaProperty>  convertInputs( List<InputDefinition> inputDef,Map<String, DataTypeDefinition> dataTypes) {
+        log.debug("convert inputs to to tosca  ");
+
+        Map<String, ToscaProperty> inputs = new HashMap<>();
+        if (inputDef != null) {
+            inputDef.forEach(i -> {
+                //Extract input the same as property
+                ToscaProperty toscaProperty = propertyConvertor.convertProperty(dataTypes, i, false);
+                //now that we have Tosca property we create new object called tosca input which drives from it
+                ToscaInput toscaInput = new ToscaInput(toscaProperty);
+                List<Annotation> annotations = i.getAnnotations();
+                extractAnnotations(dataTypes, toscaInput, annotations);
+                inputs.put(i.getName(), toscaInput);
+            });
+        }
+        return inputs;
+    }
+
+    private void extractAnnotations(Map<String, DataTypeDefinition> dataTypes, ToscaInput toscaInput, List<Annotation> annotationsList) {
+        if (annotationsList != null) {
+            annotationsList.forEach(inputAnnotation -> {
+                ToscaAnnotation annotation = new ToscaAnnotation();
+                if ((inputAnnotation.getType()) != null) {
+                    annotation.setType(inputAnnotation.getType());
+                }
+                if (inputAnnotation.getDescription() != null) {
+                    annotation.setDescription(inputAnnotation.getDescription());
+                }
+                if (inputAnnotation.getProperties() != null) {
+                    Map<String, Object> properties = new HashMap<>();
+                    inputAnnotation.getProperties().forEach(k -> {
+                        propertyConvertor.convertAndAddValue(dataTypes,properties,k, k::getValue);
+                    });
+                    annotation.setProperties(properties);
+                }
+                toscaInput.addAnnotation(inputAnnotation.getName(), annotation);
+            });
+        }
+    }
+}
+
+
+
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java
index 82c7623fe2..5d0b4466c6 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java
@@ -16,11 +16,11 @@
 
 package org.openecomp.sdc.be.tosca.utils;
 
-import java.io.File;
-
 import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition;
 import org.openecomp.sdc.be.tosca.CsarUtils;
 
+import java.io.File;
+
 public class OperationArtifactUtil {
 
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/user/IUserBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/user/IUserBusinessLogic.java
index c3a7182657..8f01e2775b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/user/IUserBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/user/IUserBusinessLogic.java
@@ -20,15 +20,12 @@
 
 package org.openecomp.sdc.be.user;
 
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.exception.ResponseFormat;
 
-import fj.data.Either;
+import java.util.List;
 
 /**
  * 
@@ -42,8 +39,6 @@ public interface IUserBusinessLogic {
 
     public Either<User, ResponseFormat> updateUserRole(User modifier, String userIdToUpdate, String userRole);
 
-    public Either<List<User>, ResponseFormat> getAllAdminUsers(ServletContext context);
-
     public Either<List<User>, ResponseFormat> getUsersList(String userId, List<String> roles, String rolesStr);
 
     public Either<User, ResponseFormat> deActivateUser(User modifier, String userUniuqeIdToDeactive);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java
index e28375d578..b7e4c53844 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserBusinessLogic.java
@@ -20,14 +20,7 @@
 
 package org.openecomp.sdc.be.user;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletContext;
-
+import fj.data.Either;
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
@@ -41,19 +34,22 @@ import org.openecomp.sdc.be.model.operations.api.IUserAdminOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
 import org.openecomp.sdc.common.api.UserRoleEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.kpi.api.ASDCKpiApi;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import fj.data.Either;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Component("userBusinessLogic")
 public class UserBusinessLogic implements IUserBusinessLogic {
 
-    private static final Logger log = LoggerFactory.getLogger(UserBusinessLogic.class);
+    private static final Logger log = Logger.getLogger(UserBusinessLogic.class);
     private static UserAdminValidator userAdminValidator = UserAdminValidator.getInstance();
 
     @Resource
@@ -147,8 +143,15 @@ public class UserBusinessLogic implements IUserBusinessLogic {
 
         Either<User, StorageOperationStatus> addOrUpdateUserReq;
 
-        if (eitherUserInDB.isRight() && ActionStatus.USER_INACTIVE.equals(eitherUserInDB.right().value())) { 
-        	// user exist with inactive state - update user data
+        if (ActionStatus.USER_INACTIVE.equals(eitherUserInDB.right().value())) { // user
+                                                                                    // exist
+                                                                                    // with
+                                                                                    // inactive
+                                                                                    // state
+                                                                                    // -
+                                                                                    // update
+                                                                                    // user
+                                                                                    // data
             newUser.setLastLoginTime(0L);
             addOrUpdateUserReq = userAdminOperation.updateUserData(newUser);
 
@@ -165,7 +168,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
 
         if (addOrUpdateUserReq.isRight() || addOrUpdateUserReq.left().value() == null) {
             log.debug("createUser method - failed to create user");
-            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(addOrUpdateUserReq.right().value())));
+            Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(addOrUpdateUserReq.right().value())));
         }
         log.debug("createUser method - user created");
         User createdUser = addOrUpdateUserReq.left().value();
@@ -264,8 +267,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         return Either.left(updatedUser);
     }
 
-    @Override
-    public Either<List<User>, ResponseFormat> getAllAdminUsers(ServletContext context) {
+    public Either<List<User>, ResponseFormat> getAllAdminUsers() {
         Either<List<User>, ActionStatus> response = userAdminOperation.getAllUsersWithRole(Role.ADMIN.name(), null);
 
         if (response.isRight()) {
@@ -314,9 +316,6 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         } else {
             rolesStr = "All";
             getResponse = getUsersPerRole(null, user, rolesStr);
-            if(getResponse.isRight()) {
-            	return getResponse;
-            }
             resultList.addAll(getResponse.left().value());
         }
         responseFormat = componentsUtils.getResponseFormat(ActionStatus.OK);
@@ -336,15 +335,15 @@ public class UserBusinessLogic implements IUserBusinessLogic {
     }
 
     private void handleGetUsersListAuditing(User user, ResponseFormat responseFormat, String details) {
-        componentsUtils.auditGetUsersList(AuditingActionEnum.GET_USERS_LIST, user, details, responseFormat);
+        componentsUtils.auditGetUsersList(user, details, responseFormat);
     }
 
     private void handleAuditing(User modifier, User userBefor, User userAfter, ResponseFormat responseFormat, AuditingActionEnum actionName) {
         componentsUtils.auditAdminUserAction(actionName, modifier, userBefor, userAfter, responseFormat);
     }
 
-    private void handleUserAccessAuditing(User user, ResponseFormat responseFormat, AuditingActionEnum actionName) {
-        componentsUtils.auditUserAccess(actionName, user, responseFormat);
+    private void handleUserAccessAuditing(User user, ResponseFormat responseFormat) {
+        componentsUtils.auditUserAccess(user, responseFormat);
     }
 
     @Override
@@ -440,7 +439,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
             authUser.setUserId("UNKNOWN");
             log.debug("deActivateUser method -  user header is missing");
             responseFormat = componentsUtils.getResponseFormat(ActionStatus.MISSING_INFORMATION);
-            handleUserAccessAuditing(authUser, responseFormat, AuditingActionEnum.USER_ACCESS);
+            handleUserAccessAuditing(authUser, responseFormat);
             return Either.right(responseFormat);
         }
 
@@ -448,7 +447,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         if (eitherCreator.isRight()) {
             if (eitherCreator.right().value() == ActionStatus.USER_NOT_FOUND || eitherCreator.right().value() == ActionStatus.USER_INACTIVE) {
                 responseFormat = componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_ACCESS);
-                handleUserAccessAuditing(authUser, responseFormat, AuditingActionEnum.USER_ACCESS);
+                handleUserAccessAuditing(authUser, responseFormat);
                 return Either.right(responseFormat);
             } else {
                 return Either.right(componentsUtils.getResponseFormatByUser(eitherCreator.right().value(), authUser));
@@ -463,17 +462,17 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         User user = eitherCreator.left().value();
 
         String firstName = authUser.getFirstName();
-        if (firstName != null && firstName.isEmpty() == false && !firstName.equals(user.getFirstName())) {
+        if (firstName != null && !firstName.isEmpty() && !firstName.equals(user.getFirstName())) {
             user.setFirstName(firstName);
         }
 
         String lastName = authUser.getLastName();
-        if (lastName != null && lastName.isEmpty() == false && !lastName.equals(user.getLastName())) {
+        if (lastName != null && !lastName.isEmpty() && !lastName.equals(user.getLastName())) {
             user.setLastName(lastName);
         }
 
         String email = authUser.getEmail();
-        if (email != null && false == email.isEmpty() && !email.equals(user.getEmail())) {
+        if (email != null && !email.isEmpty() && !email.equals(user.getEmail())) {
             user.setEmail(email);
         }
 
@@ -483,10 +482,9 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         Either<User, StorageOperationStatus> updateUserReq = userAdminOperation.updateUserData(user);
 
         if (updateUserReq.isRight()) {
-        	ActionStatus convertFromStorageResponse = componentsUtils.convertFromStorageResponse(updateUserReq.right().value());
-            responseFormat = componentsUtils.getResponseFormatByUser(convertFromStorageResponse, user);
-            handleUserAccessAuditing(user, responseFormat, AuditingActionEnum.USER_ACCESS);
-            return Either.right(responseFormat);
+            responseFormat = componentsUtils.getResponseFormatByUser(eitherCreator.right().value(), user);
+            handleUserAccessAuditing(user, responseFormat);
+            return Either.right(componentsUtils.getResponseFormatByUser(eitherCreator.right().value(), user));
         }
 
         User updatedUser = updateUserReq.left().value();
@@ -499,7 +497,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         }
 
         responseFormat = componentsUtils.getResponseFormat(ActionStatus.OK);
-        handleUserAccessAuditing(updatedUser, responseFormat, AuditingActionEnum.USER_ACCESS);
+        handleUserAccessAuditing(updatedUser, responseFormat);
         ASDCKpiApi.countUsersAuthorizations();
         return Either.left(updatedUser);
     }
@@ -517,7 +515,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
             updatedUserCred.setUserId("UNKNOWN");
             log.debug("updateUserCredentials method - user header is missing");
             responseFormat = componentsUtils.getResponseFormat(ActionStatus.MISSING_INFORMATION);
-            handleUserAccessAuditing(updatedUserCred, responseFormat, AuditingActionEnum.USER_ACCESS);
+            handleUserAccessAuditing(updatedUserCred, responseFormat);
             return Either.right(responseFormat);
         }
 
@@ -526,7 +524,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
             ActionStatus status = eitherCreator.right().value();
             if (status == ActionStatus.USER_NOT_FOUND || status == ActionStatus.USER_INACTIVE) {
                 responseFormat = componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_ACCESS);
-                handleUserAccessAuditing(updatedUserCred, responseFormat, AuditingActionEnum.USER_ACCESS);
+                handleUserAccessAuditing(updatedUserCred, responseFormat);
                 return Either.right(responseFormat);
             } else {
                 return Either.right(componentsUtils.getResponseFormatByUser(status, updatedUserCred));
@@ -541,17 +539,17 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         User user = eitherCreator.left().value();
 
         String firstName = updatedUserCred.getFirstName();
-        if (firstName != null && firstName.isEmpty() == false && !firstName.equals(user.getFirstName())) {
+        if (firstName != null && !firstName.isEmpty() && !firstName.equals(user.getFirstName())) {
             user.setFirstName(firstName);
         }
 
         String lastName = updatedUserCred.getLastName();
-        if (lastName != null && lastName.isEmpty() == false && !lastName.equals(user.getLastName())) {
+        if (lastName != null && !lastName.isEmpty() && !lastName.equals(user.getLastName())) {
             user.setLastName(lastName);
         }
 
         String email = updatedUserCred.getEmail();
-        if (email != null && false == email.isEmpty() && !email.equals(user.getEmail())) {
+        if (email != null && !email.isEmpty() && !email.equals(user.getEmail())) {
             user.setEmail(email);
         }
 
@@ -566,16 +564,15 @@ public class UserBusinessLogic implements IUserBusinessLogic {
         Either<User, StorageOperationStatus> updateUserReq = userAdminOperation.updateUserData(user);
 
         if (updateUserReq.isRight()) {
-        	ActionStatus convertFromStorageResponse = componentsUtils.convertFromStorageResponse(updateUserReq.right().value());
-            responseFormat = componentsUtils.getResponseFormatByUser(convertFromStorageResponse, user);
-            handleUserAccessAuditing(user, responseFormat, AuditingActionEnum.USER_ACCESS);
-            return Either.right(responseFormat);
+            responseFormat = componentsUtils.getResponseFormatByUser(eitherCreator.right().value(), user);
+            handleUserAccessAuditing(user, responseFormat);
+            return Either.right(componentsUtils.getResponseFormatByUser(eitherCreator.right().value(), user));
         }
 
         User updatedUser = updateUserReq.left().value();
 
         responseFormat = componentsUtils.getResponseFormat(ActionStatus.OK);
-        handleUserAccessAuditing(updatedUser, responseFormat, AuditingActionEnum.USER_ACCESS);
+        handleUserAccessAuditing(updatedUser, responseFormat);
         return Either.left(updatedUser);
     }
 
@@ -585,7 +582,7 @@ public class UserBusinessLogic implements IUserBusinessLogic {
 
         try {
             UserRoleEnum userRole = UserRoleEnum.valueOf(user.getRole());
-            Map<String, Object> properties = new HashMap<String, Object>();
+            Map<String, Object> properties = new HashMap<>();
             switch (userRole) {
             case DESIGNER:
             case PRODUCT_STRATEGIST:
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinModelWriter.java b/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinModelWriter.java
index c7754ed418..7cdebc17a9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinModelWriter.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinModelWriter.java
@@ -1,5 +1,13 @@
 package org.openecomp.sdc.be.view;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
@@ -9,14 +17,6 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
  * A class that is then responsible for converting a message payload with a dedicated mixin from an instance of a specific Java type into a json representation.
  */
@@ -37,6 +37,7 @@ public class MixinModelWriter implements MessageBodyWriter<Object> {
     @Override
     public void writeTo(Object object, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
         ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
         List<MixinSourceTarget> mixinSourceTargets = getMixinSourceTarget(annotations);
         mixinSourceTargets.forEach(mixinSourceTarget -> objectMapper.addMixIn(mixinSourceTarget.getTarget(), mixinSourceTarget.getMixinSource()));
         objectMapper.writeValue(entityStream, object);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinTarget.java b/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinTarget.java
index cb44250331..64f207f94a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinTarget.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/view/MixinTarget.java
@@ -1,10 +1,6 @@
 package org.openecomp.sdc.be.view;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java
index f8676660d9..ea041359fd 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/ITransactionSdnc.java
@@ -20,14 +20,13 @@
 
 package org.openecomp.sdc.common.transaction.api;
 
+import fj.data.Either;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.ESActionTypeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.TransactionCodeEnum;
 
-import fj.data.Either;
-
 public interface ITransactionSdnc {
     TransactionCodeEnum finishTransaction();
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java
index 8be443bdda..4022655e67 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/api/RollbackHandler.java
@@ -20,18 +20,18 @@
 
 package org.openecomp.sdc.common.transaction.api;
 
-import java.util.Stack;
-
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.LogMessages;
 import org.openecomp.sdc.common.util.MethodActivationStatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Stack;
+
 public abstract class RollbackHandler implements IDBType {
 
     // TODO test using slf4j-test and make this final
-    private static Logger log = LoggerFactory.getLogger(RollbackHandler.class);
+    private static Logger log = LoggerFactory.getLogger(RollbackHandler.class.getName());
     private Stack<IDBAction> dbActionRollbacks;
 
     private Integer transactionId;
@@ -89,7 +89,7 @@ public abstract class RollbackHandler implements IDBType {
             log.debug(TransactionUtils.TRANSACTION_MARKER, LogMessages.ROLLBACK_PERSISTENT_ACTION, getDBType().name(), transactionId, userId, actionType);
             IDBAction rollbackAction = dbActionRollbacks.pop();
             T rollbackResult = rollbackAction.doAction();
-            if (!isRollbackResultValid(rollbackResult)) {
+            if (!isRollbackResultValid()) {
                 result = DBActionCodeEnum.FAIL_GENERAL;
             }
         }
@@ -101,7 +101,7 @@ public abstract class RollbackHandler implements IDBType {
      *
      * @param <T>
      */
-    public <T> boolean isRollbackResultValid(T rollbackResult) {
+    public <T> boolean isRollbackResultValid() {
         return true;
     }
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESAction.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESAction.java
index 0d628cf264..bd638249b2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESAction.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESAction.java
@@ -24,15 +24,14 @@ import org.openecomp.sdc.be.dao.impl.ESCatalogDAO;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.be.resources.exception.ResourceDAOException;
 import org.openecomp.sdc.be.tosca.CsarUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.transaction.api.IDBAction;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.ESActionTypeEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class ESAction implements IDBAction {
 
-    private static final Logger log = LoggerFactory.getLogger(CsarUtils.class);
+    private static final Logger log = Logger.getLogger(CsarUtils.class.getName());
 
     private ESCatalogDAO esCatalogDao;
     private ESArtifactData artifactData;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESRollbackHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESRollbackHandler.java
index add15d3c49..da1db80d2c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESRollbackHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/impl/ESRollbackHandler.java
@@ -20,23 +20,21 @@
 
 package org.openecomp.sdc.common.transaction.impl;
 
+import fj.data.Either;
 import org.openecomp.sdc.be.dao.api.ResourceUploadStatus;
 import org.openecomp.sdc.be.dao.impl.ESCatalogDAO;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
 import org.openecomp.sdc.be.tosca.CsarUtils;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.transaction.api.RollbackHandler;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.ESActionTypeEnum;
 import org.openecomp.sdc.common.util.MethodActivationStatusEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import fj.data.Either;
 
 public class ESRollbackHandler extends RollbackHandler {
 
-    private static final Logger log = LoggerFactory.getLogger(CsarUtils.class);
+    private static final Logger log = Logger.getLogger(CsarUtils.class.getName());
 
     public ESRollbackHandler(Integer transactionId, String userId, String actionType) {
         super(transactionId, userId, actionType);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java
index d8706929ba..abe4c3743f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/CommitManager.java
@@ -20,20 +20,19 @@
 
 package org.openecomp.sdc.common.transaction.mngr;
 
-import java.util.List;
-
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.transaction.api.ICommitHandler;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.LogMessages;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
+import java.util.List;
 
 public class CommitManager {
 
     // TODO test using slf4j-test and make this final
-    private static Logger log = LoggerFactory.getLogger(CommitManager.class);
+    private static Logger log = Logger.getLogger(CommitManager.class);
     private List<ICommitHandler> commitHandlers;
     private Integer transactionId;
     private String userId, actionType;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/RollbackManager.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/RollbackManager.java
index 80d548ef42..5e51615164 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/RollbackManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/RollbackManager.java
@@ -20,15 +20,14 @@
 
 package org.openecomp.sdc.common.transaction.mngr;
 
-import org.openecomp.sdc.common.transaction.api.RollbackHandler;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
-import org.openecomp.sdc.common.util.MethodActivationStatusEnum;
-
 import fj.P;
 import fj.data.Either;
 import fj.data.HashMap;
 import fj.data.List;
+import org.openecomp.sdc.common.transaction.api.RollbackHandler;
+import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
+import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
+import org.openecomp.sdc.common.util.MethodActivationStatusEnum;
 
 public class RollbackManager {
     private final HashMap<DBTypeEnum, RollbackHandler> rollbackHandlersMap;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java
index d4c5291dfe..9d95c26ec9 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionManager.java
@@ -20,27 +20,24 @@
 
 package org.openecomp.sdc.common.transaction.mngr;
 
-import java.util.Queue;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.annotation.Resource;
-
+import com.google.common.collect.EvictingQueue;
+import com.google.common.collect.Queues;
 import org.openecomp.sdc.be.dao.impl.ESCatalogDAO;
 import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.transaction.api.ITransactionSdnc;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils;
 import org.openecomp.sdc.common.transaction.api.TransactionUtils.ActionTypeEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.google.common.collect.EvictingQueue;
-import com.google.common.collect.Queues;
+import javax.annotation.Resource;
+import java.util.Queue;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Component("transactionManager")
 public class TransactionManager {
 
-    private static final Logger log = LoggerFactory.getLogger(TransactionManager.class);
+    private static final Logger log = Logger.getLogger(TransactionManager.class.getName());
 
     private AtomicInteger transactionIDCounter = new AtomicInteger(0);
 
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java
index 1dda1499d5..1c07e50e0a 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/common/transaction/mngr/TransactionSdncImpl.java
@@ -20,39 +20,27 @@
 
 package org.openecomp.sdc.common.transaction.mngr;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import fj.data.Either;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.dao.impl.ESCatalogDAO;
 import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
 import org.openecomp.sdc.be.resources.data.ESArtifactData;
-import org.openecomp.sdc.common.transaction.api.ICommitHandler;
-import org.openecomp.sdc.common.transaction.api.IDBAction;
-import org.openecomp.sdc.common.transaction.api.ITransactionSdnc;
-import org.openecomp.sdc.common.transaction.api.RollbackHandler;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.ActionTypeEnum;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBActionCodeEnum;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.DBTypeEnum;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.ESActionTypeEnum;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.LogMessages;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.TransactionCodeEnum;
-import org.openecomp.sdc.common.transaction.api.TransactionUtils.TransactionStatusEnum;
+import org.openecomp.sdc.common.log.wrappers.Logger;
+import org.openecomp.sdc.common.transaction.api.*;
+import org.openecomp.sdc.common.transaction.api.TransactionUtils.*;
 import org.openecomp.sdc.common.transaction.impl.ESAction;
 import org.openecomp.sdc.common.transaction.impl.ESRollbackHandler;
 import org.openecomp.sdc.common.transaction.impl.TitanCommitHandler;
 import org.openecomp.sdc.common.transaction.impl.TitanRollbackHandler;
 import org.openecomp.sdc.common.util.MethodActivationStatusEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TransactionSdncImpl implements ITransactionSdnc {
 
     // TODO test using slf4j-test and make this final
-    private static Logger log = LoggerFactory.getLogger(TransactionSdncImpl.class);
+    private static Logger log = Logger.getLogger(TransactionSdncImpl.class);
     private boolean lastActionAlreadyCalled;
     private RollbackManager rollbackManager;
     private CommitManager commitManager;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java b/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java
index 56527b6e9b..6c6d2cb55b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/config/CatalogBESpringConfig.java
@@ -1,11 +1,15 @@
 package org.openecomp.sdc.config;
 
+import org.openecomp.sdc.be.components.impl.ComponentLocker;
+import org.openecomp.sdc.be.components.impl.lock.ComponentLockAspect;
 import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
 import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
 import org.openecomp.sdc.common.transaction.mngr.TransactionManager;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 
 @Configuration
 @ComponentScan({"org.openecomp.sdc.be.user",
@@ -19,9 +23,20 @@ import org.springframework.context.annotation.Configuration;
         "org.openecomp.sdc.be.components.path",
         "org.openecomp.sdc.be.components.merge",
         "org.openecomp.sdc.be.components.csar",
-        "org.openecomp.sdc.be.components.property"
+        "org.openecomp.sdc.be.components.property",
+        "org.openecomp.sdc.be.datamodel.utils",
+        "org.openecomp.sdc.be.components.upgrade"
 })
 public class CatalogBESpringConfig {
+
+    private static final int BEFORE_TRANSACTION_MANAGER = 0;
+    private final ComponentLocker componentLocker;
+
+    @Autowired
+    public CatalogBESpringConfig(ComponentLocker componentLocker) {
+        this.componentLocker = componentLocker;
+    }
+
     @Bean(name = "lifecycleBusinessLogic")
     public LifecycleBusinessLogic lifecycleBusinessLogic() {
         return new LifecycleBusinessLogic();
@@ -37,4 +52,11 @@ public class CatalogBESpringConfig {
         return new AssetMetadataConverter();
     }
 
+    @Bean(name = "componentLockAspect")
+    @Order(BEFORE_TRANSACTION_MANAGER)
+    public ComponentLockAspect componentLockAspect() {
+        return new ComponentLockAspect(componentLocker);
+    }
+
+
 }
diff --git a/catalog-be/src/main/resources/application-context.xml b/catalog-be/src/main/resources/application-context.xml
index b34ad69ffb..b3dcbc1de1 100644
--- a/catalog-be/src/main/resources/application-context.xml
+++ b/catalog-be/src/main/resources/application-context.xml
@@ -14,8 +14,8 @@
           base-package= "org.openecomp.sdc.be.components.health,
                          org.openecomp.sdc.be.servlets,
                          org.openecomp.sdc.be.externalapi.servlet,
-                         org.openecomp.sdc.be.components.scheduledtasks,
-                         org.openecomp.sdc.be.model.jsontitan.utils">
+                         org.openecomp.sdc.be.components.scheduledtasks
+                         ">
   </context:component-scan>
 
   <bean class="org.openecomp.sdc.be.dao.config.DAOSpringConfig"/>
@@ -24,6 +24,14 @@
   <bean class="org.openecomp.sdc.config.CatalogBESpringConfig"/>
 
 
+  <aop:config>
+    <aop:aspect id="lockAspect" ref="componentLockAspect">
+      <aop:pointcut id="lockingTransaction" expression="@annotation(org.openecomp.sdc.be.components.impl.lock.LockingTransactional) and args(componentId, componentType,..)"/>
+      <aop:around method="lock" arg-names="proceedingJoinPoint,componentId,componentType" pointcut-ref="lockingTransaction"/>
+    </aop:aspect>
+  </aop:config>
+
+
   <util:properties id="elasticsearchConfig" location="file:${config.home}/elasticsearch.yml" />
   
 </beans>
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 991ed92e5d..527857f13d 100644
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -23,9 +23,26 @@ beSslPort: 8443
 
 version: 1.1.0
 released: 2012-11-30
-toscaConformanceLevel: 10.0
+toscaConformanceLevel: 8.0
 minToscaConformanceLevel: 3.0
 
+# These values are necessary for running upgrade migration 1710.0 process
+enableAutoHealing: false
+appVersion: 1.1.0
+artifactGeneratorConfig: Artifact-Generator.properties
+resourcesForUpgrade:
+ 8.0:
+  - org.openecomp.resource.cp.extCP
+  - tosca.nodes.network.Network
+  - tosca.nodes.network.Port
+  - org.openecomp.resource.cp.nodes.network.SubInterface
+skipUpgradeFailedVfs: true
+skipUpgradeVSPs: true
+autoHealingOwner: jh0003
+supportAllottedResourcesAndProxy: true
+deleteLockTimeoutInSeconds: 60
+maxDeleteComponents: 10
+
 titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties
 titanInMemoryGraph: false
 titanLockTimeout: 1800
@@ -60,6 +77,8 @@ defaultImports:
         file: groups.yml
    - policies:
         file: policies.yml
+   - annotations:
+        file: annotations.yml
 
 # Users
 users:
@@ -73,20 +92,22 @@ neo4j:
     password: "12345"
 
 cassandraConfig:
-    cassandraHosts: ['localhost']
-    localDataCenter: datacenter1
+    cassandraHosts: [192.168.33.10]
+    localDataCenter: DC-sdc-iltlv650
     reconnectTimeout : 30000
-    authenticate: false
-    username: koko
-    password: bobo
-    ssl: false
-    truststorePath : /path/path
-    truststorePassword : 123123
+    authenticate: true
+    username: asdc_user
+    password: Aa1234%^!
+    ssl: true
+    truststorePath : /opt/app/jetty/base/be/config/.truststore
+    truststorePassword : Aa123456
     keySpaces:
-        - { name: sdcaudit, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
-        - { name: sdcartifact, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
-        - { name: sdccomponent, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
-        - { name: sdcrepository, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
+        - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}
+        - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}
+        - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}
+        - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}       
+        - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}
+
 
 #Application-specific settings of ES
 elasticSearch:
@@ -133,7 +154,6 @@ artifactTypes:
    - SNMP_POLL
    - SNMP_TRAP
    - GUIDE
-   - PLAN
 
 licenseTypes:
    - User
@@ -325,14 +345,6 @@ serviceDeploymentArtifacts:
             - xml 
     OTHER:
         acceptedTypes:
-        
-#PLAN
-    PLAN:
-        acceptedTypes:
-            - xml
-        validForResourceTypes:
-            - VF
-            - VFC
 
 resourceDeploymentArtifacts:
     HEAT:
@@ -450,11 +462,6 @@ resourceDeploymentArtifacts:
     SNMP_TRAP:
         acceptedTypes:
         validForResourceTypes: *allResourceTypes
-        
-#PLAN
-    PLAN:
-        acceptedTypes:
-            - xml
 
 resourceInstanceDeploymentArtifacts:
     HEAT_ENV:
@@ -492,11 +499,6 @@ resourceInstanceDeploymentArtifacts:
     SNMP_TRAP:
         acceptedTypes:
         validForResourceTypes: *allResourceTypes
-        
-#PLAN
-    PLAN:
-        acceptedTypes:
-            - xml
 
 resourceInformationalArtifacts:
     CHEF:
@@ -714,6 +716,10 @@ excludedGroupTypesMapping:
        - org.openecomp.groups.VfModule
        - org.openecomp.groups.heat.HeatStack
        - tosca.groups.Root
+    PNF:
+       - org.openecomp.groups.VfModule
+       - org.openecomp.groups.heat.HeatStack
+       - tosca.groups.Root
     VF:
        - org.openecomp.groups.VfModule
        - org.openecomp.groups.heat.HeatStack
@@ -727,4 +733,3 @@ healthStatusExclude:
    - DE
    - ES
    - DMAAP
-
diff --git a/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml b/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml
index 5ebbe82985..4a788caaab 100644
--- a/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml
+++ b/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml
@@ -25,7 +25,7 @@ distribNotifResourceArtifactTypes:
       - DG-XML
 
 environments:
-   - PROD
+   - PROD_TEST
 
 distributionStatusTopic:
    pollingIntervalSec: 60
@@ -45,8 +45,8 @@ createTopic:
 
 startDistributionEngine: true
 
-
-useHttpsWithDmaap: false
+useHttpsWithDmaap: true
+   
 opEnvRecoveryIntervalSec: 180
 allowedTimeBeforeStaleSec: 300
 
diff --git a/catalog-be/src/main/resources/config/error-configuration.yaml b/catalog-be/src/main/resources/config/error-configuration.yaml
index de5196e11e..26fee5b28e 100644
--- a/catalog-be/src/main/resources/config/error-configuration.yaml
+++ b/catalog-be/src/main/resources/config/error-configuration.yaml
@@ -350,7 +350,7 @@ errors:
 # %2  - resource/service
     COMPONENT_IN_USE: {
         code: 403,
-        message: "Error: Requested '%1' %2 is in use by another user.",
+        message: "Error: '%1' %2 is still held by previous action. Please try again later.",
         messageId: "SVC4086"
     }
 #-----------SVC4087---------------------------
@@ -575,13 +575,6 @@ errors:
         message: "Error: Invalid distribution environment.",
         messageId: "SVC4138"
     }
-#---------SVC4139------------------------------
-# %1 - service name
-    DISTRIBUTION_ARTIFACT_NOT_FOUND: {
-        code: 409,
-        message: "Error: Service '%1' cannot be distributed due to missing deployment artifacts.",
-        messageId: "SVC4139"
-    }
 #---------SVC4200------------------------------
 # %1 - Service/Resource
 # %2 - max icon name length
@@ -2078,23 +2071,66 @@ errors:
       message: "Error: Interface operations not found in the resource %1",
       messageId: "SVC4701"
     }
-#---------SVC46702-----------------------------
+#---------SVC4702-----------------------------
     INTERFACE_OPERATION_NOT_DELETED: {
       code: 404,
       message: "Error: Failed to delete interface operation.",
       messageId: "SVC4702"
     }
-#---------SVC4703-----------------------------
+#-----------SVC4692---------------------------
+    RESOURCE_LIFECYCLE_STATE_NOT_VALID: {
+        code: 400,
+        message: "Error: Lifecycle state %1 is not valid for resource",
+        messageId: "SVC4692"
+    }
+#-----------SVC4693---------------------------
+#%1 - component name
+    COMPONENT_IS_ARCHIVED: {
+        code: 400,
+        message: "Error: Component %1 is arhived",
+        messageId: "SVC4693"
+    }
+#-----------SVC4703---------------------------
+#%1 - component name
+    COMPONENT_IS_NOT_HIHGEST_CERTIFIED: {
+        code: 400,
+        message: "Error: Component %1 is not highest certified",
+        messageId: "SVC4703"
+    }
+#---------SVC4704------------------------------
+# %1 - "service"/"VF"
+# %2 - "Resource name"
+    ARCHIVED_ORIGINS_FOUND: {
+        code: 403,
+        message: "Error: Action is not permitted as your '%1' '%2' includes archived resources",
+        messageId: "SVC4704"
+    }
+#---------SVC4705------------------------------
+# %1-artifact name
+    ARTIFACT_PAYLOAD_EMPTY: {
+        code: 400,
+        message: "Error: Invalid content. Uploaded file %1 is empty. Please retry with the correct file.",
+        messageId: "SVC4705"
+    }
+#---------SVC4706------------------------------
+# %1-input(s) name(s) string
+    INPUTS_NOT_FOUND: {
+        code: 400,
+        message: "Error: missing input value(s) %1.",
+        messageId: "SVC4706"
+    }
+    #---------SVC4707-----------------------------
 # %1 – asset type [service / resource ]
 # %2 – main asset uuid
     ERROR_DURING_CSAR_CREATION: {
       code: 404,
       message: "Error: CSAR packaging failed for %1 %2.",
-      messageId: "SVC4702"
+      messageId: "SVC4706"
     }
-#---------SVC46703-----------------------------
+#---------SVC46708-----------------------------
     INTERFACE_OPERATION_INPUT_NAME_MANDATORY: {
       code: 404,
       message: "Error: Interface operation input  parameter name should not be empty",
-      messageId: "SVC46703"
-    }
+      messageId: "SVC46707"
+      }
+
diff --git a/catalog-be/src/main/resources/config/logback.xml b/catalog-be/src/main/resources/config/logback.xml
index b436f20c31..3ec6e45f3e 100644
--- a/catalog-be/src/main/resources/config/logback.xml
+++ b/catalog-be/src/main/resources/config/logback.xml
@@ -4,27 +4,34 @@
 	<property scope="system" name="ECOMP-component-name" value="SDC" />
 	<property scope="system" name="ECOMP-subcomponent-name" value="SDC-BE" />
 	<property file="${config.home}/catalog-be/configuration.yaml" />
-	<property scope="context" name="enable-all-log" value="false" />
+	<property scope="context" name="enable-all-log" value="true" />
 
 	<!-- value used by pattern field list (| - is inter-field separator, || - unavailable or not applicable field value) (m - mandatory, o- optional)-->
 	<!--timestamp(m)| requestID(m)| serviceInstanceID(o)| threadID(m)| physicalServerName(o)| serviceName(m)| userID(m)| logLevel(m)| severity(o)| serverIpAddress(m)| serverName(m)| clientIpAddress(o)| className(m)| timer(o)| detailedMessage(o)-->
 	<property name="default-log-pattern"
-			  value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{uuid}|%X{serviceInstanceID}|%thread|%X{ServerName}|%X{ServiceName}|${ECOMP-subcomponent-name}|%X{userId}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%level|%X{alarmSeverity}|%X{localAddr}|%X{ElapsedTime}|${beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+			  value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{uuid}|%X{serviceInstanceID}|%thread|%X{ServerName}|%X{ServiceName}|${ECOMP-subcomponent-name}|%X{userId}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%level|%X{alarmSeverity}|%X{localAddr}|%X{ElapsedTime}|${beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
 
-	<property name="auditLoggerPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+	<property name="error-log-pattern"
+			  value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ErrorCategory}|%X{ErrorCode}|%msg|%n" />
 
-	<property name="asdc-debug-log-pattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg %n"/>
+	<property name="audit-log-pattern" value="%X{AuditBeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+
+	<property name="metric-log-pattern" value="%X{MetricBeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+
+	<property name="debug-log-pattern" value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg|^\n%n"/>
 
 	<!-- All log -->
 	<if condition='property("enable-all-log").equalsIgnoreCase("true")'>
 		<then>
 			<appender name="ALL_ROLLING"
 				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log</file>
+				<file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log
+				</file>
 
 				<rollingPolicy
 					class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-					<fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i</fileNamePattern>
+					<fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i
+					</fileNamePattern>
 					<minIndex>1</minIndex>
 					<maxIndex>10</maxIndex>
 				</rollingPolicy>
@@ -37,7 +44,7 @@
 					<pattern>${default-log-pattern}</pattern>
 				</encoder>
 			</appender>
-			
+
 			<appender name="ASYNC_ALL" class="ch.qos.logback.classic.AsyncAppender">
 				<appender-ref ref="ALL_ROLLING" />
 			</appender>
@@ -85,7 +92,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${default-log-pattern}</pattern>
+			<pattern>${error-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -95,9 +102,9 @@
 		<file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log
 		</file>
 
-		<!-- No need to deny audit messages - they are INFO only, will be denied 
+		<!-- No need to deny audit messages - they are INFO only, will be denied
 			anyway -->
-		<!-- Transaction messages filter - deny Transaction messages, there are 
+		<!-- Transaction messages filter - deny Transaction messages, there are
 			some DEBUG level messages among them -->
 		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
 			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
@@ -131,7 +138,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${default-log-pattern}</pattern>
+			<pattern>${debug-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -177,7 +184,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${asdc-debug-log-pattern}</pattern>
+			<pattern>${debug-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -210,7 +217,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${auditLoggerPattern}</pattern>
+			<pattern>${audit-log-pattern}</pattern>
 		</encoder>
 	</appender>
 	
@@ -242,7 +249,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${default-log-pattern}</pattern>
+			<pattern>${metric-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -324,5 +331,5 @@
 		</if>
 	</root>
 
-	<logger name="org.openecomp.sdc" level="INFO" />
+	<logger name="org.openecomp.sdc" level="DEBUG" />
 </configuration>
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py
new file mode 100644
index 0000000000..93394b3ed5
--- /dev/null
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py
@@ -0,0 +1,100 @@
+import pycurl
+import sys, getopt
+from StringIO import StringIO
+import json
+import copy
+from importCommon import *
+from importNormativeTypes import *
+import importCommon
+
+#####################################################################################################################################################################################
+#																																		       										#
+# Import heat types																										   															#
+# 																																			   										#
+# activation :																																   										#
+#       python importHeatTypes1.py [-s <scheme> | --scheme=<scheme> ] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-f <input file> | --ifile=<input file> ]	#
+#																																		  	   										#
+# shortest activation (be host = localhost, be port = 8080): 																				   										#
+#		python importHeatTypes1.py [-f <input file> | --ifile=<input file> ]												 				           								#
+#																																		       										#
+#####################################################################################################################################################################################
+
+def importHeatTypes1(scheme, beHost, bePort, adminUser, fileDir, updateversion):
+	
+	heatTypes = ["extCp"]
+		
+	responseCodes = [200, 201]
+		
+	if(updateversion == 'false'):
+		responseCodes = [200, 201, 409]
+		
+        results = []
+        for heatType in heatTypes:
+                result = createNormativeType(scheme, beHost, bePort, adminUser, fileDir, heatType, updateversion)
+                results.append(result)
+                if ( result[1] == None or result[1] not in responseCodes) :
+			print "Failed creating heat type " + heatType + ". " + str(result[1]) 				
+	return results	
+
+
+def main(argv):
+	print 'Number of arguments:', len(sys.argv), 'arguments.'
+
+	beHost = 'localhost' 
+	bePort = '8080'
+	adminUser = 'jh0003'
+	updateversion = 'true'
+	scheme = 'http'
+	
+	try:
+		opts, args = getopt.getopt(argv,"i:p:u:v:h:s:",["ip=","port=","user=","updateversion=","scheme="])
+	except getopt.GetoptError:
+		usage()
+		error_and_exit(2, 'Invalid input')
+		 
+	for opt, arg in opts:
+	#print opt, arg
+		if opt == '-h':
+			usage()                        
+			sys.exit(3)
+		elif opt in ("-i", "--ip"):
+			beHost = arg
+		elif opt in ("-p", "--port"):
+			bePort = arg
+		elif opt in ("-u", "--user"):
+			adminUser = arg
+		elif opt in ("-s", "--scheme"):
+			scheme = arg
+		elif opt in ("-v", "--updateversion"):
+			if (arg.lower() == "false" or arg.lower() == "no"):
+				updateversion = 'false'
+
+	print 'scheme =',scheme,', be host =',beHost,', be port =', bePort,', user =', adminUser
+	
+	if ( beHost == None ):
+		usage()
+		sys.exit(3)
+
+	results = importHeatTypes1(scheme, beHost, bePort, adminUser, "../../../import/tosca/heat-types/", updateversion)
+
+	print "-----------------------------"
+	for result in results:
+		print "{0:20} | {1:6}".format(result[0], result[1])
+	print "-----------------------------"
+	
+	responseCodes = [200, 201]
+	
+	if(updateversion == 'false'):
+		responseCodes = [200, 201, 409]
+	
+	failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results)
+	if (len(failedNormatives) > 0):
+		error_and_exit(1, None)
+	else:
+		error_and_exit(0, None)
+
+
+if __name__ == "__main__":
+        main(sys.argv[1:])
+
+
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py
new file mode 100644
index 0000000000..1dbd5fdcb3
--- /dev/null
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py
@@ -0,0 +1,121 @@
+import pycurl
+import sys, getopt, os
+from StringIO import StringIO
+import json
+import copy
+import time
+#from importNormativeElements import createNormativeElement
+from importNormativeElements import * 
+from importNormativeTypes import importNormativeTypes
+from importHeatTypes1 import importHeatTypes1
+from importNormativeCapabilities import importNormativeCapabilities
+from importCategoryTypes import importCategories
+from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType
+from importDataTypes import importDataTypes
+from importGroupTypes import importGroupTypes
+from importPolicyTypes import importPolicyTypes
+from importCommon import *
+import importCommon
+
+#################################################################################################################################################################################################################################
+#																																		       																					#
+# Import all users from a given file																										   																					#
+# 																																			   																					#
+# activation :																																   																					#
+#       python importNormativeAll.py [-s <scheme> | --scheme=<scheme> ] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] 	#
+#									 [-v <true|false> | --updateversion=<true|false>]																																			#
+#																																		  	   																					#
+# shortest activation (be host = localhost, be port = 8080, user = jh0003): 																				   																	#
+#		python importNormativeAll.py											 				           																														#
+#																																		       																					#
+#################################################################################################################################################################################################################################
+
+def usage():
+	print sys.argv[0], '[optional -s <scheme> | --scheme=<scheme>, default http] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] [-v <true|false> | --updateversion=<true|false>]'
+
+def handleResults(results, updateversion):
+	print_frame_line()
+	for result in results:
+		print_name_and_return_code(result[0], result[1])
+	print_frame_line()
+	
+	responseCodes = [200, 201]
+	
+	if(updateversion == 'false'):
+		responseCodes = [200, 201, 409]
+	
+	failedResults = filter(lambda x: x[1] == None or x[1] not in responseCodes, results)
+	if (len(failedResults) > 0):
+		error_and_exit(1, None)
+
+def main(argv):
+	print 'Number of arguments:', len(sys.argv), 'arguments.'
+
+	beHost = 'localhost' 
+	bePort = '8080'
+	adminUser = 'jh0003'
+	debugf = None
+	updateversion = 'true'
+	importCommon.debugFlag = False
+	scheme = 'http' 
+
+	try:
+		opts, args = getopt.getopt(argv,"i:p:u:d:v:h:s:",["ip=","port=","user=","debug=","updateversion=","scheme="])
+	except getopt.GetoptError:
+		usage()
+		error_and_exit(2, 'Invalid input')
+	
+	for opt, arg in opts:
+	#print opt, arg
+		if opt == '-h':
+			usage()                        
+			sys.exit(3)
+		elif opt in ("-i", "--ip"):
+			beHost = arg
+		elif opt in ("-p", "--port"):
+			bePort = arg
+		elif opt in ("-u", "--user"):
+			adminUser = arg
+		elif opt in ("-s", "--scheme"):
+			scheme = arg
+		elif opt in ("-d", "--debug"):
+			print arg
+			debugf = bool(arg.lower() == "true" or arg.lower() == "yes")
+		elif opt in ("-v", "--updateversion"):
+			print arg
+			if (arg.lower() == "false" or arg.lower() == "no"):
+				updateversion = 'false'			
+
+	print 'scheme =',scheme,', be host =',beHost,', be port =', bePort,', user =', adminUser, ', debug =', debugf, ', updateversion =', updateversion
+
+	if (debugf != None):
+		print 'set debug mode to ' + str(debugf)
+		importCommon.debugFlag = debugf
+	
+	if ( beHost == None ):
+		usage()
+		sys.exit(3)
+
+	print sys.argv[0]
+	pathdir = os.path.dirname(os.path.realpath(sys.argv[0]))      
+	debug("path dir =" + pathdir)
+
+	baseFileLocation = pathdir + "/../../../import/tosca/"
+
+	fileLocation = baseFileLocation + "data-types/"
+	importDataTypes(scheme, beHost, bePort, adminUser, False, fileLocation)
+
+	print 'sleep until data type cache is updated'
+	time.sleep( 1 )
+	
+	fileLocation = baseFileLocation + "heat-types/"
+	resultsHeat = importHeatTypes1(scheme, beHost, bePort, adminUser, fileLocation, updateversion)
+	handleResults(resultsHeat, updateversion)
+  
+
+
+	error_and_exit(0, None)	
+
+if __name__ == "__main__":
+        main(sys.argv[1:])
+
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py
index f9f5cd5320..347898a815 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py
@@ -30,6 +30,7 @@ def import_element(scheme, be_host, be_port, admin_user, exit_on_success, file_d
             error_and_exit(0, None)
 
 
+
 def createNormativeElement(scheme, be_host, be_port, admin_user, file_dir, url_suffix, element_name, element_form_name,
                            with_metadata=False):
     try:
diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index ffcda486e2..74092fe9cb 100644
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -16,9 +16,9 @@
                 org.glassfish.jersey.media.multipart.MultiPartFeature,
                 org.openecomp.sdc.be.filters.BeServletFilter,
                 org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter,
-				org.openecomp.sdc.be.servlets.DefaultExceptionMapper,
-                org.openecomp.sdc.be.servlets.ComponentExceptionMapper,
-				org.openecomp.sdc.be.servlets.StorageExceptionMapper,
+				org.openecomp.sdc.be.servlets.exception.DefaultExceptionMapper,
+                org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper,
+				org.openecomp.sdc.be.servlets.exception.StorageExceptionMapper,
                 org.openecomp.sdc.be.view.MixinModelWriter
             </param-value>
 
@@ -62,7 +62,10 @@
 			<param-name>jersey.config.server.provider.classnames</param-name>
 			<param-value>io.swagger.jersey.listing.ApiListingResourceJSON, 
 			org.glassfish.jersey.media.multipart.MultiPartFeature, 
-			org.openecomp.sdc.be.filters.BeServletFilter, 
+			org.openecomp.sdc.be.filters.BeServletFilter,
+			org.openecomp.sdc.be.servlets.exception.DefaultExceptionMapper,
+			org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper,
+			org.openecomp.sdc.be.servlets.exception.StorageExceptionMapper,
 			org.openecomp.sdc.be.filters.BasicAuthenticationFilter</param-value>
 		</init-param>
 		
@@ -199,5 +202,4 @@
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 	</welcome-file-list>
-	
 </web-app>