diff --git a/build.gradle b/build.gradle
index df6e7c8..61c883e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,12 +39,13 @@ dependencyManagement {
 
 dependencies {
     if (releaseMode) {
+        implementation 'com.epam.reportportal:commons-dao'
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
-
     } else {
-        implementation 'com.github.reportportal:plugin-api:cc3c5c8e'
-        annotationProcessor 'com.github.reportportal:plugin-api:cc3c5c8e'
+        implementation 'com.github.reportportal:commons-dao:fa04c1f'
+        implementation 'com.github.reportportal:plugin-api:20ab960'
+        annotationProcessor 'com.github.reportportal:plugin-api:20ab960'
     }
 
     compile 'com.rallydev.rest:rally-rest-api:2.2.1'
diff --git a/src/main/java/com/epam/reportportal/extension/bugtracking/rally/RallyStrategy.java b/src/main/java/com/epam/reportportal/extension/bugtracking/rally/RallyStrategy.java
index ce50ec8..bfcfaf1 100644
--- a/src/main/java/com/epam/reportportal/extension/bugtracking/rally/RallyStrategy.java
+++ b/src/main/java/com/epam/reportportal/extension/bugtracking/rally/RallyStrategy.java
@@ -37,9 +37,9 @@
 import static com.epam.reportportal.extension.bugtracking.rally.RallyConstants.STRING_VALUE;
 import static com.epam.reportportal.extension.bugtracking.rally.RallyConstants.TYPE;
 import static com.epam.reportportal.extension.bugtracking.rally.RallyConstants.TYPE_DEFINITION;
-import static com.epam.ta.reportportal.commons.validation.Suppliers.formattedSupplier;
-import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNABLE_INTERACT_WITH_INTEGRATION;
-import static com.epam.ta.reportportal.ws.reporting.ErrorType.UNABLE_TO_LOAD_BINARY_DATA;
+import static com.epam.reportportal.rules.commons.validation.Suppliers.formattedSupplier;
+import static com.epam.reportportal.rules.exception.ErrorType.UNABLE_INTERACT_WITH_INTEGRATION;
+import static com.epam.reportportal.rules.exception.ErrorType.UNABLE_TO_LOAD_BINARY_DATA;
 import static java.util.Optional.ofNullable;
 
 import com.epam.reportportal.commons.template.TemplateEngine;
@@ -53,19 +53,19 @@
 import com.epam.reportportal.extension.bugtracking.InternalTicket;
 import com.epam.reportportal.extension.bugtracking.InternalTicketAssembler;
 import com.epam.reportportal.extension.util.FileNameExtractor;
+import com.epam.reportportal.model.externalsystem.AllowedValue;
+import com.epam.reportportal.model.externalsystem.PostFormField;
+import com.epam.reportportal.model.externalsystem.PostTicketRQ;
+import com.epam.reportportal.model.externalsystem.Ticket;
+import com.epam.reportportal.rules.exception.ErrorType;
+import com.epam.reportportal.rules.exception.ReportPortalException;
 import com.epam.ta.reportportal.binary.impl.AttachmentDataStoreService;
 import com.epam.ta.reportportal.dao.LogRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
 import com.epam.ta.reportportal.entity.item.TestItem;
-import com.epam.ta.reportportal.exception.ReportPortalException;
 import com.epam.ta.reportportal.filesystem.DataEncoder;
-import com.epam.ta.reportportal.ws.model.externalsystem.AllowedValue;
-import com.epam.ta.reportportal.ws.model.externalsystem.PostFormField;
-import com.epam.ta.reportportal.ws.model.externalsystem.PostTicketRQ;
-import com.epam.ta.reportportal.ws.model.externalsystem.Ticket;
-import com.epam.ta.reportportal.ws.reporting.ErrorType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Lists;
@@ -316,7 +316,7 @@ private Defect postDefect(RallyRestApi restApi, PostTicketRQ ticketRQ, Integrati
                 ));
           } catch (IOException e) {
             LOGGER.error("Unable to parse post form fields: ", e.getMessage());
-            throw new ReportPortalException(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION, e);
+            throw new ReportPortalException(UNABLE_INTERACT_WITH_INTEGRATION, e);
           }
 
         });