diff --git a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
index 77476ddd..521bf81f 100644
--- a/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
+++ b/redaction-service-v1/redaction-service-api-v1/build.gradle.kts
@@ -7,7 +7,7 @@ description = "redaction-service-api-v1"
 
 dependencies {
     implementation("org.springframework:spring-web:6.0.12")
-    implementation("com.iqser.red.service:persistence-service-internal-api-v1:2.351.0")
+    implementation("com.iqser.red.service:persistence-service-internal-api-v1:maverick-mongo")
 }
 
 publishing {
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java
index b3ed26c4..c53107fb 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java
@@ -12,6 +12,7 @@ import com.iqser.red.service.persistence.management.v1.processor.document.Entity
 import com.iqser.red.service.persistence.management.v1.processor.document.EntityLogEntryDocument;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntityLogEntry;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 
 @Service
 public class EntityLogMongoService {
@@ -187,17 +188,11 @@ public class EntityLogMongoService {
     private static EntityLog fromDocument(EntityLogDocument entityLogDocument) {
 
         EntityLog entityLog = new EntityLog();
-        entityLog.setAnalysisVersion(entityLogDocument.getAnalysisVersion());
-        entityLog.setAnalysisNumber(entityLogDocument.getAnalysisNumber());
+        MagicConverter.copyAllFields(entityLogDocument, entityLog);
         entityLog.setEntityLogEntry(entityLogDocument.getEntityLogEntryDocument()
                                             .stream()
                                             .map(EntityLogMongoService::fromDocument)
                                             .collect(Collectors.toList()));
-        entityLog.setLegalBasis(entityLogDocument.getLegalBasis());
-        entityLog.setDictionaryVersion(entityLogDocument.getDictionaryVersion());
-        entityLog.setDossierDictionaryVersion(entityLogDocument.getDossierDictionaryVersion());
-        entityLog.setRulesVersion(entityLogDocument.getRulesVersion());
-        entityLog.setLegalBasisVersion(entityLogDocument.getLegalBasisVersion());
         return entityLog;
     }
 
@@ -205,30 +200,7 @@ public class EntityLogMongoService {
     private static EntityLogEntry fromDocument(EntityLogEntryDocument entityLogEntryDocument) {
 
         EntityLogEntry entityLogEntry = new EntityLogEntry();
-        entityLogEntry.setId(entityLogEntryDocument.getEntryId());
-        entityLogEntry.setState(entityLogEntryDocument.getState());
-        entityLogEntry.setValue(entityLogEntryDocument.getValue());
-        entityLogEntry.setReason(entityLogEntryDocument.getReason());
-        entityLogEntry.setMatchedRule(entityLogEntryDocument.getMatchedRule());
-        entityLogEntry.setLegalBasis(entityLogEntryDocument.getLegalBasis());
-        entityLogEntry.setContainingNodeId(new ArrayList<>(entityLogEntryDocument.getContainingNodeId()));
-        entityLogEntry.setClosestHeadline(entityLogEntryDocument.getClosestHeadline());
-        entityLogEntry.setSection(entityLogEntryDocument.getSection());
-        entityLogEntry.setPositions(new ArrayList<>(entityLogEntryDocument.getPositions()));
-        entityLogEntry.setTextBefore(entityLogEntryDocument.getTextBefore());
-        entityLogEntry.setTextAfter(entityLogEntryDocument.getTextAfter());
-        entityLogEntry.setStartOffset(entityLogEntryDocument.getStartOffset());
-        entityLogEntry.setEndOffset(entityLogEntryDocument.getEndOffset());
-        entityLogEntry.setImageHasTransparency(entityLogEntryDocument.isImageHasTransparency());
-        entityLogEntry.setDictionaryEntry(entityLogEntryDocument.isDictionaryEntry());
-        entityLogEntry.setDossierDictionaryEntry(entityLogEntryDocument.isDossierDictionaryEntry());
-        entityLogEntry.setExcluded(entityLogEntryDocument.isExcluded());
-        entityLogEntry.setChanges(new ArrayList<>(entityLogEntryDocument.getChanges()));
-        entityLogEntry.setManualChanges(new ArrayList<>(entityLogEntryDocument.getManualChanges()));
-        entityLogEntry.setEngines(new HashSet<>(entityLogEntryDocument.getEngines()));
-        entityLogEntry.setReference(new HashSet<>(entityLogEntryDocument.getReference()));
-        entityLogEntry.setImportedRedactionIntersections(new HashSet<>(entityLogEntryDocument.getImportedRedactionIntersections()));
-        entityLogEntry.setNumberOfComments(entityLogEntryDocument.getNumberOfComments());
+        MagicConverter.copyAllFields(entityLogEntryDocument, entityLogEntry);
         return entityLogEntry;
     }