diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
index 0759411..17a116a 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
@@ -13,6 +13,10 @@
     <artifactId>redaction-report-service-api-v1</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <properties>
+        <persistence-service.version>1.25.0</persistence-service.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <!-- This dependency contains annotations that are used in specifying REST endpoints. -->
@@ -29,8 +33,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>persistence-service-api-v1</artifactId>
-            <version>0.151.0</version>
-            <scope>compile</scope>
+            <version>${persistence-service.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
index 2f53c04..ff2c7ed 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
@@ -13,6 +13,11 @@
     <artifactId>redaction-report-service-server-v1</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <properties>
+        <persistence-service.version>1.25.0</persistence-service.version>
+        <redaction-service.version>3.68.0</redaction-service.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.iqser.red.service</groupId>
@@ -24,7 +29,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>redaction-service-api-v1</artifactId>
-            <version>3.21.0</version>
+            <version>${redaction-service.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.iqser.red.service</groupId>
@@ -33,18 +38,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>persistence-service-api-v1</artifactId>
-            <version>0.83.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>redaction-service-api-v1</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java
index 5c58cde..ae80abf 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/controller/StatusReportController.java
@@ -23,7 +23,7 @@ public class StatusReportController implements StatusReportResource {
     @Override
     public StatusReportResponse generateStatusReport(@PathVariable(DOSSIER_ID) String dossierId) {
 
-        Dossier dossier = dossierClient.getDossierById(dossierId, false);
+        Dossier dossier = dossierClient.getDossierById(dossierId, true,false);
         byte[] report = statusReportGenerationService.generateReport(dossier);
         return new StatusReportResponse(report, dossier.getDossierName() + ".xlsx");
     }
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
index 1e8b3b2..16597f4 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
@@ -30,10 +30,7 @@ public class RedactionLogConverterService {
 
             if (entry.isRedacted()) {
 
-                if (entry.getChanges() != null && entry.getChanges().size() > 1 && entry.getChanges()
-                        .get(entry.getChanges().size() - 1)
-                        .getType()
-                        .equals(ChangeType.REMOVED)) {
+                if(entry.lastChangeIsRemoved()){
                     return;
                 }
 
@@ -45,16 +42,6 @@ public class RedactionLogConverterService {
                     return;
                 }
 
-                if (entry.isManual() && entry.getManualRedactionType()
-                        .equals(ManualRedactionType.ADD) && !entry.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    return;
-                }
-
-                if (entry.isManual() && entry.getManualRedactionType()
-                        .equals(ManualRedactionType.REMOVE) && entry.getStatus().equals(AnnotationStatus.APPROVED)) {
-                    return;
-                }
-
                 Set<Integer> pages = new HashSet<>();
                 for (Rectangle position : entry.getPositions()) {
 
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
index d2ea5b7..39338ed 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
@@ -43,7 +43,7 @@ public class ReportGenerationService {
 
         List<StoredFileInformation> storedFileInformation = new ArrayList<>();
 
-        Dossier project = dossierClient.getDossierById(reportMessage.getDossierId(), false);
+        Dossier project = dossierClient.getDossierById(reportMessage.getDossierId(), true,false);
 
         List<ReportTemplate> singleFilesTemplates = new ArrayList<>();
         List<MultiFileWorkbook> multiFileWorkbooks = new ArrayList<>();
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java
index ecc6ecd..8cb3587 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationService.java
@@ -59,7 +59,7 @@ public class StatusReportGenerationService {
 
             String name = fileStatus.getFilename();
             OffsetDateTime uploadDate = fileStatus.getLastUploaded();
-            String assignedTo = fileStatus.getCurrentReviewer();
+            String assignedTo = fileStatus.getAssignee();
             var status = fileStatus.getWorkflowStatus();
             int pages = fileStatus.getNumberOfPages();
             var fileAttributes = fileStatus.getFileAttributes();
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java
index c9458d7..ff855d5 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/service/StatusReportGenerationServiceTest.java
@@ -47,13 +47,13 @@ public class StatusReportGenerationServiceTest {
         String dossierId = "dossierId";
 
         Dossier dossier = Dossier.builder().dossierName("dossierName").id(dossierId).build();
-        when(dossierClient.getDossierById(dossierId, false)).thenReturn(dossier);
+        when(dossierClient.getDossierById(dossierId, true,false)).thenReturn(dossier);
 
         FileModel fileStatus1 = FileModel.builder()
                 .dossierId(dossierId)
                 .filename("file1desJahrhunderts")
                 .lastUploaded(OffsetDateTime.now().minusHours(2))
-                .currentReviewer("me")
+                .assignee("me")
                 .workflowStatus(WorkflowStatus.APPROVED)
                 .numberOfPages(3)
                 .fileAttributes(Map.of("a", "A","config2","B2"  ))
@@ -64,7 +64,7 @@ public class StatusReportGenerationServiceTest {
                 .dossierId(dossierId)
                 .filename("file2desJahrtausendsGibtsJaNicht")
                 .lastUploaded(OffsetDateTime.now())
-                .currentReviewer("you")
+                .assignee("you")
                 .workflowStatus(WorkflowStatus.APPROVED)
                 .numberOfPages(21)
                 .fileAttributes(Map.of("config1","X1","y", "Y"))
@@ -85,4 +85,4 @@ public class StatusReportGenerationServiceTest {
 
     }
 
-}
\ No newline at end of file
+}