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 5798e5e9..9811f7db 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
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.mongo;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -108,6 +109,7 @@ public class EntityLogMongoService {
                                                          .toList());
     }
 
+
     public void deleteEntityLogEntries(String dossierId, String fileId, List<EntityLogEntry> entityLogEntries) {
 
         String entityLogId = EntityLogDocument.getDocumentId(dossierId, fileId);
@@ -187,11 +189,17 @@ public class EntityLogMongoService {
     private static EntityLog fromDocument(EntityLogDocument entityLogDocument) {
 
         EntityLog entityLog = new EntityLog();
-        ObjectConverterUtils.copyAllFields(entityLogDocument, entityLog);
+        entityLog.setAnalysisVersion(entityLogDocument.getAnalysisVersion());
+        entityLog.setAnalysisNumber(entityLogDocument.getAnalysisNumber());
         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;
     }
 
@@ -199,8 +207,30 @@ public class EntityLogMongoService {
     private static EntityLogEntry fromDocument(EntityLogEntryDocument entityLogEntryDocument) {
 
         EntityLogEntry entityLogEntry = new EntityLogEntry();
-        ObjectConverterUtils.copyAllFields(entityLogEntryDocument, 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());
         return entityLogEntry;
     }