diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..98d9bcb
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+17
diff --git a/Dockerfile_debug b/Dockerfile_debug
new file mode 100644
index 0000000..a903974
--- /dev/null
+++ b/Dockerfile_debug
@@ -0,0 +1,21 @@
+FROM eclipse-temurin:23
+COPY /build/libs/healenium-backend-*.jar /healenium-backend.jar
+CMD java -jar /healenium-backend.jar
+
+
+LABEL maintainer="healenium"
+
+ENV JAR=healenium-backend.jar
+ENV EXECUTABLE=run.sh
+
+WORKDIR /
+
+COPY /build/libs/healenium-backend-*.jar /${JAR}
+COPY run.sh /${EXECUTABLE}
+
+RUN chmod +x /${EXECUTABLE}
+
+EXPOSE 7878
+EXPOSE 5005
+
+CMD /${EXECUTABLE}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3b3f3eb..0acefd3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'com.epam.healenium'
-version '3.5.0'
+version '3.5.1'
 
 
 repositories {
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..e20bad2
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DEFAULT_JAVA_OPTIONS="-XX:+UseG1GC -XX:MaxRAMPercentage=75"
+DEBUG_OPTIONS=""
+
+if [ -n "${JAVA_DEBUG_ENABLE:-}" ] ||  [ -n "${JAVA_DEBUG:-}" ]; then
+    debug_port="${JAVA_DEBUG_PORT:-5005}"
+    DEBUG_OPTIONS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${debug_port}"
+fi
+
+echo -e "run.sh configuration:"
+echo -e "\tDEFAULT_JAVA_OPTIONS: ${DEFAULT_JAVA_OPTIONS:-}"
+echo -e "\tJAVA_OPTIONS: ${JAVA_OPTIONS:-}"
+echo -e "\tDEBUG_OPTIONS: ${DEBUG_OPTIONS:-}"
+
+java $DEFAULT_JAVA_OPTIONS $JAVA_OPTIONS $DEBUG_OPTIONS -jar /$JAR
+
diff --git a/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java b/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java
index 2be45f5..0d44929 100644
--- a/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java
@@ -369,16 +369,15 @@ private ReportRecord createReportRecord(RecordWrapper.Record record) {
     }
 
     private void setDeclaringClass(ReportRecord reportRecord, RecordWrapper.Record record) {
-        String className = getClassNameFromSelector(record);
+        String classNameFromSelector = getClassNameFromSelector(record);
 
-        if ("HealeniumFindElementPostRequest".equals(className)) {
+        if ("HealeniumFindElementPostRequest".equals(classNameFromSelector)) {
             reportRecord.setDeclaringClass(record.getFailedLocator().getValue());
+            return;
         }
-        else if (className != null && !className.trim().isEmpty()) {
-            reportRecord.setDeclaringClass(className);
-        } else {
-            setDeclaringClassFromRecord(reportRecord, record);
-        }
+
+        String classNameFromRecord = getDeclaringClassFromRecord(record);
+        reportRecord.setDeclaringClass(classNameFromRecord);
     }
 
     private String getClassNameFromSelector(RecordWrapper.Record record) {
@@ -389,18 +388,12 @@ private String getClassNameFromSelector(RecordWrapper.Record record) {
                 .orElse(null);
     }
 
-    private void setDeclaringClassFromRecord(ReportRecord reportRecord, RecordWrapper.Record record) {
+    private String getDeclaringClassFromRecord(RecordWrapper.Record record) {
         String className = record.getClassName();
-        if (className != null) {
-            String[] path = className.split("\\.");
-            if (path.length > 0) {
-                reportRecord.setDeclaringClass(path[path.length - 1]);
-            } else {
-                reportRecord.setDeclaringClass(className);
-            }
-        } else {
-            reportRecord.setDeclaringClass("Not Set");
+        if (className == null) {
+            return "Not Set";
         }
+        return className;
     }
 
     private void setCommonFields(ReportRecord reportRecord, RecordWrapper.Record record) {