RED-3553 If image overlaps entity and the entity will be removed

Pull request #350 : Removed processed date filter for add to dictionary entries
Merge in RED/redaction-service from RED-3538 to master * commit '7b2295393c1c2dcbcecbb11c64929517cb13a6de': Removed processed date filter for add to dictionary entries
2022-03-17 09:45:17 +01:00 · 2022-03-16 15:46:13 +01:00 · 2022-03-16 16:29:30 +02:00 · 2022-03-14 16:36:14 +01:00 · 2022-03-14 17:29:04 +02:00 · 2022-03-14 17:27:52 +02:00
146 changed files with 9551 additions and 3211 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.2.2</version>
+    <version>8.0.3</version>
    <relativePath/>
  </parent>

@@ -1,5 +1,8 @@
 package buildjob;

+import java.time.DayOfWeek;
+import java.time.LocalTime;
+
 import com.atlassian.bamboo.specs.api.BambooSpec;
 import com.atlassian.bamboo.specs.api.builders.BambooKey;
 import com.atlassian.bamboo.specs.api.builders.docker.DockerConfiguration;
@@ -19,6 +22,8 @@ import com.atlassian.bamboo.specs.builders.task.ScriptTask;
 import com.atlassian.bamboo.specs.builders.task.VcsCheckoutTask;
 import com.atlassian.bamboo.specs.builders.task.VcsTagTask;
 import com.atlassian.bamboo.specs.builders.trigger.BitbucketServerTrigger;
+import com.atlassian.bamboo.specs.builders.trigger.RepositoryPollingTrigger;
+import com.atlassian.bamboo.specs.builders.trigger.ScheduledTrigger;
 import com.atlassian.bamboo.specs.model.task.InjectVariablesScope;
 import com.atlassian.bamboo.specs.util.BambooServer;
 import com.atlassian.bamboo.specs.builders.task.ScriptTask;
@@ -50,12 +55,18 @@ public class PlanSpec {
        bambooServer.publish(plan);
        PlanPermissions planPermission = new PlanSpec().createPlanPermission(plan.getIdentifier());
        bambooServer.publish(planPermission);
+
+        Plan secPlan = new PlanSpec().createSecBuild();
+        bambooServer.publish(secPlan);
+        PlanPermissions secPlanPermission = new PlanSpec().createPlanPermission(secPlan.getIdentifier());
+        bambooServer.publish(secPlanPermission);
    }

    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
        Permissions permission = new Permissions()
                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                .loggedInUserPermissions(PermissionType.VIEW)
                .anonymousUserPermissionView();
        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
@@ -119,4 +130,45 @@ public class PlanSpec {
                                .whenInactiveInRepositoryAfterDays(14))
                        .notificationForCommitters());
    }
+
+    public Plan createSecBuild() {
+        return new Plan(
+                project(),
+                SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC"))
+                .description("Security Analysis Plan")
+                .stages(new Stage("Default Stage")
+                        .jobs(new Job("Default Job",
+                                new BambooKey("JOB1"))
+                                .tasks(
+                                        new ScriptTask()
+                                                .description("Clean")
+                                                .inlineBody("#!/bin/bash\n" +
+                                                        "set -e\n" +
+                                                        "rm -rf ./*"),
+                                        new VcsCheckoutTask()
+                                                .description("Checkout Default Repository")
+                                                .checkoutItems(new CheckoutItem().defaultRepository()),
+                                        new ScriptTask()
+                                                .description("Sonar")
+                                                .location(Location.FILE)
+                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
+                                                .argument(SERVICE_NAME))
+                                .dockerConfiguration(
+                                        new DockerConfiguration()
+                                                .image("nexus.iqser.com:5001/infra/maven:3.6.2-jdk-13-3.0.0")
+                                                .dockerRunArguments("--net=host")
+                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
+                                )
+                        )
+                )
+                .linkedRepositories("RED / " + SERVICE_NAME)
+                .triggers(
+                        new ScheduledTrigger()
+                                .scheduleOnceDaily(LocalTime.of(12, 00)),
+                        new BitbucketServerTrigger())
+                .planBranchManagement(new PlanBranchManagement()
+                        .createForVcsBranchMatching("release.*")
+                        .notificationForCommitters());
+    }
 }
@@ -0,0 +1,48 @@
+#!/bin/bash
+set -e
+
+SERVICE_NAME=$1
+
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    --no-transfer-progress \
+    clean install \
+    -Djava.security.egd=file:/dev/./urandomelse
+
+echo "dependency-check:aggregate"
+${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+    --no-transfer-progress \
+    -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+    org.owasp:dependency-check-maven:aggregate
+
+if [[ -z "${bamboo_repository_pr_key}" ]]
+then
+    echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+            --no-transfer-progress \
+            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+            sonar:sonar \
+            -Dsonar.projectKey=RED_$SERVICE_NAME \
+            -Dsonar.host.url=https://sonarqube.iqser.com \
+            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+            -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
+            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+            
+else
+    echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
+    ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
+            --no-transfer-progress \
+            -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
+            sonar:sonar \
+            -Dsonar.projectKey=RED_$SERVICE_NAME \
+            -Dsonar.host.url=https://sonarqube.iqser.com \
+            -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
+            -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
+            -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
+            -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
+            -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
+            -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
+            -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
+fi
@@ -11,7 +11,9 @@ public class PlanSpecTest {
    @Test
    public void checkYourPlanOffline() throws PropertiesValidationException {
        Plan plan = new PlanSpec().createPlan();
-
        EntityPropertiesBuilders.build(plan);
+
+        Plan secPlan = new PlanSpec().createSecBuild();
+        EntityPropertiesBuilders.build(secPlan);
    }
 }
@@ -5,7 +5,8 @@
    <parent>
        <groupId>com.iqser.red</groupId>
        <artifactId>platform-docker-dependency</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
+        <relativePath />
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -1,4 +1,4 @@
-FROM red/base-image:1.0.0
+FROM red/redaction-service-base-v1:1.0.0

 ARG PLATFORM_JAR

@@ -7,12 +7,3 @@ ENV PLATFORM_JAR ${PLATFORM_JAR}
 ENV USES_ELASTICSEARCH false

 COPY ["${PLATFORM_JAR}", "/"]
-
-RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    wget cabextract xfonts-utils fonts-liberation \
- && rm -rf /var/lib/apt/lists/*
-
-RUN curl http://ftp.br.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-mscorefonts-installer_3.7_all.deb -o /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && dpkg -i /tmp/ttf-mscorefonts-installer_3.7_all.deb \
- && rm /tmp/ttf-mscorefonts-installer_3.7_all.deb \
@@ -5,7 +5,8 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.1.2</version>
+        <version>1.6.0</version>
+        <relativePath />
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -13,7 +14,6 @@
    <groupId>com.iqser.red.service</groupId>
    <version>1.0-SNAPSHOT</version>

-
    <packaging>pom</packaging>

    <modules>
@@ -22,7 +22,7 @@
    </modules>

    <properties>
-        <pdfbox.version>2.0.21</pdfbox.version>
+        <pdfbox.version>2.0.24</pdfbox.version>
    </properties>


@@ -32,7 +32,7 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.3.1</version>
+                <version>1.11.0</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>
@@ -52,4 +52,63 @@

    </dependencyManagement>

+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>3.9.0.2155</version>
+                    </plugin>                    
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>6.3.1</version>
+                    <configuration>
+                        <format>ALL</format>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.7</version>
+                <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
@@ -11,6 +11,10 @@

    <artifactId>redaction-service-api-v1</artifactId>

+    <properties>
+        <persistence-service.version>1.85.0</persistence-service.version>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>org.springframework</groupId>
@@ -19,14 +23,8 @@
        </dependency>
        <dependency>
            <groupId>com.iqser.red.service</groupId>
-            <artifactId>configuration-service-api-v1</artifactId>
-            <version>2.11.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>file-management-service-api-v1</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>persistence-service-api-v1</artifactId>
+            <version>${persistence-service.version}</version>
        </dependency>
    </dependencies>
 </project>
@@ -1,24 +1,40 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.time.OffsetDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
 public class AnalyzeRequest {

+    private MessageType messageType;
+
    private String dossierId;
    private String fileId;
    private String dossierTemplateId;
-    private boolean reanalyseOnlyIfPossible;
    private ManualRedactions manualRedactions;
    private OffsetDateTime lastProcessed;
+    private int analysisNumber;
+
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
+    @Builder.Default
+    private Set<Integer> sectionsToReanalyse = new HashSet<>();
+
+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();

 }

@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,20 +13,25 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
 public class AnalyzeResult {

+    private MessageType messageType;
+
    private String dossierId;
    private String fileId;
    private long duration;
    private int numberOfPages;
-    private boolean hasHints;
-    private boolean hasRequests;
-    private boolean hasRedactions;
-    private boolean hasImages;
    private boolean hasUpdates;
    private long dictionaryVersion;
    private long dossierDictionaryVersion;
    private long rulesVersion;
    private long legalBasisVersion;

+    private boolean wasReanalyzed;
+
+    private int analysisVersion;
+    private int analysisNumber;
+
+    private ManualRedactions manualRedactions;
+

 }

@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.model;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -14,4 +16,5 @@ public class AnnotateRequest {
    private String dossierId;
    private String dossierTemplateId;
    private String fileId;
+    private ManualRedactions manualRedactions;
 }
@@ -1,4 +1,4 @@
-package com.iqser.red.service.redaction.v1.server.client;
+package com.iqser.red.service.redaction.v1.model;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -7,7 +7,9 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class ImageClassificationResponse {
+public class Argument {

-    private String category;
-}
+    private String name;
+    private ArgumentType type;
+
+}
@@ -0,0 +1,7 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ArgumentType {
+
+    INTEGER, BOOLEAN, STRING, FILE_ATTRIBUTE, REGEX, TYPE, RULE_NUMBER, LEGAL_BASIS, REFERENCE_TYPE
+
+}
@@ -1,21 +1,19 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.time.OffsetDateTime;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.time.OffsetDateTime;
-
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class Comment {
-
-    private String id;
-    private OffsetDateTime date;
-    private String text;
-    private String user;
+public class Change {

+    private int analysisNumber;
+    private ChangeType type;
+    private OffsetDateTime dateTime;
 }
@@ -1,5 +1,5 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ChangeType {
-    ADDED, REMOVED
+    ADDED, REMOVED, CHANGED
 }
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Engine {
+    DICTIONARY, NER, RULE
+}
@@ -7,13 +7,13 @@ import lombok.NoArgsConstructor;

@Data
@Builder
-@AllArgsConstructor
@NoArgsConstructor
-public class ManualForceRedact {
+@AllArgsConstructor
+public class FileAttribute {

    private String id;
-    private String user;
-    private Status status;
-    private String legalBasis;
+    private String label;
+    private String placeholder;
+    private String value;

-}
+}
@@ -1,32 +1,21 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.List;
-
@Data
@Builder
-@AllArgsConstructor
@NoArgsConstructor
-public class ManualRedactionEntry {
+@AllArgsConstructor
+public class ImportedRedaction {

    private String id;
-    private String user;
-    private String type;
-    private String value;
-    private String reason;
-    private String legalBasis;
+
+    @Builder.Default
    private List<Rectangle> positions = new ArrayList<>();
-    private Status status;
-    private boolean addToDictionary;
-
-    private String section;
-    private int sectionNumber;
-
-    private boolean addToDossierDictionary;
-
 }
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImportedRedactions {
+
+    @Builder.Default
+    private Map<Integer, List<ImportedRedaction>> importedRedactions = new HashMap<>();
+}
@@ -0,0 +1,48 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.BaseAnnotation;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ManualChange {
+
+    private AnnotationStatus annotationStatus;
+    private ManualRedactionType manualRedactionType;
+    private OffsetDateTime processedDate;
+    private String userId;
+    private Map<String, Object> propertyChanges = new HashMap<>();
+
+    public boolean isProcessed() {
+        return processedDate != null;
+    }
+
+    public static ManualChange from(BaseAnnotation baseAnnotation) {
+        ManualChange manualChange = new ManualChange();
+        manualChange.annotationStatus = baseAnnotation.getStatus();
+        manualChange.processedDate = baseAnnotation.getProcessedDate();
+        manualChange.userId = baseAnnotation.getUser();
+        return manualChange;
+    }
+
+    public ManualChange withManualRedactionType(ManualRedactionType manualRedactionType) {
+        this.manualRedactionType = manualRedactionType;
+        return this;
+    }
+
+    public ManualChange withChange(String property, Object value) {
+        this.propertyChanges.put(property, value);
+        return this;
+    }
+
+}
@@ -1,5 +1,13 @@
 package com.iqser.red.service.redaction.v1.model;

 public enum ManualRedactionType {
-    ADD, REMOVE, FORCE_REDACT
+    ADD_LOCALLY,
+    ADD_TO_DICTIONARY,
+    REMOVE_LOCALLY,
+    REMOVE_FROM_DICTIONARY,
+    FORCE_REDACT,
+    FORCE_HINT,
+    RECATEGORIZE,
+    LEGAL_BASIS_CHANGE,
+    RESIZE
 }
@@ -1,32 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ManualRedactions {
-
-    @Builder.Default
-    private Set<IdRemoval> idsToRemove = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualForceRedact> forceRedacts = new HashSet<>();
-
-    @Builder.Default
-    private Set<ManualRedactionEntry> entriesToAdd = new HashSet<>();
-
-    @Builder.Default
-    private Map<String, List<Comment>> comments = new HashMap<>();
-
-}
@@ -0,0 +1,7 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum MessageType {
+
+    ANALYSE, REANALYSE, STRUCTURE_ANALYSE, SURROUNDING_TEXT
+
+}
@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class RedactionChangeLog {
-
-    private List<RedactionChangeLogEntry> redactionLogEntry = new ArrayList<>();
-
-    private long dictionaryVersion = -1;
-    private long dossierDictionaryVersion = -1;
-    private long rulesVersion = -1;
-    private long legalBasisVersion = -1;
-
-}
@@ -1,47 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RedactionChangeLogEntry {
-
-    private String id;
-    private String type;
-    private String value;
-    private String reason;
-    private int matchedRule;
-    private String legalBasis;
-    private boolean redacted;
-    private boolean isHint;
-    private boolean isRecommendation;
-    private String section;
-    private float[] color;
-
-    @Builder.Default
-    private List<Rectangle> positions = new ArrayList<>();
-    private int sectionNumber;
-    private boolean manual;
-    private Status status;
-    private ManualRedactionType manualRedactionType;
-    private boolean isDictionaryEntry;
-
-    private String textBefore;
-    private String textAfter;
-
-    @Builder.Default
-    private List<Comment> comments = new ArrayList<>();
-
-    private ChangeType changeType;
-
-    private boolean isDossierDictionaryEntry;
-
-}
@@ -1,21 +1,35 @@
 package com.iqser.red.service.redaction.v1.model;

-import com.iqser.red.service.configuration.v1.api.model.LegalBasisMapping;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 import lombok.AllArgsConstructor;
 import lombok.Data;

 import java.util.List;

+
@Data
@AllArgsConstructor
 public class RedactionLog {

+
+    /**
+     * Version 0 Redaction Logs have manual redactions merged inside them
+     * Version 1 Redaction Logs only contain system ( rule/dictionary ) redactions. Manual Redactions are merged in at runtime.
+     */
+    private long analysisVersion;
+
+    /**
+     * Which analysis created this redactionLog.
+     */
+    private int analysisNumber;
+
    private List<RedactionLogEntry> redactionLogEntry;
-    private List<LegalBasisMapping> legalBasis;
+    private List<LegalBasis> legalBasis;

    private long dictionaryVersion = -1;
    private long dossierDictionaryVersion = -1;
    private long rulesVersion = -1;
    private long legalBasisVersion = -1;

+
 }
@@ -9,11 +9,9 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
-public class IdRemoval {
+public class RedactionLogChanges {

-    private String id;
-    private String user;
-    private Status status;
-    private boolean removeFromDictionary;
+    private RedactionLog redactionLog;
+    private boolean hasChanges;

-}
+}
@@ -1,13 +1,11 @@
 package com.iqser.red.service.redaction.v1.model;

-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import lombok.*;
+
+import java.util.*;

-import java.util.ArrayList;
-import java.util.List;

@Data
@Builder
@@ -21,20 +19,22 @@ public class RedactionLogEntry {
    private String value;
    private String reason;
    private int matchedRule;
+    private boolean rectangle;
    private String legalBasis;
+
+    private boolean imported;
+
    private boolean redacted;
    private boolean isHint;
    private boolean isRecommendation;
+
    private String section;
    private float[] color;

    @Builder.Default
    private List<Rectangle> positions = new ArrayList<>();
    private int sectionNumber;
-    private boolean manual;
-    private Status status;
-    private ManualRedactionType manualRedactionType;
-    private boolean isDictionaryEntry;
+

    private String textBefore;
    private String textAfter;
@@ -46,7 +46,41 @@ public class RedactionLogEntry {
    private int endOffset;

    private boolean isImage;
+    private boolean imageHasTransparency;

+    private boolean isDictionaryEntry;
    private boolean isDossierDictionaryEntry;

+    private boolean excluded;
+
+    @EqualsAndHashCode.Exclude
+    @Builder.Default
+    private List<Change> changes = new ArrayList<>();
+
+    @EqualsAndHashCode.Exclude
+    @Builder.Default
+    private List<ManualChange> manualChanges = new ArrayList<>();
+
+    private Set<Engine> engines = new HashSet<>();
+
+    private Set<String> reference = new HashSet<>();
+
+    public boolean lastChangeIsRemoved() {
+        return last(changes).map(c -> c.getType() == ChangeType.REMOVED).orElse(false);
+    }
+
+    public boolean isLocalManualRedaction() {
+        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.ADD_LOCALLY &&
+                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
+    }
+
+    public boolean isManuallyRemoved() {
+        return manualChanges.stream().anyMatch(mc -> mc.getManualRedactionType() == ManualRedactionType.REMOVE_LOCALLY &&
+                mc.getAnnotationStatus() == AnnotationStatus.APPROVED);
+    }
+
+    private <T> Optional<T> last(List<T> list) {
+        return list.isEmpty() ? Optional.empty() : Optional.of(list.get(list.size() - 1));
+    }
+
 }
@@ -1,5 +1,10 @@
 package com.iqser.red.service.redaction.v1.model;

+import java.util.HashSet;
+import java.util.Set;
+
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,4 +20,6 @@ public class RedactionRequest {
    private String fileId;
    private String dossierTemplateId;
    private ManualRedactions manualRedactions;
+    @Builder.Default
+    private Set<Integer> excludedPages = new HashSet<>();
 }
@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class RuleBuilderModel {
+
+    private List<RuleElement> whenClauses = new ArrayList<>();
+    private List<RuleElement> thenConditions = new ArrayList<>();
+
+}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RuleElement {
+
+    private String conditionName;
+    private List<Argument> arguments = new ArrayList<>();
+
+}
@@ -30,4 +30,9 @@ public class SectionArea {
        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeft().getX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeft().getX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeft().getY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeft().getY() + other.getHeight();
    }

+    // TODO we should only use one rectangle class.
+    public boolean contains(com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle other) {
+        return page == other.getPage() && this.topLeft.getX() <= other.getTopLeftX() && this.topLeft.getX() + this.getWidth() >= other.getTopLeftX() + other.getWidth() && this.getTopLeft().getY() <= other.getTopLeftY() && this.getTopLeft().getY() + this.getHeight() >= other.getTopLeftY() + other.getHeight();
+    }
+
 }
@@ -3,10 +3,9 @@ package com.iqser.red.service.redaction.v1.model;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;

@Data
@AllArgsConstructor
@@ -15,4 +14,16 @@ public class SectionGrid {

    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();

+    private List<SectionGridSection> sections = new ArrayList<>();
+
+    @Data
+    @RequiredArgsConstructor
+    public static class SectionGridSection {
+
+        private final int sectionNumber;
+        private final String headline;
+        private final Set<Integer> pages;
+        private final List<SectionArea> sectionAreas;
+
+    }
 }
@@ -30,4 +30,5 @@ public class SectionRectangle {
    private int numberOfParts;

    private List<CellRectangle> tableCells;
+
 }
@@ -1,5 +0,0 @@
-package com.iqser.red.service.redaction.v1.model;
-
-public enum Status {
-    REQUESTED, APPROVED, DECLINED
-}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class StructureAnalyzeRequest {
+
+    private String dossierId;
+    private String fileId;
+
+}
+
@@ -1,35 +1,43 @@
 package com.iqser.red.service.redaction.v1.resources;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
 import com.iqser.red.service.redaction.v1.model.*;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;

 public interface RedactionResource {

-    String SERVICE_NAME = "redaction-service-v1";
-
-    String RULE_SET_PARAMETER_NAME = "dossierTemplateId";
-    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
-
-
    @PostMapping(value = "/annotate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest);

+
    @PostMapping(value = "/debug/classifications", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult classify(@RequestBody RedactionRequest redactionRequest);

+
    @PostMapping(value = "/debug/sections", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult sections(@RequestBody RedactionRequest redactionRequest);

+
    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);

-    @PostMapping(value = "/rules/update" + RULE_SET_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String dossierTemplateId);

    @PostMapping(value = "/rules/test", consumes = MediaType.APPLICATION_JSON_VALUE)
    void testRules(@RequestBody String rules);

+
+    @PostMapping(value = "/redaction-log/preview", consumes = MediaType.APPLICATION_JSON_VALUE)
+    RedactionLog getRedactionLog(@RequestBody RedactionRequest redactionRequest);
+
+
+    @PostMapping(value = "/manual/surrounding-text/{dossierId}/{fileId}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
+                                        @PathVariable("fileId") String fileId,
+                                        @RequestBody ManualRedactions manualRedactions);
+
 }
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.resources;
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+public interface RuleBuilderResource {
+
+    @PostMapping(value = "/rule-builder-model", produces = MediaType.APPLICATION_JSON_VALUE)
+    RuleBuilderModel getRuleBuilderModel();
+
+}
@@ -11,6 +11,14 @@

    <artifactId>redaction-service-server-v1</artifactId>

+    <properties>
+        <drools.version>7.59.0.Final</drools.version>
+        <kie.version>7.59.0.Final</kie.version>
+        <locationtech.version>1.16.1</locationtech.version>
+        <pdfbox.jbig2-imageio.version>3.0.3</pdfbox.jbig2-imageio.version>
+        <jai-imageio.version>1.4.0</jai-imageio.version>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>com.iqser.red.commons</groupId>
@@ -21,56 +29,40 @@
            <artifactId>redaction-service-api-v1</artifactId>
            <version>${project.version}</version>
        </dependency>
-        <dependency>
-            <groupId>com.iqser.red.service</groupId>
-            <artifactId>file-management-service-api-v1</artifactId>
-            <version>2.25.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>redaction-service-api-v1</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>configuration-service-api-v1</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
            <artifactId>drools-core</artifactId>
-            <version>7.37.0.Final</version>
+            <version>${drools.version}</version>
        </dependency>
        <dependency>
            <groupId>org.kie</groupId>
            <artifactId>kie-spring</artifactId>
-            <version>7.37.0.Final</version>
+            <version>${kie.version}</version>
        </dependency>
        <dependency>
            <groupId>org.locationtech.jts</groupId>
            <artifactId>jts-core</artifactId>
-            <version>1.16.1</version>
+            <version>${locationtech.version}</version>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
        </dependency>

        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>jbig2-imageio</artifactId>
-            <version>3.0.3</version>
+            <version>${pdfbox.jbig2-imageio.version}</version>
        </dependency>
        <dependency>
            <groupId>com.github.jai-imageio</groupId>
            <artifactId>jai-imageio-core</artifactId>
-            <version>1.4.0</version>
+            <version>${jai-imageio.version}</version>
        </dependency>
        <dependency>
            <groupId>com.github.jai-imageio</groupId>
            <artifactId>jai-imageio-jpeg2000</artifactId>
-            <version>1.4.0</version>
+            <version>${jai-imageio.version}</version>
        </dependency>

        <!-- commons -->
@@ -87,10 +79,6 @@
            <artifactId>metric-commons</artifactId>
        </dependency>
        <!-- other external -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
        <dependency>
            <groupId>org.apache.pdfbox</groupId>
            <artifactId>pdfbox</artifactId>
@@ -108,7 +96,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-amqp</artifactId>
-            <version>2.3.1.RELEASE</version>
        </dependency>

        <!-- test dependencies -->
@@ -122,12 +109,6 @@
            <artifactId>test-commons</artifactId>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit-test</artifactId>
-            <version>2.3.1</version>
-            <scope>test</scope>
-        </dependency>
    </dependencies>

    <build>
@@ -1,19 +1,14 @@
 package com.iqser.red.service.redaction.v1.server.classification.model;

-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.iqser.red.service.redaction.v1.model.SectionGrid;
 import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
@Data
@NoArgsConstructor
 public class Document {
@@ -23,20 +18,14 @@ public class Document {
    private List<Header> headers = new ArrayList<>();
    private List<Footer> footers = new ArrayList<>();
    private List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();
-    private Map<Integer, List<Entity>> entities = new HashMap<>();
    private FloatFrequencyCounter textHeightCounter = new FloatFrequencyCounter();
    private FloatFrequencyCounter fontSizeCounter = new FloatFrequencyCounter();
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();
    private boolean headlines;

-    private List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
    private SectionGrid sectionGrid = new SectionGrid();
    private DictionaryVersion dictionaryVersion;
    private long rulesVersion;

-    private List<SectionText> sectionText = new ArrayList<>();
-
-    private Map<Integer, Set<Image>> images = new HashMap<>();
-
 }
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;

+import java.util.ArrayList;
 import java.util.List;

@Data
@@ -16,7 +17,7 @@ public class Page {
    @NonNull
    private List<AbstractTextContainer> textBlocks;

-    private List<PdfImage> images;
+    private List<PdfImage> images = new ArrayList<>();

    private Rectangle bodyTextFrame;

@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.classification.service;

+import static java.util.stream.Collectors.toSet;
+
 import com.iqser.red.service.redaction.v1.server.classification.model.FloatFrequencyCounter;
 import com.iqser.red.service.redaction.v1.server.classification.model.Orientation;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
@@ -16,6 +18,7 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import org.springframework.stereotype.Service;

 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;

@@ -25,9 +28,12 @@ public class BlockificationService {

    static final float THRESHOLD = 1f;

+
    public Page blockify(List<TextPositionSequence> textPositions, List<Ruling> horizontalRulingLines,
                         List<Ruling> verticalRulingLines) {

+        sortRotatedSequences(textPositions);
+
        List<TextPositionSequence> chunkWords = new ArrayList<>();
        List<AbstractTextContainer> chunkBlockList1 = new ArrayList<>();

@@ -50,7 +56,7 @@ public class BlockificationService {
            if (prev != null && (lineSeparation || startFromTop || splitByX || newLineAfterSplit || splittedByRuling)) {

                Orientation prevOrientation = null;
-                if(!chunkBlockList1.isEmpty()) {
+                if (!chunkBlockList1.isEmpty()) {
                    prevOrientation = chunkBlockList1.get(chunkBlockList1.size() - 1).getOrientation();
                }

@@ -62,15 +68,11 @@ public class BlockificationService {
                    wasSplitted = true;
                    cb1.setOrientation(Orientation.LEFT);
                    splitX1 = word.getX1();
-                } else
-
-                if (newLineAfterSplit && !splittedByRuling) {
+                } else if (newLineAfterSplit && !splittedByRuling) {
                    wasSplitted = false;
                    cb1.setOrientation(Orientation.RIGHT);
                    splitX1 = null;
-                } else
-
-                if(prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)){
+                } else if (prevOrientation != null && prevOrientation.equals(Orientation.RIGHT) && (lineSeparation || !startFromTop || !splitByX || !newLineAfterSplit || !splittedByRuling)) {
                    cb1.setOrientation(Orientation.LEFT);
                }

@@ -110,16 +112,18 @@ public class BlockificationService {
        while (itty.hasNext()) {
            TextBlock block = (TextBlock) itty.next();

-            if(previousLeft != null && block.getOrientation().equals(Orientation.LEFT)){
-                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft.getMinY()){
+            if (previousLeft != null && block.getOrientation().equals(Orientation.LEFT)) {
+                if (previousLeft.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousLeft
+                        .getMinY()) {
                    previousLeft.add(block);
                    itty.remove();
                    continue;
                }
            }

-            if(previousRight != null && block.getOrientation().equals(Orientation.RIGHT)){
-                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight.getMinY()){
+            if (previousRight != null && block.getOrientation().equals(Orientation.RIGHT)) {
+                if (previousRight.getMinY() > block.getMinY() && block.getMaxY() + block.getMostPopularWordHeight() > previousRight
+                        .getMinY()) {
                    previousRight.add(block);
                    itty.remove();
                    continue;
@@ -133,16 +137,16 @@ public class BlockificationService {
            }
        }

-
        itty = chunkBlockList1.iterator();
        TextBlock previous = null;
        while (itty.hasNext()) {
            TextBlock block = (TextBlock) itty.next();

-            if(previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous
-                    .getMaxY())||
-                    previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation().equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous
-                    .getMaxY())){
+            if (previous != null && previous.getOrientation().equals(Orientation.LEFT) && block.getOrientation()
+                    .equals(Orientation.LEFT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY()) || previous != null && previous
+                    .getOrientation()
+                    .equals(Orientation.LEFT) && block.getOrientation()
+                    .equals(Orientation.RIGHT) && equalsWithThreshold(block.getMaxY(), previous.getMaxY())) {
                previous.add(block);
                itty.remove();
                continue;
@@ -151,11 +155,12 @@ public class BlockificationService {
            previous = block;
        }

-
        return new Page(chunkBlockList1);
    }

-    private boolean equalsWithThreshold(float f1, float f2){
+
+    private boolean equalsWithThreshold(float f1, float f2) {
+
        return Math.abs(f1 - f2) < THRESHOLD;
    }

@@ -197,6 +202,13 @@ public class BlockificationService {
            textBlock.setHighestFontSize(fontSizeFrequencyCounter.getHighest());
        }

+        if (textBlock != null && textBlock.getSequences() != null && textBlock.getSequences()
+                .stream()
+                .map(t -> round(t.getY1(), 3))
+                .collect(toSet())
+                .size() == 1) {
+            textBlock.getSequences().sort(Comparator.comparing(TextPositionSequence::getX1));
+        }
        return textBlock;
    }

@@ -291,4 +303,30 @@ public class BlockificationService {
        return new Rectangle(minY, minX, maxX - minX, maxY - minY);
    }

+
+    private void sortRotatedSequences(List<TextPositionSequence> sequences) {
+
+        List<TextPositionSequence> rotatedWords = new ArrayList<>();
+        Iterator<TextPositionSequence> itty = sequences.iterator();
+        while (itty.hasNext()) {
+            var pos = itty.next();
+            if (pos.getTextPositions().get(0).getDir() == 270) {
+                rotatedWords.add(pos);
+                itty.remove();
+            }
+        }
+
+        if (!rotatedWords.isEmpty() && !sequences.isEmpty()) {
+            rotatedWords.sort(Comparator.comparing(TextPositionSequence::getX1));
+        }
+        sequences.addAll(rotatedWords);
+    }
+
+
+    private double round(float value, int decimalPoints) {
+
+        var d = Math.pow(10, decimalPoints);
+        return Math.round(value * d) / d;
+    }
+
 }
@@ -73,8 +73,10 @@ public class ClassificationService {
            }
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
                .getFontSizeCounter()
-                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
-                .equals("bold")) {
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && (textBlock.getMostPopularWordStyle()
+                .equals("bold") || !document.getFontStyleCounter().getCountPerValue().containsKey("bold") && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() + 1) && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -86,7 +88,7 @@ public class ClassificationService {
                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
                .equals("bold") && !document.getFontStyleCounter()
                .getMostPopular()
-                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9 && textBlock.getSequences().get(0).getTextPositions().get(0).getFontSizeInPt() >= textBlock.getMostPopularWordFontSize()) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
@@ -1,8 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.client;

-import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
 import org.springframework.cloud.openfeign.FeignClient;

-@FeignClient(name = "DictionaryResource", url = "${configuration-service.url}")
+import com.iqser.red.service.persistence.service.v1.api.resources.DictionaryResource;
+
+@FeignClient(name = "DictionaryResource", url = "${persistence-service.url}")
 public interface DictionaryClient extends DictionaryResource {
 }
@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.iqser.red.service.redaction.v1.server.client.model.EntityRecognitionRequest;
+import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
+
+@FeignClient(name = "EntityRecognitionClient", url = "${entity-recognition-service.url}")
+public interface EntityRecognitionClient {
+
+    @PostMapping(value = "/find_authors", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    NerEntities findAuthors(EntityRecognitionRequest entityRecognitionRequest);
+
+}
@@ -1,9 +1,10 @@
 package com.iqser.red.service.redaction.v1.server.client;


-import com.iqser.red.service.file.management.v1.api.resources.FileStatusProcessingUpdateResource;
 import org.springframework.cloud.openfeign.FeignClient;

-@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${file-management-service.url}")
+import com.iqser.red.service.persistence.service.v1.api.resources.FileStatusProcessingUpdateResource;
+
+@FeignClient(name = "FileStatusProcessingUpdateResource", url = "${persistence-service.url}")
 public interface FileStatusProcessingUpdateClient extends FileStatusProcessingUpdateResource {
 }
@@ -1,15 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.client;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.multipart.MultipartFile;
-
-@FeignClient(name = "ImageClassificationResource", url = "${image-service.url}")
-public interface ImageClassificationClient {
-
-    @PostMapping(value = "/process_full_img", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ImageClassificationResponse classify(@RequestBody MultipartFile file);
-
-}
@@ -1,8 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.client;

-import com.iqser.red.service.configuration.v1.api.resource.LegalBasisMappingResource;
 import org.springframework.cloud.openfeign.FeignClient;

-@FeignClient(name = "LegalBasisMappingResource", url = "${configuration-service.url}")
+import com.iqser.red.service.persistence.service.v1.api.resources.LegalBasisMappingResource;
+
+@FeignClient(name = "LegalBasisMappingResource", url = "${persistence-service.url}")
 public interface LegalBasisClient extends LegalBasisMappingResource {
 }
@@ -1,8 +1,9 @@
 package com.iqser.red.service.redaction.v1.server.client;

-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
 import org.springframework.cloud.openfeign.FeignClient;

-@FeignClient(name = "RulesResource", url = "${configuration-service.url}")
+import com.iqser.red.service.persistence.service.v1.api.resources.RulesResource;
+
+@FeignClient(name = "RulesResource", url = "${persistence-service.url}")
 public interface RulesClient extends RulesResource {
 }
@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EntityRecogintionEntity {
+
+      private String value;
+      private int startOffset;
+      private int endOffset;
+      private String type;
+
+}
@@ -0,0 +1,18 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EntityRecognitionRequest {
+
+   private List<EntityRecognitionSection> data;
+
+}
@@ -0,0 +1,20 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EntityRecognitionResult {
+
+    @Builder.Default
+    private Map<Integer, List<EntityRecogintionEntity>> entities = new HashMap<>();
+}
@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class EntityRecognitionSection {
+
+    private int sectionNumber;
+    private String text;
+}
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.client.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class NerEntities {
+
+   @Builder.Default
+   private Map<Integer, List<EntityRecogintionEntity>> result = new HashMap<>();
+
+}
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.controller;

 import com.iqser.red.commons.spring.ErrorMessage;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -36,4 +37,11 @@ public class ControllerAdvice {
        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
    }

+    @ResponseBody
+    @ResponseStatus(value = HttpStatus.NOT_FOUND)
+    @ExceptionHandler(value = NotFoundException.class)
+    public ErrorMessage handleFileNotFoundException(NotFoundException e) {
+        return new ErrorMessage(OffsetDateTime.now(), e.getMessage());
+    }
+
 }
@@ -1,32 +1,42 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
-import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
-import com.iqser.red.service.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.model.RedactionResult;
-import com.iqser.red.service.redaction.v1.resources.RedactionResource;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
-import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.stream.Collectors;
+
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionRequest;
+import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.resources.RedactionResource;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Page;
+import com.iqser.red.service.redaction.v1.server.exception.NotFoundException;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnnotationService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DictionaryService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.DroolsExecutionService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogMergeService;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestController
@@ -39,19 +49,26 @@ public class RedactionController implements RedactionResource {
    private final AnnotationService annotationService;
    private final PdfSegmentationService pdfSegmentationService;
    private final RedactionStorageService redactionStorageService;
+    private final RedactionLogMergeService redactionLogMergeService;
+    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;


    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {

        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(annotateRequest.getDossierId(), annotateRequest.getFileId(), FileType.ORIGIN));
-        var redactionLog = redactionStorageService.getRedactionLog(annotateRequest.getDossierId(), annotateRequest.getFileId());
+        var mergedRedactionLog = getRedactionLog(RedactionRequest.builder()
+                .fileId(annotateRequest.getFileId())
+                .manualRedactions(annotateRequest.getManualRedactions())
+                .dossierId(annotateRequest.getDossierId())
+                .dossierTemplateId(annotateRequest.getDossierTemplateId())
+                .build());
        var sectionsGrid = redactionStorageService.getSectionGrid(annotateRequest.getDossierId(), annotateRequest.getFileId());

        try (PDDocument pdDocument = PDDocument.load(storedObjectStream, MemoryUsageSetting.setupTempFileOnly())) {
            pdDocument.setAllSecurityToBeRemoved(true);

            dictionaryService.updateDictionary(annotateRequest.getDossierTemplateId(), annotateRequest.getDossierId());
-            annotationService.annotate(pdDocument, redactionLog, sectionsGrid);
+            annotationService.annotate(pdDocument, mergedRedactionLog, sectionsGrid);

            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
                pdDocument.save(byteArrayOutputStream);
@@ -66,9 +83,10 @@ public class RedactionController implements RedactionResource {

    @Override
    public RedactionResult classify(@RequestBody RedactionRequest redactionRequest) {
+
        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);

            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
@@ -86,14 +104,15 @@ public class RedactionController implements RedactionResource {
            throw new RedactionException(e);
        }

-
    }

+
    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {
+
        var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
        try {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
+            Document classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);

            storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
            try (PDDocument pdDocument = PDDocument.load(storedObjectStream)) {
@@ -110,7 +129,6 @@ public class RedactionController implements RedactionResource {
            throw new RedactionException(e);
        }

-
    }


@@ -121,12 +139,11 @@ public class RedactionController implements RedactionResource {

        try {
            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, true);
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, null);
        } catch (Exception e) {
            throw new RedactionException(e);
        }

-
        StringBuilder sb = new StringBuilder();
        for (Page page : classifiedDoc.getPages()) {
            for (AbstractTextContainer textContainer : page.getTextBlocks()) {
@@ -143,16 +160,45 @@ public class RedactionController implements RedactionResource {


    @Override
-    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String dossierTemplateId) {
+    public void testRules(@RequestBody String rules) {

-        droolsExecutionService.updateRules(dossierTemplateId);
+        droolsExecutionService.testRules(rules);
    }


    @Override
-    public void testRules(@RequestBody String rules) {
+    public RedactionLog getRedactionLog(RedactionRequest redactionRequest) {

-        droolsExecutionService.testRules(rules);
+        log.debug("Requested preview for: {}", redactionRequest);
+        dictionaryService.updateDictionary(redactionRequest.getDossierTemplateId(), redactionRequest.getDossierId());
+
+        var redactionLog = redactionStorageService.getRedactionLog(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+        if (redactionLog == null) {
+            throw new NotFoundException("RedactionLog not present");
+        }
+
+        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+
+        SectionGrid sectionGrid = redactionStorageService.getSectionGrid(redactionRequest.getDossierId(), redactionRequest.getFileId());
+        if (sectionGrid.getSections().isEmpty()) {
+
+            log.info("SectionGrid does not have headlines set. Computing headlines now!");
+            var text = redactionStorageService.getText(redactionRequest.getDossierId(), redactionRequest.getFileId());
+
+            // enhance section grid with headline data
+            for (var sectionText : text.getSectionTexts()) {
+                sectionGrid.getSections()
+                        .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText.getSectionAreas()
+                                .stream()
+                                .map(SectionArea::getPage)
+                                .collect(Collectors.toSet()), sectionText.getSectionAreas()));
+            }
+            redactionStorageService.storeObject(redactionRequest.getDossierId(), redactionRequest.getFileId(), FileType.SECTION_GRID, sectionGrid);
+        }
+
+        log.info("Loaded redaction log with computationalVersion: {}", redactionLog.getAnalysisVersion());
+        return redactionLogMergeService.mergeRedactionLogData(redactionLog, sectionGrid, redactionRequest.getDossierTemplateId(), redactionRequest.getManualRedactions(), redactionRequest.getExcludedPages());
    }


@@ -169,4 +215,14 @@ public class RedactionController implements RedactionResource {
    }


+    @Override
+    public ManualRedactions addSurroundingText(@PathVariable("dossierId") String dossierId,
+                                               @PathVariable("fileId") String fileId,
+                                               @RequestBody ManualRedactions manualRedactions) {
+
+        var result = manualRedactionSurroundingTextService.addSurroundingText(dossierId, fileId, manualRedactions);
+        log.info("Added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", dossierId, fileId, result.getDuration());
+        return result.getManualRedactions();
+    }
+
 }
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.server.controller;
+
+
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import com.iqser.red.service.redaction.v1.resources.RuleBuilderResource;
+import com.iqser.red.service.redaction.v1.server.redaction.rulebuilder.RuleBuilderModelService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class RuleBuilderController implements RuleBuilderResource {
+
+    private final RuleBuilderModelService ruleBuilderModelService;
+
+    @Override
+    public RuleBuilderModel getRuleBuilderModel() {
+        return ruleBuilderModelService.getRuleBuilderModel();
+    }
+
+}
@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.exception;
+
+public class NotFoundException extends RuntimeException {
+
+    public NotFoundException(String message) {
+        super(message);
+    }
+
+}
@@ -0,0 +1,377 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.iqser.red.service.redaction.v1.server.parsing;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.fontbox.ttf.TrueTypeFont;
+import org.apache.fontbox.util.BoundingBox;
+
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.font.encoding.GlyphList;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDCIDFont;
+import org.apache.pdfbox.pdmodel.font.PDCIDFontType2;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
+import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+import org.apache.pdfbox.pdmodel.font.PDType3Font;
+import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
+import org.apache.pdfbox.text.TextPosition;
+import org.apache.pdfbox.util.Matrix;
+import org.apache.pdfbox.util.Vector;
+import org.apache.pdfbox.contentstream.operator.DrawObject;
+import org.apache.pdfbox.contentstream.operator.state.Concatenate;
+import org.apache.pdfbox.contentstream.operator.state.Restore;
+import org.apache.pdfbox.contentstream.operator.state.Save;
+import org.apache.pdfbox.contentstream.operator.state.SetGraphicsStateParameters;
+import org.apache.pdfbox.contentstream.operator.state.SetMatrix;
+import org.apache.pdfbox.contentstream.operator.text.BeginText;
+import org.apache.pdfbox.contentstream.operator.text.EndText;
+import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
+import org.apache.pdfbox.contentstream.operator.text.SetTextHorizontalScaling;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextAdjusted;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextLine;
+import org.apache.pdfbox.contentstream.operator.text.ShowTextLineAndSpace;
+import org.apache.pdfbox.contentstream.operator.text.MoveText;
+import org.apache.pdfbox.contentstream.operator.text.MoveTextSetLeading;
+import org.apache.pdfbox.contentstream.operator.text.NextLine;
+import org.apache.pdfbox.contentstream.operator.text.SetCharSpacing;
+import org.apache.pdfbox.contentstream.operator.text.SetTextLeading;
+import org.apache.pdfbox.contentstream.operator.text.SetTextRenderingMode;
+import org.apache.pdfbox.contentstream.operator.text.SetTextRise;
+import org.apache.pdfbox.contentstream.operator.text.SetWordSpacing;
+import org.apache.pdfbox.contentstream.operator.text.ShowText;
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
+
+/**
+ * LEGACY text calculations which are known to be incorrect but are depended on by PDFTextStripper.
+ *
+ * This class exists only so that we don't break the code of users who have their own subclasses of
+ * PDFTextStripper. It replaces the mostly empty implementation of showGlyph() in PDFStreamEngine
+ * with a heuristic implementation which is backwards compatible.
+ *
+ * DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+ * THIS CODE IS DELIBERATELY INCORRECT, USE PDFStreamEngine INSTEAD.
+ */
+@SuppressWarnings({"PMD", "checkstyle:all"})
+class LegacyPDFStreamEngine extends PDFStreamEngine
+{
+    private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class);
+
+    private int pageRotation;
+    private PDRectangle pageSize;
+    private Matrix translateMatrix;
+    private final GlyphList glyphList;
+    private final Map<COSDictionary, Float> fontHeightMap = new WeakHashMap<COSDictionary, Float>();
+
+    /**
+     * Constructor.
+     */
+    LegacyPDFStreamEngine() throws IOException
+    {
+        addOperator(new BeginText());
+        addOperator(new Concatenate());
+        addOperator(new DrawObject()); // special text version
+        addOperator(new EndText());
+        addOperator(new SetGraphicsStateParameters());
+        addOperator(new Save());
+        addOperator(new Restore());
+        addOperator(new NextLine());
+        addOperator(new SetCharSpacing());
+        addOperator(new MoveText());
+        addOperator(new MoveTextSetLeading());
+        addOperator(new SetFontAndSize());
+        addOperator(new ShowText());
+        addOperator(new ShowTextAdjusted());
+        addOperator(new SetTextLeading());
+        addOperator(new SetMatrix());
+        addOperator(new SetTextRenderingMode());
+        addOperator(new SetTextRise());
+        addOperator(new SetWordSpacing());
+        addOperator(new SetTextHorizontalScaling());
+        addOperator(new ShowTextLine());
+        addOperator(new ShowTextLineAndSpace());
+
+        // load additional glyph list for Unicode mapping
+        String path = "/org/apache/pdfbox/resources/glyphlist/additional.txt";
+        InputStream input = GlyphList.class.getResourceAsStream(path);
+        glyphList = new GlyphList(GlyphList.getAdobeGlyphList(), input);
+    }
+
+    /**
+     * This will initialize and process the contents of the stream.
+     *
+     * @param page the page to process
+     * @throws java.io.IOException if there is an error accessing the stream.
+     */
+    @Override
+    public void processPage(PDPage page) throws IOException
+    {
+        this.pageRotation = page.getRotation();
+        this.pageSize = page.getCropBox();
+
+        if (pageSize.getLowerLeftX() == 0 && pageSize.getLowerLeftY() == 0)
+        {
+            translateMatrix = null;
+        }
+        else
+        {
+            // translation matrix for cropbox
+            translateMatrix = Matrix.getTranslateInstance(-pageSize.getLowerLeftX(), -pageSize.getLowerLeftY());
+        }
+        super.processPage(page);
+    }
+
+    /**
+     * Called when a glyph is to be processed. The heuristic calculations here were originally
+     * written by Ben Litchfield for PDFStreamEngine.
+     */
+    @Override
+    protected void showGlyph(Matrix textRenderingMatrix, PDFont font, int code,
+            String unicode,
+            Vector displacement)
+            throws IOException
+    {
+        //
+        // legacy calculations which were previously in PDFStreamEngine
+        //
+        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+        //  THIS CODE IS DELIBERATELY INCORRECT
+        //
+
+        PDGraphicsState state = getGraphicsState();
+        Matrix ctm = state.getCurrentTransformationMatrix();
+        float fontSize = state.getTextState().getFontSize();
+        float horizontalScaling = state.getTextState().getHorizontalScaling() / 100f;
+        Matrix textMatrix = getTextMatrix();
+
+        float displacementX = displacement.getX();
+        // the sorting algorithm is based on the width of the character. As the displacement
+        // for vertical characters doesn't provide any suitable value for it, we have to 
+        // calculate our own
+        if (font.isVertical())
+        {
+            displacementX = font.getWidth(code) / 1000;
+            // there may be an additional scaling factor for true type fonts
+            TrueTypeFont ttf = null;
+            if (font instanceof PDTrueTypeFont)
+            {
+                ttf = ((PDTrueTypeFont)font).getTrueTypeFont();
+            }
+            else if (font instanceof PDType0Font)
+            {
+                PDCIDFont cidFont = ((PDType0Font)font).getDescendantFont();
+                if (cidFont instanceof PDCIDFontType2)
+                {
+                    ttf = ((PDCIDFontType2)cidFont).getTrueTypeFont();
+                }
+            }
+            if (ttf != null && ttf.getUnitsPerEm() != 1000)
+            {
+                displacementX *= 1000f / ttf.getUnitsPerEm();
+            }
+        }
+
+        //
+        // legacy calculations which were previously in PDFStreamEngine
+        //
+        //  DO NOT USE THIS CODE UNLESS YOU ARE WORKING WITH PDFTextStripper.
+        //  THIS CODE IS DELIBERATELY INCORRECT
+        //
+
+        // (modified) combined displacement, this is calculated *without* taking the character
+        // spacing and word spacing into account, due to legacy code in TextStripper
+        float tx = displacementX * fontSize * horizontalScaling;
+        float ty = displacement.getY() * fontSize;
+
+        // (modified) combined displacement matrix
+        Matrix td = Matrix.getTranslateInstance(tx, ty);
+
+        // (modified) text rendering matrix
+        Matrix nextTextRenderingMatrix = td.multiply(textMatrix).multiply(ctm); // text space -> device space
+        float nextX = nextTextRenderingMatrix.getTranslateX();
+        float nextY = nextTextRenderingMatrix.getTranslateY();
+
+        // (modified) width and height calculations
+        float dxDisplay = nextX - textRenderingMatrix.getTranslateX();
+        Float fontHeight = fontHeightMap.get(font.getCOSObject());
+        if (fontHeight == null)
+        {
+            fontHeight = computeFontHeight(font);
+            fontHeightMap.put(font.getCOSObject(), fontHeight);
+        }
+        float dyDisplay = fontHeight * textRenderingMatrix.getScalingFactorY();
+
+        //
+        // start of the original method
+        //
+
+        // Note on variable names. There are three different units being used in this code.
+        // Character sizes are given in glyph units, text locations are initially given in text
+        // units, and we want to save the data in display units. The variable names should end with
+        // Text or Disp to represent if the values are in text or disp units (no glyph units are
+        // saved).
+
+        float glyphSpaceToTextSpaceFactor = 1 / 1000f;
+        if (font instanceof PDType3Font)
+        {
+            glyphSpaceToTextSpaceFactor = font.getFontMatrix().getScaleX();
+        }
+
+        float spaceWidthText = 0;
+        try
+        {
+            // to avoid crash as described in PDFBOX-614, see what the space displacement should be
+            spaceWidthText = font.getSpaceWidth() * glyphSpaceToTextSpaceFactor;
+        }
+        catch (Throwable exception)
+        {
+            LOG.warn(exception, exception);
+        }
+
+        if (spaceWidthText == 0)
+        {
+            spaceWidthText = font.getAverageFontWidth() * glyphSpaceToTextSpaceFactor;
+            // the average space width appears to be higher than necessary so make it smaller
+            spaceWidthText *= .80f;
+        }
+        if (spaceWidthText == 0)
+        {
+            spaceWidthText = 1.0f; // if could not find font, use a generic value
+        }
+
+        // the space width has to be transformed into display units
+        float spaceWidthDisplay = spaceWidthText * textRenderingMatrix.getScalingFactorX();
+
+        // use our additional glyph list for Unicode mapping
+        String unicodeMapping = font.toUnicode(code, glyphList);
+
+        // when there is no Unicode mapping available, Acrobat simply coerces the character code
+        // into Unicode, so we do the same. Subclasses of PDFStreamEngine don't necessarily want
+        // this, which is why we leave it until this point in PDFTextStreamEngine.
+        if (unicodeMapping == null)
+        {
+            if (font instanceof PDSimpleFont)
+            {
+                char c = (char) code;
+                unicodeMapping = new String(new char[] { c });
+            }
+            else
+            {
+                // Acrobat doesn't seem to coerce composite font's character codes, instead it
+                // skips them. See the "allah2.pdf" TestTextStripper file.
+                return;
+            }
+        }
+
+        // adjust for cropbox if needed
+        Matrix translatedTextRenderingMatrix;
+        if (translateMatrix == null)
+        {
+            translatedTextRenderingMatrix = textRenderingMatrix;
+        }
+        else
+        {
+            translatedTextRenderingMatrix = Matrix.concatenate(translateMatrix, textRenderingMatrix);
+            nextX -= pageSize.getLowerLeftX();
+            nextY -= pageSize.getLowerLeftY();
+        }
+
+        processTextPosition(new TextPosition(pageRotation, pageSize.getWidth(),
+                pageSize.getHeight(), translatedTextRenderingMatrix, nextX, nextY,
+                Math.abs(dyDisplay), dxDisplay,
+                Math.abs(spaceWidthDisplay), unicodeMapping, new int[] { code }, font,
+                fontSize,
+                (int)(fontSize * textMatrix.getScalingFactorX())));
+    }
+
+    /**
+     * Compute the font height. Override this if you want to use own calculations.
+     * 
+     * @param font the font.
+     * @return the font height.
+     * 
+     * @throws IOException if there is an error while getting the font bounding box.
+     */
+    protected float computeFontHeight(PDFont font) throws IOException
+    {
+        BoundingBox bbox = font.getBoundingBox();
+        if (bbox.getLowerLeftY() < Short.MIN_VALUE)
+        {
+            // PDFBOX-2158 and PDFBOX-3130
+            // files by Salmat eSolutions / ClibPDF Library
+            bbox.setLowerLeftY(- (bbox.getLowerLeftY() + 65536));
+        }
+        // 1/2 the bbox is used as the height todo: why?
+        float glyphHeight = bbox.getHeight() / 2;
+
+        // sometimes the bbox has very high values, but CapHeight is OK
+        PDFontDescriptor fontDescriptor = font.getFontDescriptor();
+        if (fontDescriptor != null)
+        {
+            float capHeight = fontDescriptor.getCapHeight();
+            if (Float.compare(capHeight, 0) != 0 &&
+                    (capHeight < glyphHeight || Float.compare(glyphHeight, 0) == 0))
+            {
+                glyphHeight = capHeight;
+            }
+            // PDFBOX-3464, PDFBOX-4480, PDFBOX-4553:
+            // sometimes even CapHeight has very high value, but Ascent and Descent are ok
+            float ascent = fontDescriptor.getAscent();
+            float descent = fontDescriptor.getDescent();
+            if (capHeight > ascent && ascent > 0 && descent < 0 &&
+                    ((ascent - descent) / 2 < glyphHeight || Float.compare(glyphHeight, 0) == 0))
+            {
+                glyphHeight = (ascent - descent) / 2;
+            }
+        }
+
+        // transformPoint from glyph space -> text space
+        float height;
+        if (font instanceof PDType3Font)
+        {
+            height = font.getFontMatrix().transformPoint(0, glyphHeight).y;
+        }
+        else
+        {
+            height = glyphHeight / 1000;
+        }
+
+        return height;
+    }
+
+    /**
+     * A method provided as an event interface to allow a subclass to perform some specific
+     * functionality when text needs to be processed.
+     *
+     * @param text The text to be processed.
+     */
+    protected void processTextPosition(TextPosition text)
+    {
+        // subclasses can override to provide specific functionality
+    }
+}
@@ -1,16 +1,33 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.pdfbox.contentstream.operator.Operator;
 import org.apache.pdfbox.contentstream.operator.OperatorName;
-import org.apache.pdfbox.contentstream.operator.color.*;
-import org.apache.pdfbox.contentstream.operator.state.*;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetNonStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorN;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingColorSpace;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceCMYKColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceGrayColor;
+import org.apache.pdfbox.contentstream.operator.color.SetStrokingDeviceRGBColor;
+import org.apache.pdfbox.contentstream.operator.state.SetFlatness;
+import org.apache.pdfbox.contentstream.operator.state.SetLineCapStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineDashPattern;
+import org.apache.pdfbox.contentstream.operator.state.SetLineJoinStyle;
+import org.apache.pdfbox.contentstream.operator.state.SetLineMiterLimit;
+import org.apache.pdfbox.contentstream.operator.state.SetLineWidth;
+import org.apache.pdfbox.contentstream.operator.state.SetRenderingIntent;
 import org.apache.pdfbox.contentstream.operator.text.SetFontAndSize;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
@@ -19,16 +36,17 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.Matrix;

-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {
@@ -106,11 +124,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {

                    // The direction of vertical lines must always be from bottom to top for the table extraction algorithm.
                    if (pos.getY() > path_y) {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos
-                                .getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, path_y), new Point2D.Float((float) pos.getX(), (float) pos.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos
-                                .getX(), path_y)));
+                        graphicsPath.add(new Ruling(new Point2D.Float(path_x, (float) pos.getY()), new Point2D.Float((float) pos.getX(), path_y)));
                    }

                    path_x = (float) pos.getX();
@@ -131,25 +147,19 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                    Point2D p2 = transformPosition(x + width, y + height);

                    // Horizontal lines
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2
-                            .getX(), (float) p1.getY())));
-                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2
-                            .getX(), (float) p2.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
+                    graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));

                    // Vertical lines, direction must always be from bottom to top for the table extraction algorithm.
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2
-                                .getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p1.getY()), new Point2D.Float((float) p2.getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2
-                                .getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p2.getX(), (float) p2.getY()), new Point2D.Float((float) p2.getX(), (float) p1.getY())));
                    }
                    if (p2.getY() > p1.getY()) {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1
-                                .getX(), (float) p2.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p1.getY()), new Point2D.Float((float) p1.getX(), (float) p2.getY())));
                    } else {
-                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1
-                                .getX(), (float) p1.getY())));
+                        graphicsPath.add(new Ruling(new Point2D.Float((float) p1.getX(), (float) p2.getY()), new Point2D.Float((float) p1.getX(), (float) p1.getY())));
                    }
                }
                break;
@@ -173,9 +183,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
                graphicsPath.clear();
                break;

-            case OperatorName.DRAW_OBJECT:
-                processImageOperation(arguments);
-                break;
+//            case OperatorName.DRAW_OBJECT:
+//                processImageOperation(arguments);
+//                break;

        }

@@ -189,18 +199,18 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            COSName objectName = (COSName) arguments.get(0);
            PDXObject xobject = getResources().getXObject(objectName);
            if (xobject instanceof PDImageXObject) {
-                PDImageXObject pdfImage = (PDImageXObject) xobject;
+                PDImageXObject image = (PDImageXObject) xobject;
+                Matrix ctmNew = getGraphicsState().getCurrentTransformationMatrix();

-                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
-
-                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
-                        .getWidth(), (float) imageBounds.getHeight());
+                Rectangle2D rect = new Rectangle2D.Float(ctmNew.getTranslateX(), ctmNew.getTranslateY(), ctmNew.getScaleX(), ctmNew.getScaleY());

                // Memory Hack - sofReference kills me
-                FieldUtils.writeField(pdfImage, "cachedImageSubsampling", -1, true);
+                FieldUtils.writeField(image, "cachedImageSubsampling", -1, true);

                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
-                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
+                    this.images.add(new PdfImage(image.getImage(), rect, pageNumber, image.getImage()
+                            .getColorModel()
+                            .hasAlpha()));
                }
            }
        } catch (Exception e) {
@@ -209,23 +219,6 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    }


-    private Rectangle2D calculateImagePosition(PDImageXObject pdfImage) throws IOException {
-
-        Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
-
-        Rectangle2D imageBounds = pdfImage.getImage().getRaster().getBounds();
-
-        AffineTransform imageTransform = new AffineTransform(ctm.createAffineTransform());
-        imageTransform.scale(1.0 / pdfImage.getWidth(), -1.0 / pdfImage.getHeight());
-        imageTransform.translate(0, -pdfImage.getHeight());
-
-        AffineTransform pageTransform = new AffineTransform();
-        pageTransform.concatenate(imageTransform);
-
-        return pageTransform.createTransformedShape(imageBounds).getBounds2D();
-    }
-
-
    private float floatValue(COSBase value) {

        if (value instanceof COSNumber) {
@@ -264,8 +257,16 @@ public class PDFLinesTextStripper extends PDFTextStripper {
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

        int startIndex = 0;
+        RedTextPosition previous = null;
+
        for (int i = 0; i <= textPositions.size() - 1; i++) {

+            if (!textPositionSequences.isEmpty()) {
+                previous = textPositionSequences.get(textPositionSequences.size() - 1)
+                        .getTextPositions()
+                        .get(textPositionSequences.get(textPositionSequences.size() - 1).getTextPositions().size() - 1);
+            }
+
            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
            if (charWidth < minCharWidth) {
                minCharWidth = charWidth;
@@ -284,42 +285,58 @@ public class PDFLinesTextStripper extends PDFTextStripper {

            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0"))) {
+                    .equals("\u00A0") || textPositions.get(i).getUnicode().equals("\t"))) {
                startIndex++;
                continue;
            }

            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
-            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+            if (i > 0 && textPositions.get(i).getXDirAdj() < textPositions.get(i - 1).getXDirAdj()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
            }

-
-            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i).getX() > textPositions.get(i - 1).getEndX() + 1) {
+            if (textPositions.get(i).getRotation() == 0 && i > 0 && textPositions.get(i)
+                    .getX() > textPositions.get(i - 1).getEndX() + 1) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
            }

-
            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
                    .getUnicode()
-                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
+                    .equals("\u00A0") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\t")) && i <= textPositions.size() - 2) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
                        .getUnicode()
-                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
-                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0") || sublist.get(0)
+                        .getUnicode()
+                        .equals("\t")))) {
+
+                    // Remove false sequence ends (whitespaces)
+                    if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                            .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                        for (TextPosition t : sublist) {
+                            textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                        }
+                    } else {
+                        textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                    }
                }
                startIndex = i + 1;
            }
@@ -328,13 +345,23 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        List<TextPosition> sublist = textPositions.subList(startIndex, textPositions.size());
        if (!sublist.isEmpty() && (sublist.get(sublist.size() - 1)
                .getUnicode()
-                .equals(" ") || sublist.get(sublist.size() - 1).getUnicode().equals("\u00A0"))) {
+                .equals(" ") || sublist.get(sublist.size() - 1)
+                .getUnicode()
+                .equals("\u00A0") || sublist.get(sublist.size() - 1).getUnicode().equals("\t"))) {
            sublist = sublist.subList(0, sublist.size() - 1);
        }
+
        if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0).getUnicode().equals(" ") || sublist.get(0)
                .getUnicode()
-                .equals("\u00A0")))) {
-            textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+                .equals("\u00A0") || sublist.get(0).getUnicode().equals("\t")))) {
+            if (previous != null && sublist.get(0).getYDirAdj() == previous.getYDirAdj() && sublist.get(0)
+                    .getXDirAdj() - (previous.getXDirAdj() + previous.getWidthDirAdj()) < 0.01) {
+                for (TextPosition t : sublist) {
+                    textPositionSequences.get(textPositionSequences.size() - 1).add(t);
+                }
+            } else {
+                textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
+            }
        }
        super.writeString(text);
    }
@@ -21,6 +21,8 @@ public class RedTextPosition {
    private float YDirAdj;
    private float width;
    private float heightDir;
+    private float widthDirAdj;
+    private float dir;

    // not used in reanalysis
    @JsonIgnore
@@ -1,20 +1,24 @@
 package com.iqser.red.service.redaction.v1.server.parsing.model;

-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.pdfbox.text.TextPosition;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

+import org.apache.pdfbox.text.TextPosition;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
@Data
@NoArgsConstructor
-@JsonIgnoreProperties({ "empty" })
+@JsonIgnoreProperties({"empty"})
 public class TextPositionSequence implements CharSequence {

    private int page;
@@ -23,12 +27,15 @@ public class TextPositionSequence implements CharSequence {
    private float x1;
    private float x2;

+
    public TextPositionSequence(int page) {
+
        this.page = page;
    }


    public static TextPositionSequence fromData(List<RedTextPosition> textPositions, int page) {
+
        var textPositionSequence = new TextPositionSequence();
        textPositionSequence.textPositions = textPositions;
        textPositionSequence.page = page;
@@ -44,9 +51,6 @@ public class TextPositionSequence implements CharSequence {
    }


-
-
-
    @Override
    public int length() {

@@ -129,6 +133,7 @@ public class TextPositionSequence implements CharSequence {
        }
    }

+
    @JsonIgnore
    public float getRotationAdjustedY() {

@@ -136,6 +141,13 @@ public class TextPositionSequence implements CharSequence {
    }


+    @JsonIgnore
+    public float getRotationAdjustedX() {
+
+        return textPositions.get(0).getXDirAdj();
+    }
+
+
    @JsonIgnore
    public float getY1() {

@@ -181,10 +193,8 @@ public class TextPositionSequence implements CharSequence {

    @JsonIgnore
    public String getFont() {
-        return textPositions.get(0).getFontName()
-                .toLowerCase()
-                .replaceAll(",bold", "")
-                .replaceAll(",italic", "");
+
+        return textPositions.get(0).getFontName().toLowerCase().replaceAll(",bold", "").replaceAll(",italic", "");
    }


@@ -205,27 +215,33 @@ public class TextPositionSequence implements CharSequence {

    }

+
    @JsonIgnore
    public float getFontSize() {

        return textPositions.get(0).getFontSizeInPt();
    }

+
    @JsonIgnore
    public float getSpaceWidth() {

        return textPositions.get(0).getWidthOfSpace();
    }

+
    @JsonIgnore
    public int getRotation() {

        return textPositions.get(0).getRotation();
    }

+
    @JsonIgnore
    public Rectangle getRectangle() {

+        log.debug("Page: '{}', Word: '{}', Rotation: '{}'", page, toString(), textPositions.get(0).getRotation());
+
        float height = getTextHeight();

        float posXInit = getX1();
@@ -233,26 +249,59 @@ public class TextPositionSequence implements CharSequence {
        float posYInit;
        float posYEnd;

-        if (textPositions.get(0).getRotation() == 90) {
+        if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() != 0.0f) {
            posXEnd = textPositions.get(0).getYDirAdj() + 2;
            posYInit = getY1();
            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
-        } else if (textPositions.get(0).getRotation() == 270) {
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 270.0f) {
            posYInit = textPositions.get(0).getPageHeight() - getX1();
            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
                    .getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 270 && textPositions.get(0).getDir() == 0.0f) {
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = posYInit + 1;
+            posXInit = textPositions.get(0).getXDirAdj();
+            posXEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 0.1f;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 270f) {
+            posYInit = textPositions.get(0).getPageHeight() - getX1();
+            posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
+                    .getWidthDirAdj() - textPositions.get(textPositions.size() - 1).getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
+            posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + height;
+
+        } else if (textPositions.get(0).getRotation() == 90 && textPositions.get(0).getDir() == 0.0f) {
+            posXInit = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getHeightDir();
+            posXEnd = textPositions.get(0).getXDirAdj();
+            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
+            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
+                    .getYDirAdj() + 2;
+
+        } else if (textPositions.get(0).getRotation() == 0 && textPositions.get(0).getDir() == 90f) {
+            posYInit = getX1();
+            posYEnd = getX2() + textPositions.get(0).getWidthDirAdj() - textPositions.get(textPositions.size() - 1)
+                    .getWidthDirAdj() - 3;
+            posXInit = textPositions.get(0).getYDirAdj() + 2;
+            posXEnd = textPositions.get(textPositions.size() - 1).getYDirAdj() - height;
+
        } else {
            posXEnd = textPositions.get(textPositions.size() - 1)
-                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidthDirAdj() + 1;
            posYInit = textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() - 2;
            posYEnd = textPositions.get(0).getPageHeight() - textPositions.get(textPositions.size() - 1)
                    .getYDirAdj() + 2;
        }

-        return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
+        var rectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
+        log.debug("Rectangle: {}", rectangle);
+        return rectangle;
    }

 }
@@ -1,19 +1,23 @@
 package com.iqser.red.service.redaction.v1.server.queue;

+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
+import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;
+
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
 import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
 import com.iqser.red.service.redaction.v1.server.client.FileStatusProcessingUpdateClient;
-import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.AnalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ManualRedactionSurroundingTextService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Service;
-
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_DQL;
-import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration.REDACTION_QUEUE;

@Slf4j
@Service
@@ -21,26 +25,47 @@ import static com.iqser.red.service.redaction.v1.server.queue.MessagingConfigura
 public class RedactionMessageReceiver {

    private final ObjectMapper objectMapper;
-    private final ReanalyzeService reanalyzeService;
+    private final AnalyzeService analyzeService;
    private final FileStatusProcessingUpdateClient fileStatusProcessingUpdateClient;
+    private final ManualRedactionSurroundingTextService manualRedactionSurroundingTextService;
+

    @RabbitHandler
    @RabbitListener(queues = REDACTION_QUEUE)
    public void receiveAnalyzeRequest(String in) throws JsonProcessingException {

        var analyzeRequest = objectMapper.readValue(in, AnalyzeRequest.class);
-        log.info("Processing analyze request: {}", analyzeRequest);
-        AnalyzeResult result;
-        if (analyzeRequest.isReanalyseOnlyIfPossible()) {
-            result = reanalyzeService.reanalyze(analyzeRequest);
-        } else {
-            result = reanalyzeService.analyze(analyzeRequest);
-        }
-        log.info("Successfully analyzed {}", analyzeRequest);
+        log.info("Processing analyze request for file: {}", analyzeRequest.getFileId());
+        AnalyzeResult result = null;

+        switch (analyzeRequest.getMessageType()) {
+
+            case REANALYSE:
+                result = analyzeService.reanalyze(analyzeRequest);
+                log.info("Successfully reanalyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                break;
+
+            case STRUCTURE_ANALYSE:
+                result = analyzeService.analyzeDocumentStructure(new StructureAnalyzeRequest(analyzeRequest.getDossierId(), analyzeRequest.getFileId()));
+                log.info("Successfully analyzed structure dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                break;
+
+            case ANALYSE:
+                result = analyzeService.analyze(analyzeRequest);
+                log.info("Successfully analyzed dossier {} file {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                break;
+
+            case SURROUNDING_TEXT:
+                result = manualRedactionSurroundingTextService.addSurroundingText(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), analyzeRequest.getManualRedactions());
+                log.info("Successfully added surrounding text for manual redaction in dossierId {} and fileId {} took: {}", analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result.getDuration());
+                break;
+        }
+
+        result.setMessageType(analyzeRequest.getMessageType());
        fileStatusProcessingUpdateClient.analysisSuccessful(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), result);
    }

+
    @RabbitHandler
    @RabbitListener(queues = REDACTION_DQL)
    public void receiveAnalyzeRequestDQL(String in) throws JsonProcessingException {
@@ -1,5 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import static java.util.stream.Collectors.toSet;
+
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import lombok.Data;
 import lombok.Getter;

@@ -8,6 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

+
@Data
 public class Dictionary {

@@ -61,13 +65,13 @@ public class Dictionary {
    public boolean containsValue(String type, String value) {

        return localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getEntries()
+                .getValues(false)
                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
-                .getLocalEntries()
+                .getValues(true)
                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getEntries()
+                .getValues(false)
                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
-                .getLocalEntries()
+                .getValues(true)
                .contains(value);
    }

@@ -1,7 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;


-import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -9,6 +9,7 @@ import java.io.Serializable;
 import java.util.Set;
 import java.util.stream.Collectors;

+
@Data
@AllArgsConstructor
 public class DictionaryModel implements Serializable {
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Entities {
+
+    @Builder.Default
+    private Set<Entity> entities = new HashSet<>();
+
+    @Builder.Default
+    private Set<Entity> nerEntities = new HashSet<>();
+
+}
@@ -1,19 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

+import com.iqser.red.service.redaction.v1.model.Engine;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;

 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;

@Data
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-public class Entity {
+public class Entity implements ReasonHolder {

-
-    private final String word;
-    private final String type;
+    private String word;
+    private String type;
    private boolean redaction;
    private String redactionReason;
    private String legalBasis;
@@ -39,8 +42,17 @@ public class Entity {

    private boolean isDossierDictionaryEntry;

+    private boolean ignored;

-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber, String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start, Integer end, boolean isDossierDictionaryEntry) {
+    private Set<Engine> engines = new HashSet<>();
+
+    private Set<Entity> references = new HashSet<>();
+
+
+    public Entity(String word, String type, boolean redaction, String redactionReason,
+                  List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber,
+                  String legalBasis, boolean isDictionaryEntry, String textBefore, String textAfter, Integer start,
+                  Integer end, boolean isDossierDictionaryEntry, Set<Engine> engines, Set<Entity> references) {

        this.word = word;
        this.type = type;
@@ -57,10 +69,13 @@ public class Entity {
        this.start = start;
        this.end = end;
        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
+        this.engines = engines;
+        this.references = references;
    }


-    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber, boolean isDictionaryEntry, boolean isDossierDictionaryEntry) {
+    public Entity(String word, String type, Integer start, Integer end, String headline, int sectionNumber,
+                  boolean isDictionaryEntry, boolean isDossierDictionaryEntry, Engine engine) {

        this.word = word;
        this.type = type;
@@ -70,6 +85,8 @@ public class Entity {
        this.sectionNumber = sectionNumber;
        this.isDictionaryEntry = isDictionaryEntry;
        this.isDossierDictionaryEntry = isDossierDictionaryEntry;
+        this.engines.add(engine);
    }

+
 }
@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class Image {
+public class Image implements ReasonHolder {

    private String type;
    private RedRectangle2D position;
@@ -20,5 +20,7 @@ public class Image {
    private int sectionNumber;
    private String section;
    private int page;
+    private boolean ignored;
+    private boolean hasTransparency;

 }
@@ -0,0 +1,23 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class PageEntities {
+
+    @Builder.Default
+    private Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
+
+    @Builder.Default
+    private Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
+
+
+}
@@ -16,16 +16,19 @@ public class PdfImage {
    private BufferedImage image;
    @NonNull
    private RedRectangle2D position;
+    @NonNull
    private ImageType imageType;
    private boolean isAppendedToParagraph;
+    private boolean hasTransparency;

    @NonNull
    private int page;

-    public PdfImage(BufferedImage image, Rectangle2D position, int page) {
+    public PdfImage(BufferedImage image, Rectangle2D position, int page, boolean hasTransparency) {
        this.image = image;
        this.position = new RedRectangle2D(position.getX(), position.getY(), position.getWidth(), position.getHeight());
        this.page = page;
+        this.hasTransparency = hasTransparency;
    }

 }
@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+public interface ReasonHolder {
+
+    String getRedactionReason();
+
+    void setRedactionReason(String reason);
+
+    boolean isRedaction();
+
+    void setRedaction(boolean value);
+
+
+}
@@ -1,23 +1,35 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
-import lombok.Builder;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;

+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

-import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+import org.apache.commons.lang3.StringUtils;
+
+import com.iqser.red.service.redaction.v1.model.ArgumentType;
+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.model.FileAttribute;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.Patterns;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;

@Data
@Slf4j
@@ -33,6 +45,8 @@ public class Section {

    private Set<Entity> entities;

+    private Set<Entity> nerEntities;
+
    // This still contains linebreaks etc.
    private String text;

@@ -52,45 +66,210 @@ public class Section {
    @Builder.Default
    private Set<Image> images = new HashSet<>();

+    @Builder.Default
+    private List<FileAttribute> fileAttributes = new ArrayList<>();

-    public boolean rowEquals(String headerName, String value) {

-        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+    public void addAiEntities(String type, String asType) {

-        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName)
-                .toString()
-                .equals(value);
+        Set<Entity> entitiesOfType = nerEntities.stream().filter(nerEntity -> nerEntity.getType().equals(type)).collect(Collectors.toSet());
+        Set<String> values = entitiesOfType.stream().map(Entity::getWord).collect(Collectors.toSet());
+        Set<Entity> found = EntitySearchUtils.find(searchText, values, asType, headline, sectionNumber, false, false, Engine.NER, true);
+        EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
+
+        Set<Entity> finalResult = new HashSet<>();
+
+        // Only keep Entities with correct offsets from AI Service.
+        for (Entity current : found) {
+            boolean foundSameOffsets = false;
+            for (Entity entity : entitiesOfType) {
+                if (entity.getStart().equals(current.getStart()) && entity.getEnd().equals(current.getEnd())) {
+                    foundSameOffsets = true;
+                    break;
+                }
+            }
+            if (foundSameOffsets) {
+                finalResult.add(current);
+            }
+        }
+
+        var nonOverlapping = EntitySearchUtils.findNonOverlappingMatchEntities(entities, finalResult);
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, nonOverlapping, dictionary);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+        nerEntities.removeAll(entitiesOfType);
    }


-    public boolean hasTableHeader(String headerName) {
+    public void combineAiTypes(String startType, String combineTypes, int maxDistanceBetween, String asType, int minPartMatches, boolean allowDuplicateTypes) {
+
+        Set<String> combineSet = Set.of(combineTypes.split(","));
+
+        List<Entity> sorted = nerEntities.stream().sorted(Comparator.comparing(Entity::getStart)).collect(Collectors.toList());
+        Set<Entity> found = new HashSet<>();
+        int start = -1;
+        int lastEnd = -1;
+        int numberOfMatchParts = 0;
+        Set<String> foundParts = new HashSet<>();
+        for (Entity entity : sorted) {
+            if (entity.getType().equals(startType) && start == -1) {
+                lastEnd = entity.getEnd();
+                start = entity.getStart();
+                foundParts.add(entity.getType());
+                numberOfMatchParts++;
+            } else if (!allowDuplicateTypes && foundParts.contains(entity.getType())) {
+                if (numberOfMatchParts >= minPartMatches) {
+                    String value = searchText.substring(start, lastEnd);
+                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
+                }
+                start = -1;
+                lastEnd = -1;
+                numberOfMatchParts = 0;
+                foundParts = new HashSet<>();
+                if (entity.getType().equals(startType)) {
+                    lastEnd = entity.getEnd();
+                    start = entity.getStart();
+                    foundParts.add(entity.getType());
+                    numberOfMatchParts++;
+                }
+            } else if (entity.getType().equals(startType) && start != -1) {
+                if (numberOfMatchParts >= minPartMatches) {
+                    String value = searchText.substring(start, lastEnd);
+                    found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
+                }
+                start = entity.getStart();
+                lastEnd = entity.getEnd();
+                numberOfMatchParts = 0;
+                foundParts = new HashSet<>();
+                foundParts.add(entity.getType());
+                numberOfMatchParts++;
+            } else if (start != -1 && combineSet.contains(entity.getType()) && entity.getStart() - lastEnd < maxDistanceBetween) {
+                lastEnd = entity.getEnd();
+                numberOfMatchParts++;
+                foundParts.add(entity.getType());
+            }
+        }
+
+        if (numberOfMatchParts >= minPartMatches) {
+            String value = searchText.substring(start, lastEnd);
+            found.addAll(findEntities(value, asType, false, true, 0, null, null, Engine.NER));
+        }
+
+        if (!found.isEmpty()) {
+            var nonOverlapping = EntitySearchUtils.findNonOverlappingMatchEntities(entities, found);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, nonOverlapping, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+        }
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByIdEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equals(attribute.getValue()));
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByPlaceholderEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equals(attribute.getValue()));
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByLabelEquals(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equals(attribute.getValue()));
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByIdEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String id, @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue()));
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String placeholder, @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream()
+                .anyMatch(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue()));
+    }
+
+
+    @WhenCondition
+    public boolean fileAttributeByLabelEqualsIgnoreCase(@Argument(ArgumentType.FILE_ATTRIBUTE) String label, @Argument(ArgumentType.STRING) String value) {
+
+        return fileAttributes != null && fileAttributes.stream().anyMatch(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue()));
+    }
+
+
+    @WhenCondition
+    public boolean hasTableHeader(@Argument(ArgumentType.STRING) String headerName) {

        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
        return tabularData != null && tabularData.containsKey(cleanHeaderName);
    }


-    public boolean matchesType(String type) {
+    @WhenCondition
+    public boolean aiMatchesType(@Argument(ArgumentType.TYPE) String type) {

-        return entities.stream().anyMatch(entity -> entity.getType().equals(type));
+        return nerEntities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
    }


-    public boolean matchesImageType(String type) {
+    @WhenCondition
+    public boolean matchesType(@Argument(ArgumentType.TYPE) String type) {

-        return images.stream().anyMatch(image -> image.getType().equals(type));
+        return entities.stream().anyMatch(entity -> !entity.isIgnored() && entity.getType().equals(type));
    }


-    public boolean headlineContainsWord(String word) {
+    @WhenCondition
+    public boolean matchesImageType(@Argument(ArgumentType.TYPE) String type) {
+
+        return images.stream().anyMatch(image -> !image.isIgnored() && image.getType().equals(type));
+    }
+
+
+    @WhenCondition
+    public boolean headlineContainsWord(@Argument(ArgumentType.STRING) String word) {

        return StringUtils.containsIgnoreCase(headline, word);
    }


-    public void expandByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group) {
+    @WhenCondition
+    public boolean rowEquals(@Argument(ArgumentType.STRING) String headerName, @Argument(ArgumentType.STRING) String value) {

-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+
+        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName).toString().equals(value);
+    }
+
+
+    @ThenAction
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group) {
+
+        expandByRegEx(type, suffixPattern, patternCaseInsensitive, group, null);
+    }
+
+
+    @ThenAction
+    public void expandByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REGEX) String suffixPattern,
+                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+                              @Argument(ArgumentType.REGEX) String valuePattern) {
+
+        Pattern compiledValuePattern = null;
+
+        if (valuePattern != null) {
+            compiledValuePattern = Patterns.getCompiledPattern(valuePattern, patternCaseInsensitive);
+        }
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(suffixPattern, patternCaseInsensitive);

        Set<Entity> expanded = new HashSet<>();
        for (Entity entity : entities) {
@@ -99,14 +278,21 @@ public class Section {
                continue;
            }

+            if (valuePattern != null) {
+                Matcher valueMatcher = compiledValuePattern.matcher(entity.getWord());
+                if (!valueMatcher.matches()) {
+                    continue;
+                }
+            }
+
            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());

            while (matcher.find()) {
                String match = matcher.group(group);
-                if (StringUtils.isNotBlank(match)) {
-                    expanded.addAll(findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity
-                            .getRedactionReason(), entity.getLegalBasis()));

+                if (StringUtils.isNotBlank(match)) {
+                    Set<Entity> expandedEntities = findEntities(entity.getWord() + match, type, false, entity.isRedaction(), entity.getMatchedRule(), entity.getRedactionReason(), entity.getLegalBasis(), Engine.RULE);
+                    expanded.addAll(EntitySearchUtils.findNonOverlappingMatchEntities(entities, expandedEntities));
                }
            }
        }
@@ -116,106 +302,182 @@ public class Section {
    }


-    public void redactImage(String type, int ruleNumber, String reason, String legalBasis) {
+    @ThenAction
+    public void redactImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
+                            @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(true);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-                image.setLegalBasis(legalBasis);
-            }
-        });
+        redactImage(type, ruleNumber, reason, legalBasis, true);
    }


-    public void redact(String type, int ruleNumber, String reason, String legalBasis) {
+    @ThenAction
+    public void redactNotImage(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {

-        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
-                    .equals(RECOMMENDATION_PREFIX + type)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-                entity.setLegalBasis(legalBasis);
-            }
-        });
+        redactImage(type, ruleNumber, reason, null, false);
    }


-    public void redactNotImage(String type, int ruleNumber, String reason) {
+    @ThenAction
+    public void redact(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason,
+                       @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

-        images.forEach(image -> {
-            if (image.getType().equals(type)) {
-                image.setRedaction(false);
-                image.setMatchedRule(ruleNumber);
-                image.setRedactionReason(reason);
-            }
-        });
+        redact(type, ruleNumber, reason, legalBasis, true);
    }


-    public void redactNot(String type, int ruleNumber, String reason) {
+    @ThenAction
+    public void redactNot(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {

-        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
-
-        entities.forEach(entity -> {
-            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
-                    .equals(RECOMMENDATION_PREFIX + type)) {
-                entity.setRedaction(false);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-            }
-        });
+        redact(type, ruleNumber, reason, null, false);
    }


-    public void expandToHintAnnotationByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group,
-                                              String asType) {
+    @ThenAction
+    public void redactLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason,
+                                @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
+    }
+
+
+    @ThenAction
+    public void redactNotLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere, @Argument(ArgumentType.STRING) String reason) {
+
+        redactLineAfter(start, asType, ruleNumber, redactEverywhere, reason, null, false);
+
+    }
+
+
+    @ThenAction
+    public void redactByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                              @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true);
+    }
+
+
+    @ThenAction
+    public void redactNotByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                 @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                 @Argument(ArgumentType.STRING) String reason) {
+
+        redactByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false);
+    }
+
+
+    @ThenAction
+    public void redactBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
+                              @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                              @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
+    }
+
+
+    @ThenAction
+    public void redactNotBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
+                                 @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                 @Argument(ArgumentType.STRING) String reason) {
+
+        redactBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
+    }
+
+
+    @ThenAction
+    public void redactLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
+                                   @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, legalBasis, true);
+    }
+
+
+    @ThenAction
+    public void redactNotLinesBetween(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.STRING) String stop, @Argument(ArgumentType.TYPE) String asType,
+                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.BOOLEAN) boolean redactEverywhere,
+                                      @Argument(ArgumentType.STRING) String reason) {
+
+        redactLinesBetween(start, stop, asType, ruleNumber, redactEverywhere, reason, null, false);
+    }
+
+
+    @ThenAction
+    public void redactCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
+                           @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason,
+                           @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
+    }
+
+
+    @ThenAction
+    public void redactNotCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type,
+                              @Argument(ArgumentType.BOOLEAN) boolean addAsRecommendations, @Argument(ArgumentType.STRING) String reason) {
+
+        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
+    }
+
+
+    @ThenAction
+    public void redactAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                          @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                          @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {
+
+        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, legalBasis, true);
+    }
+
+
+    @ThenAction
+    public void redactNotAndRecommendByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                             @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType,
+                                             @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
+
+        redactAndRecommendByRegEx(pattern, patternCaseInsensitive, group, asType, ruleNumber, reason, null, false);
+    }
+
+
+    @ThenAction
+    public void addRecommendationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {

        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

-        Set<Entity> expanded = new HashSet<>();
-        for (Entity entity : entities) {
-
-            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
-                continue;
-            }
-
-            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
-
-            while (matcher.find()) {
-                String match = matcher.group(group);
-                if (StringUtils.isNotBlank(match)) {
-                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null));
-                }
-            }
-        }
-
-        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
-        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-    }
-
-
-    public void addHintAnnotationByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(searchText);
+        Matcher matcher = compiledPattern.matcher(text);

        while (matcher.find()) {
            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null);
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
            }
        }
    }


-    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason, String legalBasis) {
+    @ThenAction
+    public void redactNotAndReference(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.REFERENCE_TYPE) String referenceType,
+                                      @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.STRING) String reason) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
+        Set<Entity> references = entities.stream().filter(entity -> entity.getType().equals(referenceType)).collect(Collectors.toSet());
+
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
+                entity.setRedaction(false);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setReferences(references);
+            }
+        });
+    }
+
+
+    @ThenAction
+    public void redactIfPrecededBy(@Argument(ArgumentType.STRING) String prefix, @Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                                   @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

        entities.forEach(entity -> {
            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
@@ -228,41 +490,78 @@ public class Section {
    }


-    public void addHintAnnotation(String value, String asType) {
+    @ThenAction
+    public void addRedaction(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber,
+                             @Argument(ArgumentType.STRING) String reason, @Argument(ArgumentType.LEGAL_BASIS) String legalBasis) {

-        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
+        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis, Engine.RULE);
        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
    }


-    public void addRedaction(String value, String asType, int ruleNumber, String reason, String legalBasis) {
+    public void ignore(String type) {

-        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis);
-        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
+        entities.removeIf(entity -> entity.getType().equals(type));
    }


-    public void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason,
-                                String legalBasis) {
+    @ThenAction
+    public void expandToHintAnnotationByRegEx(@Argument(ArgumentType.TYPE) String type, @Argument(ArgumentType.STRING) String pattern,
+                                              @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive, @Argument(ArgumentType.INTEGER) int group,
+                                              @Argument(ArgumentType.TYPE) String asType) {

-        String[] values = StringUtils.substringsBetween(text, start, "\n");
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);

-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+        Set<Entity> expanded = new HashSet<>();
+        for (Entity entity : entities) {

-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
-                    }
+            if (!entity.getType().equals(type) || entity.getTextAfter() == null) {
+                continue;
+            }
+
+            Matcher matcher = compiledPattern.matcher(entity.getTextAfter());
+
+            while (matcher.find()) {
+                String match = matcher.group(group);
+                if (StringUtils.isNotBlank(match)) {
+                    expanded.addAll(findEntities(entity.getWord() + match, asType, false, false, 0, null, null, Engine.RULE));
                }
            }
        }
+
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+    }
+
+
+    @ThenAction
+    public void addHintAnnotationByRegEx(@Argument(ArgumentType.REGEX) String pattern, @Argument(ArgumentType.BOOLEAN) boolean patternCaseInsensitive,
+                                         @Argument(ArgumentType.INTEGER) int group, @Argument(ArgumentType.TYPE) String asType) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match)) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, false, 0, null, null, Engine.RULE);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+            }
+        }
    }


-    public void recommendLineAfter(String start, String asType) {
+    @ThenAction
+    public void addHintAnnotation(@Argument(ArgumentType.STRING) String value, @Argument(ArgumentType.TYPE) String asType) {
+
+        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null, Engine.RULE);
+        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
+    }
+
+
+    @ThenAction
+    public void recommendLineAfter(@Argument(ArgumentType.STRING) String start, @Argument(ArgumentType.TYPE) String asType) {

        String[] values = StringUtils.substringsBetween(text, start, "\n");

@@ -278,140 +577,42 @@ public class Section {
                }

                if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
-                    localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>())
-                            .add(cleanValue);
+                    localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(cleanValue);
                }
            }
        }
    }


-    public void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber,
-                              String reason, String legalBasis) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(searchText);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match)) {
-                Set<Entity> found = findEntities(match.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-            }
-        }
-    }
-
-
-    public void addRecommendationByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(text);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
-            }
-        }
-    }
-
-
-    public void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType,
-                                          int ruleNumber, String reason, String legalBasis) {
-
-        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
-
-        Matcher matcher = compiledPattern.matcher(searchText);
-
-        while (matcher.find()) {
-            String match = matcher.group(group);
-            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
-                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
-                localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(match);
-            }
-        }
-    }
-
-
-    public void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
-                              String reason, String legalBasis) {
-
-        String[] values = StringUtils.substringsBetween(searchText, start, stop);
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-
-                    Set<Entity> found = findEntities(value.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                    if (redactEverywhere && !isLocal()) {
-                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
-                    }
-                }
-            }
-        }
-    }
-
-
-    public void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere,
-                                   String reason, String legalBasis) {
-
-        String[] values = StringUtils.substringsBetween(text, start, stop);
-
-        if (values != null) {
-            for (String value : values) {
-                if (StringUtils.isNotBlank(value)) {
-                    String[] lines = value.split("\n");
-
-                    for (String line : lines) {
-
-                        if (line.trim().length() <= 2) {
-                            return;
-                        }
-
-                        Set<Entity> found = findEntities(line.trim(), asType, false, true, ruleNumber, reason, legalBasis);
-                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
-
-                        if (redactEverywhere && !isLocal()) {
-                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    public void highlightCell(String cellHeader, int ruleNumber, String type) {
+    @ThenAction
+    public void highlightCell(@Argument(ArgumentType.STRING) String cellHeader, @Argument(ArgumentType.RULE_NUMBER) int ruleNumber, @Argument(ArgumentType.TYPE) String type) {

        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
    }


-    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String reason,
-                           String legalBasis) {
+    private void redactAndRecommendByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis,
+                                           boolean redaction) {

-        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+        Matcher matcher = compiledPattern.matcher(searchText);
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match) && match.length() >= 3) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+                localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + asType, (x) -> new HashSet<>()).add(match);
+            }
+        }
    }


-    public void redactNotCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations,
-                              String reason) {
-
-        annotateCell(cellHeader, ruleNumber, type, false, addAsRecommendations, reason, null);
-    }
-
-
-    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted,
-                                     int ruleNumber, String reason, String legalBasis) {
+    private Set<Entity> findEntities(String value, String asType, boolean caseInsensitive, boolean redacted, int ruleNumber, String reason, String legalBasis, Engine engine) {

        String text = caseInsensitive ? searchText.toLowerCase() : searchText;
        String searchValue = caseInsensitive ? value.toLowerCase() : value;

-        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, true, false);
+        Set<Entity> found = EntitySearchUtils.find(text, Set.of(searchValue), asType, headline, sectionNumber, false, false, engine, false);

        found.forEach(entity -> {
            if (redacted) {
@@ -426,8 +627,35 @@ public class Section {
    }


-    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact,
-                              boolean addAsRecommendations, String reason, String legalBasis) {
+    private void redact(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType().equals(RECOMMENDATION_PREFIX + type)) {
+                entity.setRedaction(redaction);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    private void redactImage(String type, int ruleNumber, String reason, String legalBasis, boolean redaction) {
+
+        images.forEach(image -> {
+            if (image.getType().equals(type)) {
+                image.setRedaction(redaction);
+                image.setMatchedRule(ruleNumber);
+                image.setRedactionReason(reason);
+                image.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact, boolean addAsRecommendations, String reason, String legalBasis) {

        String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

@@ -437,7 +665,7 @@ public class Section {
        } else {
            String word = value.toString();

-            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false);
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false, false, Engine.RULE);
            entity.setRedaction(redact);
            entity.setMatchedRule(ruleNumber);
            entity.setRedactionReason(reason);
@@ -464,17 +692,119 @@ public class Section {
                while (matcher.find()) {
                    String match = matcher.group().trim();
                    if (match.length() >= 3) {
-                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
-                                .add(match);
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(match);
                        String lastname = match.split(" ")[0];
-                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>())
-                                .add(lastname);
+                        localDictionaryAdds.computeIfAbsent(RECOMMENDATION_PREFIX + type, (x) -> new HashSet<>()).add(lastname);
                    }
                }
            }
        }
    }

+
+    private void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
+
+        String[] values = StringUtils.substringsBetween(text, start, "\n");
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
+                    }
+                }
+            }
+        }
+    }
+
+
+    private void redactByRegEx(String pattern, boolean patternCaseInsensitive, int group, String asType, int ruleNumber, String reason, String legalBasis, boolean redaction) {
+
+        Pattern compiledPattern = Patterns.getCompiledPattern(pattern, patternCaseInsensitive);
+
+        Matcher matcher = compiledPattern.matcher(searchText);
+
+        while (matcher.find()) {
+            String match = matcher.group(group);
+            if (StringUtils.isNotBlank(match)) {
+                Set<Entity> found = findEntities(match.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+            }
+        }
+    }
+
+
+    private void redactBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
+
+        String[] values = StringUtils.substringsBetween(searchText, start, stop);
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+
+                    Set<Entity> found = findEntities(value.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                    EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+
+                    if (redactEverywhere && !isLocal()) {
+                        localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(value.trim());
+                    }
+                }
+            }
+        }
+    }
+
+
+    private void redactLinesBetween(String start, String stop, String asType, int ruleNumber, boolean redactEverywhere, String reason, String legalBasis, boolean redaction) {
+
+        String[] values = StringUtils.substringsBetween(text, start, stop);
+
+        if (values != null) {
+            for (String value : values) {
+                if (StringUtils.isNotBlank(value)) {
+                    String[] lines = value.split("\n");
+
+                    for (String line : lines) {
+
+                        if (line.trim().length() <= 2) {
+                            return;
+                        }
+
+                        Set<Entity> found = findEntities(line.trim(), asType, false, redaction, ruleNumber, reason, legalBasis, Engine.RULE);
+                        EntitySearchUtils.addEntitiesWithHigherRank(entities, found, dictionary);
+
+                        if (redactEverywhere && !isLocal()) {
+                            localDictionaryAdds.computeIfAbsent(asType, (x) -> new HashSet<>()).add(line.trim());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface WhenCondition {
+
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface ThenAction {
+
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.PARAMETER)
+    public @interface Argument {
+
+        ArgumentType value() default ArgumentType.STRING;
+
+    }
+
 }


@@ -0,0 +1,14 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+
+@Data
+public class Classification {
+
+    private Map<String, Float> probabilities = new HashMap<>();
+    private String label;
+
+}
@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class FilterGeometry {
+
+    private ImageSize imageSize;
+    private ImageFormat imageFormat;
+}
@@ -0,0 +1,11 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class Filters {
+
+    private FilterGeometry geometry;
+    private Probability probability;
+    private boolean allPassed;
+}
@@ -0,0 +1,9 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class Geometry {
+    private float width;
+    private float height;
+}
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class ImageFormat {
+
+    private float quotient;
+    private boolean tooTall;
+    private boolean tooWide;
+
+}
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class ImageMetadata {
+
+    private Classification classification;
+    private Position position;
+    private Geometry geometry;
+    private Filters filters;
+}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class ImageServiceResponse {
+
+    private String dossierId;
+    private String fileId;
+    private List<ImageMetadata> imageMetadata = new ArrayList<>();
+
+}
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class ImageSize {
+
+    private float quotient;
+    private boolean tooLarge;
+    private boolean tooSmall;
+
+}
@@ -0,0 +1,12 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class Position {
+    private float x1;
+    private float x2;
+    private float y1;
+    private float y2;
+    private int pageNumber;
+}
@@ -0,0 +1,10 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model.image;
+
+import lombok.Data;
+
+@Data
+public class Probability {
+
+    private boolean unconfident;
+
+}
@@ -0,0 +1,36 @@
+package com.iqser.red.service.redaction.v1.server.redaction.rulebuilder;
+
+import com.iqser.red.service.redaction.v1.model.Argument;
+import com.iqser.red.service.redaction.v1.model.RuleBuilderModel;
+import com.iqser.red.service.redaction.v1.model.RuleElement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class RuleBuilderModelService {
+
+    public RuleBuilderModel getRuleBuilderModel() {
+
+        var whenConditions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.WhenCondition.class)).collect(Collectors.toList());
+        var thenActions = Arrays.stream(Section.class.getDeclaredMethods()).filter(m -> m.isAnnotationPresent(Section.ThenAction.class)).collect(Collectors.toList());
+
+        RuleBuilderModel ruleBuilderModel = new RuleBuilderModel();
+
+
+        ruleBuilderModel.setWhenClauses(whenConditions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
+        ruleBuilderModel.setThenConditions(thenActions.stream().map(c -> new RuleElement(c.getName(), toArguments(c))).collect(Collectors.toList()));
+
+        return ruleBuilderModel;
+    }
+
+    private List<Argument> toArguments(Method c) {
+        return Arrays.stream(c.getParameters())
+                .map(parameter -> new Argument(parameter.getName(), parameter.getAnnotation(Section.Argument.class).value()))
+                .collect(Collectors.toList());
+    }
+}
@@ -1,49 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
-import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AnalyzeResponseService {
-
-    public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount, RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
-        boolean hasHints = redactionLog.getRedactionLogEntry().stream().anyMatch(RedactionLogEntry::isHint);
-
-        boolean hasRequests = redactionLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));
-
-        boolean hasRedactions = redactionLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED));
-
-        boolean hasImages = redactionLog.getRedactionLogEntry()
-                .stream()
-                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image"));
-
-        boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
-                .getRedactionLogEntry()
-                .isEmpty() && redactionChangeLog.getRedactionLogEntry().stream().anyMatch(entry -> !entry.getType().equals("false_positive"));
-
-        return AnalyzeResult.builder()
-                .dossierId(dossierId)
-                .fileId(fileId)
-                .duration(duration)
-                .numberOfPages(pageCount)
-                .hasHints(hasHints)
-                .hasRedactions(hasRedactions)
-                .hasRequests(hasRequests)
-                .hasImages(hasImages)
-                .hasUpdates(hasUpdates)
-                .rulesVersion(redactionLog.getRulesVersion())
-                .dictionaryVersion(redactionLog.getDictionaryVersion())
-                .legalBasisVersion(redactionLog.getLegalBasisVersion())
-                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
-                .build();
-    }
-}
@@ -0,0 +1,313 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import static com.iqser.red.service.redaction.v1.server.redaction.service.ImportedRedactionService.IMPORTED_REDACTION_TYPE;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.StructureAnalyzeRequest;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.Text;
+import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
+import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryVersion;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.redaction.model.RedRectangle2D;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.segmentation.ImageService;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AnalyzeService {
+
+    private final DictionaryService dictionaryService;
+    private final DroolsExecutionService droolsExecutionService;
+    private final EntityRedactionService entityRedactionService;
+    private final RedactionLogCreatorService redactionLogCreatorService;
+    private final RedactionStorageService redactionStorageService;
+    private final PdfSegmentationService pdfSegmentationService;
+    private final RedactionChangeLogService redactionChangeLogService;
+    private final LegalBasisClient legalBasisClient;
+    private final RedactionServiceSettings redactionServiceSettings;
+    private final SectionTextBuilderService sectionTextBuilderService;
+    private final SectionGridCreatorService sectionGridCreatorService;
+    private final ImageService imageService;
+    private final ImportedRedactionService importedRedactionService;
+
+
+    public AnalyzeResult analyzeDocumentStructure(StructureAnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+
+        var pageCount = 0;
+        Document classifiedDoc;
+
+        try {
+            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
+
+            Map<Integer, List<PdfImage>> pdfImages = null;
+            if (redactionServiceSettings.isEnableImageClassification()) {
+                pdfImages = imageService.convertImages(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+            }
+            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream, pdfImages);
+            pageCount = classifiedDoc.getPages().size();
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+
+        List<SectionText> sectionTexts = sectionTextBuilderService.buildSectionText(classifiedDoc);
+        sectionGridCreatorService.createSectionGrid(classifiedDoc, pageCount);
+
+        Text text = new Text(pageCount, sectionTexts);
+
+        // enhance section grid with headline data
+        sectionTexts.forEach(sectionText -> classifiedDoc.getSectionGrid()
+                .getSections()
+                .add(new SectionGrid.SectionGridSection(sectionText.getSectionNumber(), sectionText.getHeadline(), sectionText.getSectionAreas()
+                        .stream()
+                        .map(SectionArea::getPage)
+                        .collect(Collectors.toSet()), sectionText.getSectionAreas())));
+
+        log.info("Store text and section grid for file {} in dossier {}", analyzeRequest.getFileId(), analyzeRequest.getDossierId());
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, text);
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc.getSectionGrid());
+
+        return AnalyzeResult.builder()
+                .dossierId(analyzeRequest.getDossierId())
+                .fileId(analyzeRequest.getFileId())
+                .duration(System.currentTimeMillis() - startTime)
+                .numberOfPages(text.getNumberOfPages())
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
+                .build();
+    }
+
+
+    @SneakyThrows
+    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+
+        var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+
+        // not yet ready for reanalysis
+        if (redactionLog == null || text == null || text.getNumberOfPages() == 0) {
+            return analyze(analyzeRequest);
+        }
+
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog.getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
+
+        Set<Integer> sectionsToReanalyse = !analyzeRequest.getSectionsToReanalyse()
+                .isEmpty() ? analyzeRequest.getSectionsToReanalyse() : findSectionsToReanalyse(dictionaryIncrement, redactionLog, text, analyzeRequest);
+
+        if (sectionsToReanalyse.isEmpty()) {
+            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
+        }
+
+        NerEntities nerEntities;
+        if (redactionServiceSettings.isNerServiceEnabled()) {
+            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        } else {
+            nerEntities = NerEntities.builder().build();
+        }
+
+        List<SectionText> reanalysisSections = text.getSectionTexts()
+                .stream()
+                .filter(sectionText -> sectionsToReanalyse.contains(sectionText.getSectionNumber()))
+                .collect(Collectors.toList());
+
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+
+        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, reanalysisSections, kieContainer, analyzeRequest, nerEntities);
+        var newRedactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
+
+        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), newRedactionLogEntries, false);
+
+        redactionLog.getRedactionLogEntry()
+                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()) && !entry.getType()
+                        .equals(IMPORTED_REDACTION_TYPE));
+        redactionLog.getRedactionLogEntry().addAll(importedRedactionFilteredEntries);
+
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement.getDictionaryVersion(), true);
+    }
+
+
+    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
+
+        long startTime = System.currentTimeMillis();
+        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+
+        NerEntities nerEntities;
+        if (redactionServiceSettings.isNerServiceEnabled()) {
+            nerEntities = redactionStorageService.getNerEntities(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
+        } else {
+            nerEntities = NerEntities.builder().build();
+        }
+        dictionaryService.updateDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
+        long rulesVersion = droolsExecutionService.getRulesVersion(analyzeRequest.getDossierTemplateId());
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
+
+        PageEntities pageEntities = entityRedactionService.findEntities(dictionary, text.getSectionTexts(), kieContainer, analyzeRequest, nerEntities);
+
+        List<RedactionLogEntry> redactionLogEntries = redactionLogCreatorService.createRedactionLog(pageEntities, text.getNumberOfPages(), analyzeRequest.getDossierTemplateId());
+
+        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
+        var redactionLog = new RedactionLog(redactionServiceSettings.getAnalysisVersion(), analyzeRequest.getAnalysisNumber(), redactionLogEntries, legalBasis, dictionary.getVersion()
+                .getDossierTemplateVersion(), dictionary.getVersion()
+                .getDossierVersion(), rulesVersion, legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
+
+        var importedRedactionFilteredEntries = importedRedactionService.processImportedRedactions(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog.getRedactionLogEntry(), true);
+        redactionLog.setRedactionLogEntry(importedRedactionFilteredEntries);
+
+        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionary.getVersion(), false);
+    }
+
+
+    private Set<Integer> findSectionsToReanalyse(DictionaryIncrement dictionaryIncrement, RedactionLog redactionLog,
+                                                 Text text, AnalyzeRequest analyzeRequest) {
+
+        long start = System.currentTimeMillis();
+        Set<String> relevantManuallyModifiedAnnotationIds = getRelevantManuallyModifiedAnnotationIds(analyzeRequest.getManualRedactions());
+
+        Set<Integer> sectionsToReanalyse = new HashSet<>();
+        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
+        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+            if (entry.isLocalManualRedaction() || relevantManuallyModifiedAnnotationIds.contains(entry.getId())) {
+                sectionsToReanalyse.add(entry.getSectionNumber());
+            }
+            if (entry.isImage()) {
+                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
+            }
+        }
+
+        for (SectionText sectionText : text.getSectionTexts()) {
+
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
+                sectionsToReanalyse.add(sectionText.getSectionNumber());
+            }
+
+        }
+
+        log.info("Should reanalyze {} sections for request: {}, took: {}", sectionsToReanalyse.size(), analyzeRequest, System.currentTimeMillis() - start);
+
+        return sectionsToReanalyse;
+    }
+
+
+    private AnalyzeResult finalizeAnalysis(@RequestBody AnalyzeRequest analyzeRequest, long startTime,
+                                           RedactionLog redactionLog, Text text, DictionaryVersion dictionaryVersion,
+                                           boolean isReanalysis) {
+
+        redactionLog.setDictionaryVersion(dictionaryVersion.getDossierTemplateVersion());
+        redactionLog.setDossierDictionaryVersion(dictionaryVersion.getDossierVersion());
+
+        excludeExcludedPages(redactionLog, analyzeRequest.getExcludedPages());
+
+        var redactionLogChange = redactionChangeLogService.computeChanges(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog, analyzeRequest.getAnalysisNumber());
+        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLogChange.getRedactionLog());
+
+        long duration = System.currentTimeMillis() - startTime;
+
+        return AnalyzeResult.builder()
+                .dossierId(analyzeRequest.getDossierId())
+                .fileId(analyzeRequest.getFileId())
+                .duration(duration)
+                .numberOfPages(text.getNumberOfPages())
+                .hasUpdates(redactionLogChange.isHasChanges())
+                .analysisVersion(redactionServiceSettings.getAnalysisVersion())
+                .analysisNumber(analyzeRequest.getAnalysisNumber())
+                .rulesVersion(redactionLog.getRulesVersion())
+                .dictionaryVersion(redactionLog.getDictionaryVersion())
+                .legalBasisVersion(redactionLog.getLegalBasisVersion())
+                .dossierDictionaryVersion(redactionLog.getDossierDictionaryVersion())
+                .wasReanalyzed(isReanalysis)
+                .manualRedactions(analyzeRequest.getManualRedactions())
+                .build();
+    }
+
+
+    private Set<String> getRelevantManuallyModifiedAnnotationIds(ManualRedactions manualRedactions) {
+
+        if (manualRedactions == null) {
+            return new HashSet<>();
+        }
+
+        return Stream.concat(manualRedactions.getLegalBasisChanges()
+                .stream()
+                .map(ManualLegalBasisChange::getAnnotationId), Stream.concat(manualRedactions.getImageRecategorization()
+                .stream()
+                .map(ManualImageRecategorization::getAnnotationId), Stream.concat(manualRedactions.getIdsToRemove()
+                .stream()
+                .map(IdRemoval::getAnnotationId), manualRedactions.getForceRedactions()
+                .stream()
+                .map(ManualForceRedaction::getAnnotationId)))).collect(Collectors.toSet());
+    }
+
+
+    public Image convert(RedactionLogEntry entry) {
+
+        Rectangle position = entry.getPositions().get(0);
+
+        return Image.builder()
+                .type(entry.getType())
+                .position(new RedRectangle2D(position.getTopLeft().getX(), position.getTopLeft()
+                        .getY(), position.getWidth(), position.getHeight()))
+                .sectionNumber(entry.getSectionNumber())
+                .section(entry.getSection())
+                .page(position.getPage())
+                .hasTransparency(entry.isImageHasTransparency())
+                .build();
+    }
+
+
+    private void excludeExcludedPages(RedactionLog redactionLog, Set<Integer> excludedPages) {
+
+        if (excludedPages != null && !excludedPages.isEmpty()) {
+            redactionLog.getRedactionLogEntry().forEach(entry -> entry.getPositions().forEach(pos -> {
+                if (excludedPages.contains(pos.getPage())) {
+                    entry.setExcluded(true);
+                }
+            }));
+        }
+    }
+
+}
@@ -1,5 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
 import com.iqser.red.service.redaction.v1.model.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -14,21 +16,16 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
 import org.springframework.stereotype.Service;

-import java.awt.Color;
+import java.awt.*;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
 public class AnnotationService {

-    private final DictionaryService dictionaryService;
-

    public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {

@@ -91,7 +88,7 @@ public class AnnotationService {
        if (redactionLogEntry.getComments() != null) {
            for (Comment comment : redactionLogEntry.getComments()) {
                PDAnnotationText txtAnnot = new PDAnnotationText();
-                txtAnnot.setAnnotationName(comment.getId());
+                txtAnnot.setAnnotationName(String.valueOf(comment.getId()));
                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
@@ -108,10 +105,10 @@ public class AnnotationService {

    private String createAnnotationContent(RedactionLogEntry redactionLogEntry) {

-        if (redactionLogEntry.isManual()) {
+        if (redactionLogEntry.isLocalManualRedaction()) {
            return "\nManual Redaction\n\nIn Section : \"" + redactionLogEntry.getSection() + "\"";
        }
-        return "\nRule " + redactionLogEntry.getMatchedRule() + " matched\n\n" + redactionLogEntry.getReason() + "\n\nLegal basis:" + redactionLogEntry
+        return redactionLogEntry.getType() + " \nRule " + redactionLogEntry.getMatchedRule() + " matched\n\n" + redactionLogEntry.getReason() + "\n\nLegal basis:" + redactionLogEntry
                .getLegalBasis() + "\n\nIn section: \"" + redactionLogEntry.getSection() + "\"";
    }

@@ -170,12 +167,12 @@ public class AnnotationService {

    private float[] toQuadPoint(Rectangle rectangle, PDRectangle mediaBox, PDRectangle cropBox) {

-        var x1 = rectangle.getTopLeft().getX() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
-        var y1 = rectangle.getTopLeft().getY() + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+        var x1 = rectangle.getTopLeft().getX() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
+        var y1 = rectangle.getTopLeft().getY() + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);
        var x2 = rectangle.getTopLeft()
-                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftX() + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftX() : 0f);
        var y2 = rectangle.getTopLeft()
-                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY()) + (cropBox.toString().equals(mediaBox.toString()) ? cropBox.getLowerLeftY() : 0f);

        // quadPoints is array of x,y coordinates in Z-like order (top-left, top-right, bottom-left,bottom-right)
        // of the area to be highlighted
@@ -1,9 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.configuration.v1.api.model.Colors;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
-import com.iqser.red.service.configuration.v1.api.model.TypeResponse;
-import com.iqser.red.service.configuration.v1.api.model.TypeResult;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
 import com.iqser.red.service.redaction.v1.server.redaction.model.*;
@@ -14,11 +12,11 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.Service;

-import java.awt.Color;
+import java.awt.*;
+import java.util.List;
 import java.util.*;
 import java.util.stream.Collectors;

-import static com.iqser.red.service.configuration.v1.api.resource.DictionaryResource.GLOBAL_DOSSIER;

@Slf4j
@Service
@@ -33,16 +31,17 @@ public class DictionaryService {

    public DictionaryVersion updateDictionary(String dossierTemplateId, String dossierId) {

-        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
+        log.info("Updating dictionary data for dossierTemplate {} and dossier {}", dossierTemplateId, dossierId);
+        long dossierTemplateDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId);
        var dossierTemplateDictionary = dictionariesByDossierTemplate.get(dossierTemplateId);
        if (dossierTemplateDictionary == null || dossierTemplateDictionaryVersion > dossierTemplateDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, GLOBAL_DOSSIER);
+            updateDictionaryEntry(dossierTemplateId, dossierTemplateDictionaryVersion, getVersion(dossierTemplateDictionary), null);
        }

-        long dossierDictionaryVersion = dictionaryClient.getVersion(dossierTemplateId, dossierId);
+        long dossierDictionaryVersion = dictionaryClient.getVersionForDossier(dossierId);
        var dossierDictionary = dictionariesByDossier.get(dossierId);
        if (dossierDictionary == null || dossierDictionaryVersion > dossierDictionary.getDictionaryVersion()) {
-            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, dossierId);
+            updateDictionaryEntry(dossierTemplateId, dossierDictionaryVersion, getVersion(dossierDictionary), dossierId);
        }

        return DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateDictionaryVersion).dossierVersion(dossierDictionaryVersion).build();
@@ -63,7 +62,7 @@ public class DictionaryService {
            });
        });

-        if(dictionariesByDossier.containsKey(dossierId)) {
+        if (dictionariesByDossier.containsKey(dossierId)) {
            dictionaryModels = dictionariesByDossier.get(dossierId).getDictionary();
            dictionaryModels.forEach(dictionaryModel -> {
                dictionaryModel.getEntries().forEach(dictionaryEntry -> {
@@ -78,18 +77,36 @@ public class DictionaryService {
    }


-    private void updateDictionaryEntry(String dossierTemplateId, long version, String dossierId) {
+    private void updateDictionaryEntry(String dossierTemplateId, long version, Long currentVersion, String dossierId) {

        try {
            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();

-            TypeResponse typeResponse = dictionaryClient.getAllTypes(dossierTemplateId, dossierId);
-            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
+            var typeResponse = dossierId == null ? dictionaryClient.getAllTypesForDossierTemplate(dossierTemplateId) : dictionaryClient.getAllTypesForDossier(dossierId);
+            if (CollectionUtils.isNotEmpty(typeResponse)) {

-                List<DictionaryModel> dictionary = typeResponse.getTypes()
+                List<DictionaryModel> dictionary = typeResponse
                        .stream()
-                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
-                                .isHint(), t.isRecommendation(), convertEntries(t, dossierId), new HashSet<>(), !dossierId.equals(GLOBAL_DOSSIER)))
+                        .map(t -> {
+
+                            Optional<DictionaryModel> oldModel;
+                            if (dossierId == null) {
+                                var representation = dictionariesByDossierTemplate.get(dossierTemplateId);
+                                oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
+                            } else {
+                                var representation = dictionariesByDossier.get(dossierId);
+                                oldModel = representation != null ? representation.getDictionary().stream().filter(f -> f.getType().equals(t.getType())).findAny() : Optional.empty();
+                            }
+
+                            Set<DictionaryEntry> entries = new HashSet<>();
+                            // add old entries from existing DictionaryModel
+                            oldModel.ifPresent(dictionaryModel -> entries.addAll(dictionaryModel.getEntries()));
+                            // Add Increments
+                            entries.addAll(convertEntries(t.getId(), currentVersion));
+
+                            return new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
+                                    .isHint(), t.isRecommendation(), entries, new HashSet<>(), dossierId != null);
+                        })
                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());

@@ -105,7 +122,7 @@ public class DictionaryService {
                dictionaryRepresentation.setDictionaryVersion(version);
                dictionaryRepresentation.setDictionary(dictionary);

-                if(dossierId.equals(GLOBAL_DOSSIER)) {
+                if (dossierId == null) {
                    dictionariesByDossierTemplate.put(dossierTemplateId, dictionaryRepresentation);
                } else {
                    dictionariesByDossier.put(dossierId, dictionaryRepresentation);
@@ -118,26 +135,14 @@ public class DictionaryService {
    }


-    public void updateExternalDictionary(Dictionary dictionary, String dossierTemplateId) {
+    private Set<DictionaryEntry> convertEntries(String typeId, Long fromVersion) {

-        dictionary.getDictionaryModels().forEach(dm -> {
-            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
-                dictionaryClient.addEntries(dm.getType(), dossierTemplateId, new ArrayList<>(dm.getLocalEntries()), false, GLOBAL_DOSSIER);
-                long externalVersion = dictionaryClient.getVersion(dossierTemplateId, GLOBAL_DOSSIER);
-                if (externalVersion == dictionary.getVersion().getDossierTemplateVersion() + 1) {
-                    dictionary.getVersion().setDossierTemplateVersion(externalVersion);
-                }
-            }
-        });
-    }
+        var type = dictionaryClient.getDictionaryForType(typeId, fromVersion);

-
-    private Set<DictionaryEntry> convertEntries(TypeResult t, String dossierId) {
-
-        Set<DictionaryEntry> entries = new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getDossierTemplateId(), dossierId)
+        Set<DictionaryEntry> entries = new HashSet<>(type
                .getEntries());

-        if (t.isCaseInsensitive()) {
+        if (type.isCaseInsensitive()) {
            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
        }
        return entries;
@@ -202,7 +207,7 @@ public class DictionaryService {

        //TODO merge dictionaries if they have same names
        long dossierDictionaryVersion = -1;
-        if(dictionariesByDossier.containsKey(dossierId)) {
+        if (dictionariesByDossier.containsKey(dossierId)) {
            var dossierRepresentation = dictionariesByDossier.get(dossierId);
            dossierRepresentation.getDictionary().forEach(dm -> {
                copy.add(SerializationUtils.clone(dm));
@@ -210,13 +215,13 @@ public class DictionaryService {
            dossierDictionaryVersion = dossierRepresentation.getDictionaryVersion();
        }

-        return new Dictionary(copy, DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
+        return new Dictionary(copy.stream().sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed()).collect(Collectors.toList()), DictionaryVersion.builder().dossierTemplateVersion(dossierTemplateRepresentation.getDictionaryVersion()).dossierVersion(dossierDictionaryVersion).build());
    }


    public float[] getRequestRemoveColor(String dossierTemplateId) {

-        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
+        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestRemoveColor();
    }


@@ -231,4 +236,11 @@ public class DictionaryService {
        return dictionariesByDossierTemplate.get(dossierTemplateId).getRequestAddColor();
    }

+    private Long getVersion(DictionaryRepresentation dictionaryRepresentation) {
+        if (dictionaryRepresentation == null) {
+            return null;
+        } else {
+            return dictionaryRepresentation.getDictionaryVersion();
+        }
+    }
 }
@@ -1,6 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
@@ -63,7 +62,7 @@ public class DroolsExecutionService {
            rulesVersion = -1L;
        }

-        if (version > rulesVersion.longValue()) {
+        if (version > rulesVersion) {
            rulesVersionPerDossierTemplateId.put(dossierTemplateId, version);
            return createOrUpdateKieContainer(dossierTemplateId);
        }
@@ -76,13 +75,13 @@ public class DroolsExecutionService {

        try {

-            RulesResponse rules = rulesClient.getRules(dossierTemplateId);
-            if (rules == null || StringUtils.isEmpty(rules.getRules())) {
+            var rules = rulesClient.getRules(dossierTemplateId);
+            if (rules == null || StringUtils.isEmpty(rules.getValue())) {
                throw new RuntimeException("Rules cannot be empty.");
            }

            KieServices kieServices = KieServices.Factory.get();
-            KieModule kieModule = getKieModule(dossierTemplateId, rules.getRules(), kieServices);
+            KieModule kieModule = getKieModule(dossierTemplateId, rules.getValue(), kieServices);

            var container = kieContainers.get(dossierTemplateId);
            if (container != null) {
@@ -128,7 +127,7 @@ public class DroolsExecutionService {
        if (rulesVersion == null) {
            return -1;
        }
-        return rulesVersion.longValue();
+        return rulesVersion;
    }

 }
@@ -1,64 +1,170 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
-import com.iqser.red.service.redaction.v1.model.ManualRedactions;
-import com.iqser.red.service.redaction.v1.model.Point;
-import com.iqser.red.service.redaction.v1.model.Rectangle;
-import com.iqser.red.service.redaction.v1.model.SectionArea;
-import com.iqser.red.service.redaction.v1.server.classification.model.*;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.Service;

-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
+import com.iqser.red.service.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.client.model.NerEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Section;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SectionSearchableTextPair;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

@Slf4j
@Service
@RequiredArgsConstructor
 public class EntityRedactionService {

-    private final DictionaryService dictionaryService;
+    private final RedactionServiceSettings redactionServiceSettings;
    private final DroolsExecutionService droolsExecutionService;
    private final SurroundingWordsService surroundingWordsService;


-    public void processDocument(Document classifiedDoc, String dossierTemplateId, ManualRedactions manualRedactions, String dossierId) {
+    public PageEntities findEntities(Dictionary dictionary, List<SectionText> sectionTexts, KieContainer kieContainer,
+                                     AnalyzeRequest analyzeRequest, NerEntities nerEntities) {

-        dictionaryService.updateDictionary(dossierTemplateId, dossierId);
-        KieContainer container = droolsExecutionService.updateRules(dossierTemplateId);
-        long rulesVersion = droolsExecutionService.getRulesVersion(dossierTemplateId);
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(dossierTemplateId, dossierId);
-
-        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));
+        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
+        Set<Entity> entities = findEntities(sectionTexts, dictionary, kieContainer, analyzeRequest, false, null, imagesPerPage, nerEntities);

        if (dictionary.hasLocalEntries()) {
-
-            Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
-            documentEntities.stream().forEach(entity -> {
-                if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
-                    hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>())
-                            .add(entity);
-                }
-            });
-
-            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
-            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
-            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
+            Map<Integer, Set<Entity>> hintsPerSectionNumber = getHintsPerSection(entities, dictionary);
+            Set<Entity> foundByLocal = findEntities(sectionTexts, dictionary, kieContainer, analyzeRequest, true, hintsPerSectionNumber, imagesPerPage, nerEntities);
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
        }

-        for (Entity entity : documentEntities) {
+        Map<Integer, List<Entity>> entitiesPerPage = convertToEntitiesPerPage(entities);
+        EntitySearchUtils.removeEntitiesContainedInRedactedLogos(imagesPerPage, entitiesPerPage);
+
+        return new PageEntities(entitiesPerPage, imagesPerPage);
+    }
+
+
+    public Set<Entity> findEntities(List<SectionText> reanalysisSections, Dictionary dictionary,
+                                    KieContainer kieContainer, AnalyzeRequest analyzeRequest, boolean local,
+                                    Map<Integer, Set<Entity>> hintsPerSectionNumber,
+                                    Map<Integer, Set<Image>> imagesPerPage, NerEntities nerEntities) {
+
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        for (SectionText reanalysisSection : reanalysisSections) {
+
+            Entities entities = findEntities(reanalysisSection.getSearchableText(), reanalysisSection.getHeadline(), reanalysisSection
+                    .getSectionNumber(), dictionary, local, nerEntities, reanalysisSection.getCellStarts());
+
+            if (reanalysisSection.getCellStarts() != null && !reanalysisSection.getCellStarts().isEmpty()) {
+                surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary, reanalysisSection
+                        .getCellStarts());
+            } else {
+                surroundingWordsService.addSurroundingText(entities.getEntities(), reanalysisSection.getSearchableText(), dictionary);
+            }
+
+            if (!local && analyzeRequest.getManualRedactions() != null) {
+
+                var approvedForceRedactions = analyzeRequest.getManualRedactions().getForceRedactions().stream()
+                        .filter(fr -> fr.getStatus() == AnnotationStatus.APPROVED)
+                        .filter(fr -> fr.getRequestDate() != null)
+                        .collect(Collectors.toList());
+                // only approved id removals, that haven't been forced back afterwards
+                var idsToRemove = analyzeRequest.getManualRedactions().getIdsToRemove().stream()
+                        .filter(idr -> idr.getStatus() == AnnotationStatus.APPROVED && !idr.isRemoveFromDictionary())
+                        .filter(idr -> idr.getRequestDate() != null)
+                        .filter(idr -> approvedForceRedactions.stream().noneMatch(forceRedact -> forceRedact.getRequestDate().isAfter(idr.getRequestDate())))
+                        .map(IdRemoval::getAnnotationId).collect(Collectors.toSet());
+
+                if (reanalysisSection.getImages() != null && !reanalysisSection.getImages()
+                        .isEmpty() && analyzeRequest.getManualRedactions().getImageRecategorization() != null) {
+                    for (Image image : reanalysisSection.getImages()) {
+                        String imageId = IdBuilder.buildId(image.getPosition(), image.getPage());
+                        for (ManualImageRecategorization imageRecategorization : analyzeRequest.getManualRedactions()
+                                .getImageRecategorization()) {
+                            if (imageRecategorization.getStatus()
+                                    .equals(AnnotationStatus.APPROVED) && imageRecategorization.getAnnotationId()
+                                    .equals(imageId)) {
+                                image.setType(imageRecategorization.getType());
+                            }
+                        }
+                        if (idsToRemove.contains(imageId)) {
+                            image.setIgnored(true);
+                        }
+                    }
+                }
+
+                entities.getEntities().forEach(entity -> entity.getPositionSequences().forEach(ps -> {
+                    if (idsToRemove.contains(ps.getId())) {
+                        entity.setIgnored(true);
+                    }
+                }));
+            }
+
+            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
+                    .isLocal(false)
+                    .dictionaryTypes(dictionary.getTypes())
+                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(reanalysisSection.getSectionNumber()) ? Stream
+                            .concat(entities.getEntities().stream(), hintsPerSectionNumber.get(reanalysisSection.getSectionNumber())
+                                    .stream())
+                            .collect(Collectors.toSet()) : entities.getEntities())
+                    .nerEntities(entities.getNerEntities())
+                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
+                    .searchText(reanalysisSection.getSearchableText().toString())
+                    .headline(reanalysisSection.getHeadline())
+                    .sectionNumber(reanalysisSection.getSectionNumber())
+                    .tabularData(reanalysisSection.getTabularData())
+                    .searchableText(reanalysisSection.getSearchableText())
+                    .dictionary(dictionary)
+                    .images(reanalysisSection.getImages())
+                    .fileAttributes(analyzeRequest.getFileAttributes())
+                    .build(), reanalysisSection.getSearchableText()));
+        }
+
+        Set<Entity> entities = new HashSet<>();
+        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
+            Section analysedSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
+            EntitySearchUtils.removeEntitiesContainedInLarger(analysedSection.getEntities());
+            entities.addAll(analysedSection.getEntities());
+
+            if (!local) {
+                for (Image image : analysedSection.getImages()) {
+                    imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
+                }
+                addLocalValuesToDictionary(analysedSection, dictionary);
+            }
+        });
+
+        return entities;
+    }
+
+
+    private Map<Integer, List<Entity>> convertToEntitiesPerPage(Set<Entity> entities) {
+
+        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
+        for (Entity entity : entities) {
            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
@@ -66,352 +172,111 @@ public class EntityRedactionService {
            }

            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                classifiedDoc.getEntities()
-                        .computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
+                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
+                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry(), entity.getEngines(), entity
+                                .getReferences()));
            }
        }
-
-        dictionaryService.updateExternalDictionary(dictionary, dossierTemplateId);
-
-        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
-        classifiedDoc.setRulesVersion(rulesVersion);
+        return entitiesPerPage;
    }


-    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
-                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
-                                     Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+    private Map<Integer, Set<Entity>> getHintsPerSection(Set<Entity> entities, Dictionary dictionary) {

-        Set<Entity> documentEntities = new HashSet<>();
-
-        AtomicInteger sectionNumber = new AtomicInteger(1);
-        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
-        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
-
-            List<Table> tables = paragraph.getTables();
-            for (Table table : tables) {
-                if (table.getColCount() == 2) {
-                    sectionSearchableTextPairs.addAll(processTableAsOneText(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
-                } else {
-                    sectionSearchableTextPairs.addAll(processTablePerRow(classifiedDoc, table, manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber));
-                }
-                sectionNumber.incrementAndGet();
+        Map<Integer, Set<Entity>> hintsPerSectionNumber = new HashMap<>();
+        entities.stream().forEach(entity -> {
+            if (dictionary.isHint(entity.getType()) && entity.isDictionaryEntry()) {
+                hintsPerSectionNumber.computeIfAbsent(entity.getSectionNumber(), (x) -> new HashSet<>()).add(entity);
            }
-            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
-                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
-                    .getImages()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (Header header : classifiedDoc.getHeaders()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, header.getSearchableText(), header.getTextBlocks(), "Header", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (Footer footer : classifiedDoc.getFooters()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, footer.getSearchableText(), footer.getTextBlocks(), "Footer", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
-            sectionSearchableTextPairs.add(processText(classifiedDoc, unclassifiedText.getSearchableText(), unclassifiedText
-                    .getTextBlocks(), "", manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, new ArrayList<>()));
-            sectionNumber.incrementAndGet();
-        }
-
-        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            documentEntities.addAll(analysedRowSection.getEntities());
-
-            for (Image image : analysedRowSection.getImages()) {
-                classifiedDoc.getImages().computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
-            }
-
-            analysedRowSection.getLocalDictionaryAdds().keySet().forEach(key -> {
-                if (dictionary.isRecommendation(key)) {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-                        if (!dictionary.containsValue(key, value)) {
-                            dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                        }
-                    });
-                } else {
-                    analysedRowSection.getLocalDictionaryAdds().get(key).forEach(value -> {
-
-                        if (dictionary.getLocalAccessMap().get(key) == null) {
-                            log.warn("Dictionary {} is null", key);
-                        }
-
-                        if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
-                            log.warn("Dictionary {} localEntries is null", key);
-                        }
-
-                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
-                    });
-                }
-            });
-
        });
-
-        return documentEntities;
+        return hintsPerSectionNumber;
    }


-    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
-                                                               ManualRedactions manualRedactions,
-                                                               AtomicInteger sectionNumber, Dictionary dictionary,
-                                                               boolean local,
-                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {
+    private void addLocalValuesToDictionary(Section analysedSection, Dictionary dictionary) {

-        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+        analysedSection.getLocalDictionaryAdds().keySet().forEach(key -> {
+            if (dictionary.isRecommendation(key)) {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {
+                    if (!dictionary.containsValue(key, value)) {
+                        dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                    }
+                });
+            } else {
+                analysedSection.getLocalDictionaryAdds().get(key).forEach(value -> {

-        for (List<Cell> row : table.getRows()) {
-            SearchableText searchableRow = new SearchableText();
-            Map<String, CellValue> tabularData = new HashMap<>();
-            int start = 0;
-            List<Integer> cellStarts = new ArrayList<>();
-            SectionText sectionText = new SectionText();
-            for (Cell cell : row) {
+                    if (dictionary.getLocalAccessMap().get(key) == null) {
+                        log.warn("Dictionary {} is null", key);
+                    }

-                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                    continue;
-                }
-
-                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
-                        .get(0)
-                        .getSequences()
-                        .get(0)
-                        .getPage());
-                sectionText.getSectionAreas().add(sectionArea);
-                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
-
-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
-                int cellStart = start;
-
-                if (!cell.isHeaderCell()) {
-                    cell.getHeaderCells().forEach(headerCell -> {
-                        StringBuilder headerBuilder = new StringBuilder();
-                        headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
-                        String headerName = headerBuilder.toString()
-                                .replaceAll("\n", "")
-                                .replaceAll(" ", "")
-                                .replaceAll("-", "");
-                        sectionArea.setHeader(headerName);
-                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
-                    });
-                }
-
-                for (TextBlock textBlock : cell.getTextBlocks()) {
-                    // TODO avoid cell overlap merging.
-                    searchableRow.addAll(textBlock.getSequences());
-                }
-                cellStarts.add(cellStart);
-                start = start + cell.toString().trim().length() + 1;
+                    if (dictionary.getLocalAccessMap().get(key).getLocalEntries() == null) {
+                        log.warn("Dictionary {} localEntries is null", key);
+                    }

+                    dictionary.getLocalAccessMap().get(key).getLocalEntries().add(value);
+                });
            }
-            Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
-            surroundingWordsService.addSurroundingText(rowEntities, searchableRow, dictionary, cellStarts);
-
-            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                    .isLocal(local)
-                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
-                            .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
-                            .collect(Collectors.toSet()) : rowEntities)
-                    .text(searchableRow.getAsStringWithLinebreaks())
-                    .searchText(searchableRow.toString())
-                    .headline(table.getHeadline())
-                    .sectionNumber(sectionNumber.intValue())
-                    .tabularData(tabularData)
-                    .searchableText(searchableRow)
-                    .dictionary(dictionary)
-                    .build(), searchableRow));
-
-            if (!local) {
-                sectionText.setText(searchableRow.toString());
-                sectionText.setHeadline(table.getHeadline());
-                sectionText.setSectionNumber(sectionNumber.intValue());
-                sectionText.setTable(true);
-                sectionText.setTabularData(tabularData);
-                sectionText.setCellStarts(cellStarts);
-                classifiedDoc.getSectionText().add(sectionText);
-            }
-
-            sectionNumber.incrementAndGet();
-        }
-
-        return sectionSearchableTextPairs;
+        });
    }


-    private List<SectionSearchableTextPair> processTableAsOneText(Document classifiedDoc, Table table,
-                                                                  ManualRedactions manualRedactions,
-                                                                  AtomicInteger sectionNumber, Dictionary dictionary,
-                                                                  boolean local,
-                                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber) {
-
-        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
-        SearchableText entireTableText = new SearchableText();
-        SectionText sectionText = new SectionText();
-        for (List<Cell> row : table.getRows()) {
-            for (Cell cell : row) {
-                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                    continue;
-                }
-
-                if (!local) {
-                    SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                            .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
-                            .get(0)
-                            .getSequences()
-                            .get(0)
-                            .getPage());
-                    sectionText.getTextBlocks().addAll(cell.getTextBlocks());
-                    sectionText.getSectionAreas().add(sectionArea);
-                }
-
-                for (TextBlock textBlock : cell.getTextBlocks()) {
-                    entireTableText.addAll(textBlock.getSequences());
-                }
-                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
-            }
-        }
-
-        Set<Entity> rowEntities = findEntities(entireTableText, table.getHeadline(), sectionNumber.intValue(), dictionary, local);
-        surroundingWordsService.addSurroundingText(rowEntities, entireTableText, dictionary);
-
-        sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                .isLocal(local)
-                .dictionaryTypes(dictionary.getTypes())
-                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
-                        .concat(rowEntities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
-                        .collect(Collectors.toSet()) : rowEntities)
-                .text(entireTableText.getAsStringWithLinebreaks())
-                .searchText(entireTableText.toString())
-                .headline(table.getHeadline())
-                .sectionNumber(sectionNumber.intValue())
-                .searchableText(entireTableText)
-                .dictionary(dictionary)
-                .build(), entireTableText));
-
-        if (!local) {
-            sectionText.setText(entireTableText.toString());
-            sectionText.setHeadline(table.getHeadline());
-            sectionText.setSectionNumber(sectionNumber.intValue());
-            sectionText.setTable(true);
-            classifiedDoc.getSectionText().add(sectionText);
-        }
-
-        return sectionSearchableTextPairs;
-    }
-
-
-    private SectionSearchableTextPair processText(Document classifiedDoc, SearchableText searchableText,
-                                                  List<TextBlock> paragraphTextBlocks, String headline,
-                                                  ManualRedactions manualRedactions, AtomicInteger sectionNumber,
-                                                  Dictionary dictionary, boolean local,
-                                                  Map<Integer, Set<Entity>> hintsPerSectionNumber,
-                                                  List<PdfImage> images) {
-
-        if (!local) {
-            SectionText sectionText = new SectionText();
-            for (TextBlock paragraphTextBlock : paragraphTextBlocks) {
-                SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
-                        .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage());
-                sectionText.getSectionAreas().add(sectionArea);
-            }
-
-            sectionText.setText(searchableText.toString());
-            sectionText.setHeadline(headline);
-            sectionText.setSectionNumber(sectionNumber.intValue());
-            sectionText.setTable(false);
-            sectionText.setImages(images.stream()
-                    .map(image -> convert(image, sectionNumber.intValue(), headline))
-                    .collect(Collectors.toSet()));
-            sectionText.setTextBlocks(paragraphTextBlocks);
-            classifiedDoc.getSectionText().add(sectionText);
-        }
-
-        addSectionToManualRedactions(paragraphTextBlocks, manualRedactions, headline, sectionNumber.intValue());
-        Set<Entity> entities = findEntities(searchableText, headline, sectionNumber.intValue(), dictionary, local);
-        surroundingWordsService.addSurroundingText(entities, searchableText, dictionary);
-
-        return new SectionSearchableTextPair(Section.builder()
-                .isLocal(local)
-                .dictionaryTypes(dictionary.getTypes())
-                .entities(hintsPerSectionNumber != null && hintsPerSectionNumber.containsKey(sectionNumber.intValue()) ? Stream
-                        .concat(entities.stream(), hintsPerSectionNumber.get(sectionNumber.intValue()).stream())
-                        .collect(Collectors.toSet()) : entities)
-                .text(searchableText.getAsStringWithLinebreaks())
-                .searchText(searchableText.toString())
-                .headline(headline)
-                .sectionNumber(sectionNumber.intValue())
-                .searchableText(searchableText)
-                .dictionary(dictionary)
-                .images(images.stream()
-                        .map(image -> convert(image, sectionNumber.intValue(), headline))
-                        .collect(Collectors.toSet()))
-                .build(), searchableText);
-    }
-
-
-    public Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber,
-                                    Dictionary dictionary, boolean local) {
+    private Entities findEntities(SearchableText searchableText, String headline, int sectionNumber,
+                                  Dictionary dictionary, boolean local, NerEntities nerEntities,
+                                  List<Integer> cellStarts) {

        Set<Entity> found = new HashSet<>();
        String searchableString = searchableText.toString();
        if (StringUtils.isEmpty(searchableString)) {
-            return found;
+            return new Entities(new HashSet<>(), new HashSet<>());
        }

        String lowercaseInputString = searchableString.toLowerCase();
        for (DictionaryModel model : dictionary.getDictionaryModels()) {
            if (model.isCaseInsensitive()) {
-                found.addAll(EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(lowercaseInputString, model.getValues(local), model
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false));
            } else {
-                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local, model.isDossierDictionary()));
+                EntitySearchUtils.addOrAddEngine(found, EntitySearchUtils.find(searchableString, model.getValues(local), model
+                        .getType(), headline, sectionNumber, !local, model.isDossierDictionary(), local ? Engine.RULE : Engine.DICTIONARY, false));
            }
        }

-        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
+        Set<Entity> nerFound = new HashSet<>();
+        if (!local) {
+            nerFound.addAll(getNerValues(sectionNumber, nerEntities, cellStarts, headline));
+        }
+
+        return new Entities(EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary), nerFound);
    }


-    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
-                                              String section, int sectionNumber) {
+    private Set<Entity> getNerValues(int sectionNumber, NerEntities nerEntities, List<Integer> cellStarts,
+                                     String headline) {

-        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
-            return;
-        }
+        Set<Entity> entities = new HashSet<>();

-        for (TextBlock textBlock : textBlocks) {
-            for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
-                for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                    if (textBlock.contains(rectangle)) {
-                        manualRedactionEntry.setSection(section);
-                        manualRedactionEntry.setSectionNumber(sectionNumber);
+        if (redactionServiceSettings.isNerServiceEnabled() && nerEntities.getResult().containsKey(sectionNumber)) {
+            nerEntities.getResult().get(sectionNumber).forEach(res -> {
+                if (cellStarts == null || cellStarts.isEmpty()) {
+                    entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER));
+                } else {
+                    boolean intersectsCellStart = false;
+                    for (Integer cellStart : cellStarts) {
+                        if (res.getStartOffset() < cellStart && cellStart < res.getEndOffset()) {
+                            intersectsCellStart = true;
+                            break;
+                        }
+                    }
+                    if (!intersectsCellStart) {
+                        entities.add(new Entity(res.getValue(), res.getType(), res.getStartOffset(), res.getEndOffset(), headline, sectionNumber, false, false, Engine.NER));
                    }
                }
-            }
+            });
        }
-    }
-
-
-    private Image convert(PdfImage pdfImage, int sectionNumber, String headline) {
-
-        return Image.builder()
-                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
-                        .name()
-                        .toLowerCase(Locale.ROOT))
-                .position(pdfImage.getPosition())
-                .sectionNumber(sectionNumber)
-                .section(headline)
-                .page(pdfImage.getPage())
-                .build();
+        return entities;
    }

 }
@@ -1,71 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import com.iqser.red.service.redaction.v1.server.classification.model.Page;
-import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
-import com.iqser.red.service.redaction.v1.server.client.ImageClassificationResponse;
-import com.iqser.red.service.redaction.v1.server.client.MockMultipartFile;
-import com.iqser.red.service.redaction.v1.server.redaction.model.ImageType;
-import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.imageio.ImageIO;
-import java.io.ByteArrayOutputStream;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ImageClassificationService {
-
-    private final ImageClassificationClient imageClassificationClient;
-    private final RedactionServiceSettings settings;
-
-
-    public void classifyImages(Page page) {
-
-        page.getImages().forEach(image -> {
-
-            if (settings.isEnableImageClassification() && !isEntirePageImage(image, page)) {
-
-                long start = System.currentTimeMillis();
-                try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-                    ImageIO.write(image.getImage(), "png", baos);
-                    var mockFile = new MockMultipartFile("file", "Image.png", "image/png", baos.toByteArray());
-                    ImageClassificationResponse response = imageClassificationClient.classify(mockFile);
-                    image.setImageType(ImageType.valueOf(response.getCategory()));
-                } catch (Exception e) {
-                    log.error("Could not classify image", e);
-                    image.setImageType(ImageType.OTHER);
-                }
-                log.info("Image classification took: " + (System.currentTimeMillis() - start));
-            } else {
-                image.setImageType(ImageType.OTHER);
-            }
-
-            image.getImage().flush();
-            image.setImage(null);
-
-            if (image.getImageType().equals(ImageType.OTHER)) {
-                page.getTextBlocks().forEach(textblock -> {
-                    if (image.getPosition()
-                            .contains(textblock.getMinX(), textblock.getMinY(), textblock.getWidth(), textblock.getHeight())) {
-                        image.setImageType(ImageType.OCR);
-                    }
-                });
-            }
-        });
-
-    }
-
-    private boolean isEntirePageImage(PdfImage image, Page page){
-        double imageArea = image.getPosition().getHeight() * image.getPosition().getWidth();
-        if(imageArea / page.getCropBoxArea() >= settings.getMaxImageCropboxRatio()){
-            log.info("Skipping image classification because images is almost as large as the entire page");
-            return true;
-        }
-        return false;
-    }
-
-}
@@ -0,0 +1,102 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.ImportedRedaction;
+import com.iqser.red.service.redaction.v1.model.ImportedRedactions;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class ImportedRedactionService {
+
+    public static final String IMPORTED_REDACTION_TYPE = "imported_redaction";
+
+    private final DictionaryService dictionaryService;
+    private final RedactionStorageService redactionStorageService;
+
+
+    public List<RedactionLogEntry> processImportedRedactions(String dossierTemplateId, String dossierId, String fileId,
+                                          List<RedactionLogEntry> redactionLogEntries, boolean addImportedRedactions) {
+
+        var importedRedactions = redactionStorageService.getImportedRedactions(dossierId, fileId);
+        if (importedRedactions == null) {
+            return redactionLogEntries;
+        }
+
+        redactionLogEntries.removeIf(redactionLogEntry -> hasIntersections(redactionLogEntry, importedRedactions));
+
+        if (addImportedRedactions) {
+            return addImportedRedactionsRedactionLogEntries(dossierTemplateId, redactionLogEntries, importedRedactions);
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    private List<RedactionLogEntry> addImportedRedactionsRedactionLogEntries(String dossierTemplateId,
+                                                          List<RedactionLogEntry> redactionLogEntries,
+                                                          ImportedRedactions importedRedactions) {
+
+        for (List<ImportedRedaction> importedRedactionsValues : importedRedactions.getImportedRedactions().values()) {
+            for (ImportedRedaction importedRedaction : importedRedactionsValues) {
+                RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
+                        .id(importedRedaction.getId())
+                        .type(IMPORTED_REDACTION_TYPE)
+                        .imported(true)
+                        .redacted(true)
+                        .positions(importedRedaction.getPositions())
+                        .color(getColor("imported_redaction", dossierTemplateId))
+                        .build();
+
+                redactionLogEntries.add(redactionLogEntry);
+            }
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    private boolean hasIntersections(RedactionLogEntry redactionLogEntry, ImportedRedactions importedRedactions) {
+
+        for (Rectangle rectangle : redactionLogEntry.getPositions()) {
+            if (importedRedactions.getImportedRedactions().containsKey(rectangle.getPage())) {
+                var importedRedactionsOnPage = importedRedactions.getImportedRedactions().get(rectangle.getPage());
+                for (ImportedRedaction importedRedaction : importedRedactionsOnPage) {
+                    for (Rectangle importedRedactionPosition : importedRedaction.getPositions()) {
+                        if (intersects(importedRedactionPosition, rectangle)) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+
+    private boolean intersects(Rectangle importedPosition, Rectangle redactionLogPosition) {
+
+        return redactionLogPosition.getTopLeft()
+                .getX() + redactionLogPosition.getWidth() > importedPosition.getTopLeft()
+                .getX() && redactionLogPosition.getTopLeft()
+                .getY() + redactionLogPosition.getHeight() > importedPosition.getTopLeft()
+                .getY() && redactionLogPosition.getTopLeft().getX() < importedPosition.getTopLeft()
+                .getX() + importedPosition.getWidth() && redactionLogPosition.getTopLeft()
+                .getY() < importedPosition.getTopLeft().getY() + importedPosition.getHeight();
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId) {
+
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+}
@@ -0,0 +1,152 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+import com.iqser.red.service.redaction.v1.model.Engine;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.Text;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ManualRedactionSurroundingTextService {
+
+    private final RedactionStorageService redactionStorageService;
+    private final SurroundingWordsService surroundingWordsService;
+
+
+    public AnalyzeResult addSurroundingText(String dossierId, String fileId, ManualRedactions manualRedactions) {
+
+        long startTime = System.currentTimeMillis();
+        Text text = redactionStorageService.getText(dossierId, fileId);
+        List<ManualRedactionEntry> processedAddRedactions = new ArrayList<>();
+        List<ManualResizeRedaction> processedResizeRedactions = new ArrayList<>();
+
+        for (SectionText sectionText : text.getSectionTexts()) {
+
+            if (manualRedactions.getEntriesToAdd().isEmpty() && manualRedactions.getResizeRedactions().isEmpty()) {
+                break;
+            }
+
+            for (SectionArea sectionArea : sectionText.getSectionAreas()) {
+
+                var addItty = manualRedactions.getEntriesToAdd().iterator();
+                while (addItty.hasNext()) {
+                    var manualAddRedaction = addItty.next();
+                    if (sectionContainsEntry(sectionArea, manualAddRedaction.getPositions())) {
+                        var surroundingText = findSurroundingText(sectionText, manualAddRedaction.getValue(), manualAddRedaction.getPositions());
+                        manualAddRedaction.setTextBefore(surroundingText.getLeft());
+                        manualAddRedaction.setTextAfter(surroundingText.getRight());
+                        processedAddRedactions.add(manualAddRedaction);
+                        addItty.remove();
+                    }
+                }
+
+                var resizeItty = manualRedactions.getResizeRedactions().iterator();
+                while (resizeItty.hasNext()) {
+                    var manualResizeRedaction = resizeItty.next();
+                    if (sectionContainsEntry(sectionArea, manualResizeRedaction.getPositions())) {
+                        var surroundingText = findSurroundingText(sectionText, manualResizeRedaction.getValue(), manualResizeRedaction.getPositions());
+                        manualResizeRedaction.setTextBefore(surroundingText.getLeft());
+                        manualResizeRedaction.setTextAfter(surroundingText.getRight());
+                        processedResizeRedactions.add(manualResizeRedaction);
+                        resizeItty.remove();
+                    }
+                }
+            }
+        }
+
+        manualRedactions.getEntriesToAdd().addAll(processedAddRedactions);
+        manualRedactions.getResizeRedactions().addAll(processedResizeRedactions);
+
+        return AnalyzeResult.builder()
+                .dossierId(dossierId)
+                .fileId(fileId)
+                .manualRedactions(manualRedactions)
+                .duration(System.currentTimeMillis() - startTime)
+                .build();
+    }
+
+
+    private Pair<String, String> findSurroundingText(SectionText sectionText, String value,
+                                                     List<Rectangle> toFindPositions) {
+
+        Set<Entity> entities = EntitySearchUtils.find(sectionText.getText(), Set.of(value), "dummy", sectionText.getHeadline(), sectionText.getSectionNumber(), false, false, Engine.DICTIONARY, false);
+        Set<Entity> entitiesWithPositions = EntitySearchUtils.clearAndFindPositions(entities, sectionText.getSearchableText(), null);
+
+        Entity correctEntity = getEntityOnCorrectPosition(entitiesWithPositions, toFindPositions);
+
+        if (correctEntity == null) {
+            log.warn("Could not calculate surrounding text");
+            return Pair.of("", "");
+        }
+
+        if (sectionText.getCellStarts() != null && !sectionText.getCellStarts().isEmpty()) {
+            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null, sectionText.getCellStarts());
+        } else {
+            surroundingWordsService.addSurroundingText(Set.of(correctEntity), sectionText.getSearchableText(), null);
+        }
+
+        return Pair.of(correctEntity.getTextBefore(), correctEntity.getTextAfter());
+    }
+
+
+    private boolean sectionContainsEntry(SectionArea sectionArea, List<Rectangle> positions) {
+
+        for (Rectangle position : positions) {
+            if (sectionArea.contains(position)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    private Entity getEntityOnCorrectPosition(Set<Entity> entitiesWithPositions, List<Rectangle> toFindPositions) {
+
+        for (Entity entityWithPos : entitiesWithPositions) {
+            for (EntityPositionSequence entityPositionSequence : entityWithPos.getPositionSequences()) {
+                for (TextPositionSequence textPositionSequence : entityPositionSequence.getSequences()) {
+                    for (Rectangle manualRedactionRectangle : toFindPositions) {
+                        if (intersects(manualRedactionRectangle, textPositionSequence.getRectangle())) {
+                            return entityWithPos;
+                        }
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+
+    public boolean intersects(Rectangle manualPosition,
+                              com.iqser.red.service.redaction.v1.model.Rectangle textPositionRectangle) {
+
+        return textPositionRectangle.getTopLeft()
+                .getX() + textPositionRectangle.getWidth() > manualPosition.getTopLeftX() && textPositionRectangle.getTopLeft()
+                .getY() + textPositionRectangle.getHeight() > manualPosition.getTopLeftY() && textPositionRectangle.getTopLeft()
+                .getX() < manualPosition.getTopLeftX() + manualPosition.getWidth() && textPositionRectangle.getTopLeft()
+                .getY() < manualPosition.getTopLeftY() + manualPosition.getHeight();
+    }
+
+}
@@ -1,295 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.service;
-
-import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.*;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.SectionText;
-import com.iqser.red.service.redaction.v1.server.classification.model.Text;
-import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient;
-import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
-import com.iqser.red.service.redaction.v1.server.redaction.model.*;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
-import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
-
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
-import org.kie.api.runtime.KieContainer;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class ReanalyzeService {
-
-    private final DictionaryService dictionaryService;
-    private final DroolsExecutionService droolsExecutionService;
-    private final SurroundingWordsService surroundingWordsService;
-    private final EntityRedactionService entityRedactionService;
-    private final RedactionLogCreatorService redactionLogCreatorService;
-    private final RedactionStorageService redactionStorageService;
-    private final PdfSegmentationService pdfSegmentationService;
-    private final RedactionChangeLogService redactionChangeLogService;
-    private final AnalyzeResponseService analyzeResponseService;
-    private final LegalBasisClient legalBasisClient;
-
-    public AnalyzeResult analyze(AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-
-        var pageCount = 0;
-        Document classifiedDoc;
-
-        try {
-            var storedObjectStream = redactionStorageService.getStoredObject(RedactionStorageService.StorageIdUtils.getStorageId(analyzeRequest
-                    .getDossierId(), analyzeRequest.getFileId(), FileType.ORIGIN));
-            classifiedDoc = pdfSegmentationService.parseDocument(storedObjectStream);
-            pageCount = classifiedDoc.getPages().size();
-        } catch (Exception e) {
-            throw new RedactionException(e);
-        }
-        log.info("Document structure analysis successful, starting redaction analysis...");
-
-        entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getDossierTemplateId(), analyzeRequest.getManualRedactions(), analyzeRequest
-                .getDossierId());
-        redactionLogCreatorService.createRedactionLog(classifiedDoc, pageCount, analyzeRequest.getManualRedactions(), analyzeRequest
-                .getDossierTemplateId());
-
-        log.info("Redaction analysis successful...");
-
-        var legalBasis = legalBasisClient.getLegalBasisMapping(analyzeRequest.getDossierTemplateId());
-        var redactionLog = new RedactionLog(classifiedDoc.getRedactionLogEntities(),legalBasis,
-                classifiedDoc.getDictionaryVersion().getDossierTemplateVersion(),
-                classifiedDoc.getDictionaryVersion().getDossierVersion(),
-                classifiedDoc.getRulesVersion(),
-                legalBasisClient.getVersion(analyzeRequest.getDossierTemplateId()));
-
-        log.info("Analyzed with rules {} and dictionary {} for dossierTemplate: {}", classifiedDoc.getRulesVersion(), classifiedDoc
-                .getDictionaryVersion(), analyzeRequest.getDossierTemplateId());
-
-        // first create changelog - this only happens when we migrate files analyzed via the old process and we don't want to loose changeLog data
-        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
-        // store redactionLog
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.TEXT, new Text(pageCount, classifiedDoc
-                .getSectionText()));
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.SECTION_GRID, classifiedDoc
-                .getSectionGrid());
-
-        long duration = System.currentTimeMillis() - startTime;
-        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, pageCount, redactionLog, changeLog);
-    }
-
-
-    @SneakyThrows
-    public AnalyzeResult reanalyze(@RequestBody AnalyzeRequest analyzeRequest) {
-
-        long startTime = System.currentTimeMillis();
-
-        var redactionLog = redactionStorageService.getRedactionLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-        var text = redactionStorageService.getText(analyzeRequest.getDossierId(), analyzeRequest.getFileId());
-
-        // not yet ready for reanalysis
-        if (redactionLog == null || text == null || text.getNumberOfPages() == 0) {
-            return analyze(analyzeRequest);
-        }
-
-        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(analyzeRequest.getDossierTemplateId(), new DictionaryVersion(redactionLog
-                .getDictionaryVersion(), redactionLog.getDossierDictionaryVersion()), analyzeRequest.getDossierId());
-
-        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(analyzeRequest.getManualRedactions());
-        Map<String, List<Comment>> comments = null;
-        Set<ManualRedactionEntry> manualAdds = null;
-
-        if (analyzeRequest.getManualRedactions() != null) {
-            // TODO comments will be removed from redactionLog, so we ignore this first.
-            comments = analyzeRequest.getManualRedactions().getComments();
-            manualAdds = analyzeRequest.getManualRedactions().getEntriesToAdd();
-        }
-
-        Set<Integer> sectionsToReanalyse = new HashSet<>();
-        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
-        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
-            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
-                sectionsToReanalyse.add(entry.getSectionNumber());
-            }
-            if (entry.isImage() || entry.getType().equals("image")) {
-                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
-            }
-        }
-
-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
-                sectionsToReanalyse.add(sectionText.getSectionNumber());
-            }
-
-            if (manualAdds != null) {
-                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
-                    for (ManualRedactionEntry manualAdd : manualAdds) {
-                        for (Rectangle manualPosition : manualAdd.getPositions()) {
-                            if (sectionArea.contains(manualPosition)) {
-                                manualAdd.setSection(sectionText.getHeadline());
-                                manualAdd.setSectionNumber(sectionText.getSectionNumber());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        log.info("Should reanalyze {} sections for request: {}", sectionsToReanalyse.size(), analyzeRequest);
-
-        if (sectionsToReanalyse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) {
-            return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-        }
-
-        List<SectionText> reanalysisSections = new ArrayList<>();
-
-        for (SectionText sectionText : text.getSectionTexts()) {
-
-            if (sectionsToReanalyse.contains(sectionText.getSectionNumber())) {
-                reanalysisSections.add(sectionText);
-            }
-        }
-
-        //--
-
-        KieContainer kieContainer = droolsExecutionService.updateRules(analyzeRequest.getDossierTemplateId());
-
-        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(analyzeRequest.getDossierTemplateId(), analyzeRequest.getDossierId());
-
-        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
-        for (SectionText reanalysisSection : reanalysisSections) {
-
-            Set<Entity> entities = entityRedactionService.findEntities(reanalysisSection.getSearchableText(), reanalysisSection
-                    .getHeadline(), reanalysisSection.getSectionNumber(), dictionary, false);
-            if (reanalysisSection.getCellStarts() != null) {
-                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary, reanalysisSection
-                        .getCellStarts());
-            } else {
-                surroundingWordsService.addSurroundingText(entities, reanalysisSection.getSearchableText(), dictionary);
-            }
-
-            sectionSearchableTextPairs.add(new SectionSearchableTextPair(Section.builder()
-                    .isLocal(false)
-                    .dictionaryTypes(dictionary.getTypes())
-                    .entities(entities)
-                    .text(reanalysisSection.getSearchableText().getAsStringWithLinebreaks())
-                    .searchText(reanalysisSection.getSearchableText().toString())
-                    .headline(reanalysisSection.getHeadline())
-                    .sectionNumber(reanalysisSection.getSectionNumber())
-                    .tabularData(reanalysisSection.getTabularData())
-                    .searchableText(reanalysisSection.getSearchableText())
-                    .dictionary(dictionary)
-                    .images(reanalysisSection.getImages())
-                    .build(), reanalysisSection.getSearchableText()));
-        }
-
-        Set<Entity> entities = new HashSet<>();
-        Map<Integer, Set<Image>> imagesPerPage = new HashMap<>();
-        sectionSearchableTextPairs.forEach(sectionSearchableTextPair -> {
-            Section analysedRowSection = droolsExecutionService.executeRules(kieContainer, sectionSearchableTextPair.getSection());
-            entities.addAll(analysedRowSection.getEntities());
-            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
-
-            for (Image image : analysedRowSection.getImages()) {
-                imagesPerPage.computeIfAbsent(image.getPage(), (a) -> new HashSet<>()).add(image);
-            }
-
-        });
-
-        Map<Integer, List<Entity>> entitiesPerPage = new HashMap<>();
-        for (Entity entity : entities) {
-            Map<Integer, List<EntityPositionSequence>> sequenceOnPage = new HashMap<>();
-            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-                sequenceOnPage.computeIfAbsent(entityPositionSequence.getPageNumber(), (x) -> new ArrayList<>())
-                        .add(entityPositionSequence);
-            }
-
-            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
-                entitiesPerPage.computeIfAbsent(entry.getKey(), (x) -> new ArrayList<>())
-                        .add(new Entity(entity.getWord(), entity.getType(), entity.isRedaction(), entity.getRedactionReason(), entry
-                                .getValue(), entity.getHeadline(), entity.getMatchedRule(), entity.getSectionNumber(), entity
-                                .getLegalBasis(), entity.isDictionaryEntry(), entity.getTextBefore(), entity.getTextAfter(), entity
-                                .getStart(), entity.getEnd(), entity.isDossierDictionaryEntry()));
-            }
-        }
-
-        List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
-        for (int page = 1; page <= text.getNumberOfPages(); page++) {
-            if (entitiesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-            if (imagesPerPage.get(page) != null) {
-                newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, analyzeRequest.getManualRedactions(), page, analyzeRequest
-                        .getDossierTemplateId()));
-            }
-
-            newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, analyzeRequest
-                    .getDossierTemplateId()));
-        }
-
-        redactionLog.getRedactionLogEntry()
-                .removeIf(entry -> sectionsToReanalyse.contains(entry.getSectionNumber()));
-        redactionLog.getRedactionLogEntry().addAll(newRedactionLogEntries);
-        return finalizeAnalysis(analyzeRequest, startTime, redactionLog, text, dictionaryIncrement);
-
-    }
-
-
-    private AnalyzeResult finalizeAnalysis(@RequestBody AnalyzeRequest analyzeRequest, long startTime,
-                                           RedactionLog redactionLog, Text text,
-                                           DictionaryIncrement dictionaryIncrement) {
-
-        redactionLog.setDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierTemplateVersion());
-        redactionLog.setDossierDictionaryVersion(dictionaryIncrement.getDictionaryVersion().getDossierVersion());
-
-        var changeLog = redactionChangeLogService.createAndStoreChangeLog(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), redactionLog);
-        redactionStorageService.storeObject(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), FileType.REDACTION_LOG, redactionLog);
-
-        long duration = System.currentTimeMillis() - startTime;
-
-        return analyzeResponseService.createAnalyzeResponse(analyzeRequest.getDossierId(), analyzeRequest.getFileId(), duration, text
-                .getNumberOfPages(), redactionLog, changeLog);
-    }
-
-
-    private Set<String> getForceAndRemoveIds(ManualRedactions manualRedactions) {
-
-        if (manualRedactions == null) {
-            return new HashSet<>();
-        }
-
-        return Stream.concat(manualRedactions.getIdsToRemove()
-                .stream()
-                .map(IdRemoval::getId), manualRedactions.getForceRedacts().stream().map(ManualForceRedact::getId))
-                .collect(Collectors.toSet());
-    }
-
-
-    public Image convert(RedactionLogEntry entry) {
-
-        Rectangle position = entry.getPositions().get(0);
-
-        return Image.builder()
-                .type(entry.getType())
-                .position(new RedRectangle2D(position.getTopLeft().getX(), position.getTopLeft()
-                        .getY(), position.getWidth(), position.getHeight()))
-                .sectionNumber(entry.getSectionNumber())
-                .section(entry.getSection())
-                .page(position.getPage())
-                .build();
-    }
-
-}
@@ -1,18 +1,13 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.file.management.v1.api.model.FileType;
-import com.iqser.red.service.redaction.v1.model.ChangeType;
-import com.iqser.red.service.redaction.v1.model.RedactionChangeLog;
-import com.iqser.red.service.redaction.v1.model.RedactionChangeLogEntry;
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.*;
 import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

-import java.util.ArrayList;
-import java.util.List;
+import java.time.OffsetDateTime;
+import java.util.*;
 import java.util.stream.Collectors;

@Slf4j
@@ -22,75 +17,79 @@ public class RedactionChangeLogService {

    private final RedactionStorageService redactionStorageService;

-    public RedactionChangeLog createAndStoreChangeLog(String dossierId, String fileId, RedactionLog currentRedactionLog) {

-        try {
-            RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);
-            var changeLog = createChangeLog(currentRedactionLog, previousRedactionLog);
-            redactionStorageService.storeObject(dossierId, fileId, FileType.REDACTION_CHANGELOG, changeLog);
-            return changeLog;
-        } catch (Exception e) {
-            log.debug("Previous redaction log not available");
-            return null;
-        }
+    public RedactionLogChanges computeChanges(String dossierId, String fileId, RedactionLog currentRedactionLog, int analysisNumber) {

-    }
-
-
-    private RedactionChangeLog createChangeLog(RedactionLog currentRedactionLog, RedactionLog previousRedactionLog) {
+        long start = System.currentTimeMillis();

+        RedactionLog previousRedactionLog = redactionStorageService.getRedactionLog(dossierId, fileId);

        if (previousRedactionLog == null) {
-            return null;
+            currentRedactionLog.getRedactionLogEntry().forEach(entry -> {
+                entry.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+            });
+            return new RedactionLogChanges(currentRedactionLog, false);
        }

-        List<RedactionLogEntry> added = new ArrayList<>(currentRedactionLog.getRedactionLogEntry());
-        added.removeAll(previousRedactionLog.getRedactionLogEntry());
-
-        List<RedactionLogEntry> removed = new ArrayList<>(previousRedactionLog.getRedactionLogEntry());
-        removed.removeAll(currentRedactionLog.getRedactionLogEntry());
-
-        List<RedactionChangeLogEntry> changeLogEntries = added.stream()
-                .map(entry -> convert(entry, ChangeType.ADDED))
+        List<RedactionLogEntry> notRemovedPreviousEntries = previousRedactionLog.getRedactionLogEntry()
+                .stream()
+                .filter(entry -> !entry.lastChangeIsRemoved())
                .collect(Collectors.toList());
-        changeLogEntries.addAll(removed.stream()
-                .map(entry -> convert(entry, ChangeType.REMOVED))
-                .collect(Collectors.toList()));

-        return new RedactionChangeLog(changeLogEntries,
-                currentRedactionLog.getDictionaryVersion(),
-                currentRedactionLog.getDossierDictionaryVersion(),
-                currentRedactionLog.getRulesVersion(),
-                currentRedactionLog.getLegalBasisVersion());
-    }
+        Set<RedactionLogEntry> added = currentRedactionLog.getRedactionLogEntry().stream()
+                .filter(entry -> entry.getChanges().isEmpty() || !entry.lastChangeIsRemoved()).collect(Collectors.toSet());

+        notRemovedPreviousEntries.forEach(added::remove);

-    private RedactionChangeLogEntry convert(RedactionLogEntry entry, ChangeType changeType) {
+        Set<RedactionLogEntry> removed = new HashSet<>(notRemovedPreviousEntries);
+        currentRedactionLog.getRedactionLogEntry().forEach(removed::remove);

-        return RedactionChangeLogEntry.builder()
-                .id(entry.getId())
-                .type(entry.getType())
-                .value(entry.getValue())
-                .reason(entry.getReason())
-                .matchedRule(entry.getMatchedRule())
-                .legalBasis(entry.getLegalBasis())
-                .redacted(entry.isRedacted())
-                .isHint(entry.isHint())
-                .isRecommendation(entry.isRecommendation())
-                .section(entry.getSection())
-                .color(entry.getColor())
-                .positions(entry.getPositions())
-                .sectionNumber(entry.getSectionNumber())
-                .manual(entry.isManual())
-                .status(entry.getStatus())
-                .manualRedactionType(entry.getManualRedactionType())
-                .isDictionaryEntry(entry.isDictionaryEntry())
-                .textBefore(entry.getTextBefore())
-                .textAfter(entry.getTextAfter())
-                .comments(entry.getComments())
-                .changeType(changeType)
-                .isDossierDictionaryEntry(entry.isDossierDictionaryEntry())
-                .build();
+        Map<String, RedactionLogEntry> addedIds = new HashMap<>();
+        added.forEach(entry -> {
+            addedIds.put(entry.getId(), entry);
+        });
+
+        Set<String> removedIds = new HashSet<>();
+        removed.forEach(entry -> {
+            removedIds.add(entry.getId());
+        });
+
+        List<RedactionLogEntry> newRedactionLogEntries = previousRedactionLog.getRedactionLogEntry();
+
+        List<RedactionLogEntry> toRemove = new ArrayList<>();
+        newRedactionLogEntries.forEach(entry -> {
+            if (removedIds.contains(entry.getId()) && addedIds.containsKey(entry.getId())) {
+                List<Change> changes = entry.getChanges();
+                changes.add(new Change(analysisNumber, ChangeType.CHANGED, OffsetDateTime.now()));
+                var newEntry = addedIds.get(entry.getId());
+                newEntry.setChanges(changes);
+                addedIds.put(entry.getId(), newEntry);
+                toRemove.add(entry);
+            } else if (removedIds.contains(entry.getId())) {
+                entry.getChanges().add(new Change(analysisNumber, ChangeType.REMOVED, OffsetDateTime.now()));
+            } else if (addedIds.containsKey(entry.getId())) {
+                List<Change> changes = entry.getChanges();
+                changes.add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+                var newEntry = addedIds.get(entry.getId());
+                newEntry.setChanges(changes);
+                addedIds.put(entry.getId(), newEntry);
+                toRemove.add(entry);
+            }
+        });
+
+        newRedactionLogEntries.removeAll(toRemove);
+
+        addedIds.forEach((k, v) -> {
+            if (v.getChanges().isEmpty()) {
+                v.getChanges().add(new Change(analysisNumber, ChangeType.ADDED, OffsetDateTime.now()));
+            }
+            newRedactionLogEntries.add(v);
+        });
+
+        currentRedactionLog.setRedactionLogEntry(newRedactionLogEntries);
+
+        log.info("Change computation took: {}", System.currentTimeMillis() - start);
+        return new RedactionLogChanges(currentRedactionLog, !addedIds.isEmpty() || !removedIds.isEmpty());
    }

 }
@@ -1,22 +1,5 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import com.iqser.red.service.redaction.v1.model.*;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
-import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
-import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -24,42 +7,52 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;

+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.server.parsing.model.RedTextPosition;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.EntityPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PageEntities;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
@Service
+@Slf4j
@RequiredArgsConstructor
 public class RedactionLogCreatorService {

    private final DictionaryService dictionaryService;


-    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
-                                   String dossierTemplateId) {
+    public List<RedactionLogEntry> createRedactionLog(PageEntities pageEntities, int numberOfPages,
+                                                      String dossierTemplateId) {

-        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);
+        List<RedactionLogEntry> entries = new ArrayList<>();

        for (int page = 1; page <= numberOfPages; page++) {
-
-            addSectionGrid(classifiedDoc, page);
-
-            if (classifiedDoc.getEntities().get(page) != null) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, dossierTemplateId));
+            if (pageEntities.getEntitiesPerPage().get(page) != null) {
+                entries.addAll(addEntries(pageEntities.getEntitiesPerPage(), page, dossierTemplateId));
            }

-            if (manualRedactionPages.contains(page)) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, dossierTemplateId));
-            }
-
-            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
-                classifiedDoc.getRedactionLogEntities()
-                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, dossierTemplateId));
+            if (pageEntities.getImagesPerPage().get(page) != null) {
+                entries.addAll(addImageEntries(pageEntities.getImagesPerPage(), page, dossierTemplateId));
            }
        }
+
+        return entries;
    }


-    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, ManualRedactions manualRedactions,
-                                                   int pageNumber, String dossierTemplateId) {
+    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, int pageNumber,
+                                                   String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();

@@ -69,7 +62,7 @@ public class RedactionLogCreatorService {

            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
                    .id(id)
-                    .color(getColorForImage(image, dossierTemplateId, false))
+                    .color(getColor(image.getType(), dossierTemplateId, image.isRedaction()))
                    .isImage(true)
                    .type(image.getType())
                    .redacted(image.isRedaction())
@@ -77,7 +70,6 @@ public class RedactionLogCreatorService {
                    .legalBasis(image.getLegalBasis())
                    .matchedRule(image.getMatchedRule())
                    .isHint(dictionaryService.isHint(image.getType(), dossierTemplateId))
-                    .manual(false)
                    .isDictionaryEntry(false)
                    .isRecommendation(false)
                    .positions(List.of(new Rectangle(new Point((float) image.getPosition()
@@ -85,62 +77,9 @@ public class RedactionLogCreatorService {
                            .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
                    .sectionNumber(image.getSectionNumber())
                    .section(image.getSection())
+                    .imageHasTransparency(image.isHasTransparency())
                    .build();

-            if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                    if (manualRemoval.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(false);
-                            redactionLogEntry.setRedacted(false);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            manualOverrideReason = image.getRedactionReason() + ", removed by manual override";
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, false));
-                        } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to remove";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                    }
-                }
-            }
-
-            if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                    if (manualForceRedact.getId().equals(id)) {
-                        String manualOverrideReason = null;
-                        if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                            image.setRedaction(true);
-                            redactionLogEntry.setRedacted(true);
-                            redactionLogEntry.setStatus(Status.APPROVED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, false));
-                            manualOverrideReason = image.getRedactionReason() + ", forced by manual override";
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                            manualOverrideReason = image.getRedactionReason() + ", requested to force redact";
-                            redactionLogEntry.setStatus(Status.REQUESTED);
-                            redactionLogEntry.setColor(getColorForImage(image, dossierTemplateId, true));
-                            redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                        } else {
-                            redactionLogEntry.setStatus(Status.DECLINED);
-                        }
-
-                        image.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : image.getRedactionReason());
-                        redactionLogEntry.setReason(manualOverrideReason);
-                        redactionLogEntry.setManual(true);
-                        redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                    }
-                }
-            }
-
            redactionLogEntities.add(redactionLogEntry);
        }

@@ -148,36 +87,16 @@ public class RedactionLogCreatorService {
    }


-    private Set<Integer> getManualRedactionPages(ManualRedactions manualRedactions) {
-
-        Set<Integer> manualRedactionPages = new HashSet<>();
-
-        if (manualRedactions == null) {
-            return manualRedactionPages;
-        }
-
-        manualRedactions.getEntriesToAdd().forEach(entry -> {
-            entry.getPositions().forEach(pos -> {
-                manualRedactionPages.add(pos.getPage());
-            });
-        });
-        return manualRedactionPages;
-    }
-
-
-    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, ManualRedactions manualRedactions,
-                                              int page, String dossierTemplateId) {
+    public List<RedactionLogEntry> addEntries(Map<Integer, List<Entity>> entities, int page, String dossierTemplateId) {

        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();

-        // Duplicates can exist due table extraction colums over multiple rows.
+        // Duplicates can exist due table extraction columns over multiple rows.
        Set<String> processedIds = new HashSet<>();

        entityLoop:
        for (Entity entity : entities.get(page)) {

-            List<Comment> comments = null;
-
            for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {

                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(entity, dossierTemplateId);
@@ -189,60 +108,7 @@ public class RedactionLogCreatorService {
                    processedIds.add(entityPositionSequence.getId());
                }

-                if (manualRedactions != null && !manualRedactions.getIdsToRemove().isEmpty()) {
-                    for (IdRemoval manualRemoval : manualRedactions.getIdsToRemove()) {
-                        if (manualRemoval.getId().equals(entityPositionSequence.getId())) {
-                            comments = manualRedactions.getComments().get(manualRemoval.getId());
-                            String manualOverrideReason = null;
-                            if (manualRemoval.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(false);
-                                redactionLogEntry.setRedacted(false);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                manualOverrideReason = entity.getRedactionReason() + ", removed by manual override";
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, false));
-                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, true));
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.REMOVE);
-                        }
-                    }
-                }
-
-                if (manualRedactions != null && !manualRedactions.getForceRedacts().isEmpty()) {
-                    for (ManualForceRedact manualForceRedact : manualRedactions.getForceRedacts()) {
-                        if (manualForceRedact.getId().equals(entityPositionSequence.getId())) {
-                            String manualOverrideReason = null;
-                            if (manualForceRedact.getStatus().equals(Status.APPROVED)) {
-                                entity.setRedaction(true);
-                                redactionLogEntry.setRedacted(true);
-                                redactionLogEntry.setStatus(Status.APPROVED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, false));
-                                manualOverrideReason = entity.getRedactionReason() + ", forced by manual override";
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else if (manualForceRedact.getStatus().equals(Status.REQUESTED)) {
-                                manualOverrideReason = entity.getRedactionReason() + ", requested to force redact";
-                                redactionLogEntry.setStatus(Status.REQUESTED);
-                                redactionLogEntry.setColor(getColor(entity, dossierTemplateId, true));
-                                redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
-                            } else {
-                                redactionLogEntry.setStatus(Status.DECLINED);
-                            }
-
-                            entity.setRedactionReason(manualOverrideReason != null ? manualOverrideReason : entity.getRedactionReason());
-                            redactionLogEntry.setReason(manualOverrideReason);
-                            redactionLogEntry.setManual(true);
-                            redactionLogEntry.setManualRedactionType(ManualRedactionType.FORCE_REDACT);
-                        }
-                    }
-                }
+                redactionLogEntry.setId(entityPositionSequence.getId());

                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
@@ -250,17 +116,10 @@ public class RedactionLogCreatorService {
                            .flatMap(seq -> seq.getTextPositions().stream())
                            .collect(Collectors.toList()), page);

-                    if (manualRedactions != null) {
-                        comments = manualRedactions.getComments().get(entityPositionSequence.getId());
-                    }
-
-                    redactionLogEntry.setComments(comments);
                    redactionLogEntry.getPositions().addAll(rectanglesPerLine);

                }

-                redactionLogEntry.setId(entityPositionSequence.getId());
-
                // FIXME ids should never be null. Figure out why this happens.
                if (redactionLogEntry.getId() != null) {
                    redactionLogEntities.add(redactionLogEntry);
@@ -276,20 +135,33 @@ public class RedactionLogCreatorService {

        List<Rectangle> rectangles = new ArrayList<>();
        if (textPositions.size() == 1) {
-            rectangles.add( TextPositionSequence.fromData(textPositions, page).getRectangle());
+            rectangles.add(TextPositionSequence.fromData(textPositions, page).getRectangle());
        } else {
+            float x = textPositions.get(0).getXDirAdj();
            float y = textPositions.get(0).getYDirAdj();
+            float width = textPositions.get(0).getWidthDirAdj();
+            float height = textPositions.get(0).getHeightDir();
            int startIndex = 0;
+
            for (int i = 1; i < textPositions.size(); i++) {
+                float xDirAdj = textPositions.get(i).getXDirAdj();
                float yDirAdj = textPositions.get(i).getYDirAdj();
-                if (yDirAdj != y) {
-                    rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, i), page).getRectangle());
+                float widthDir = textPositions.get(i).getWidthDirAdj();
+                float heightDir = textPositions.get(i).getHeightDir();
+
+                if (!(isCharInSameLine(y, yDirAdj, height, heightDir) && isCharClose(x, xDirAdj, width))) {
+                    rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, i), page)
+                            .getRectangle());
                    y = yDirAdj;
+                    width = widthDir;
+                    height = heightDir;
                    startIndex = i;
                }
+                x = xDirAdj;
            }
            if (startIndex != textPositions.size()) {
-                rectangles.add( TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
+                rectangles.add(TextPositionSequence.fromData(textPositions.subList(startIndex, textPositions.size()), page)
+                        .getRectangle());
            }
        }

@@ -297,80 +169,41 @@ public class RedactionLogCreatorService {
    }


-    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
-                                                       Map<String, List<Comment>> comments, int page,
-                                                       String dossierTemplateId) {
+    private boolean isCharClose(float x, float xDirAdj, float width) {

-        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
-
-        if (manualAdds == null) {
-            return redactionLogEntities;
-        }
-
-        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
-
-            String id = manualRedactionEntry.getId();
-
-            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, dossierTemplateId);
-
-            List<Rectangle> rectanglesOnPage = new ArrayList<>();
-            for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
-                if (page == rectangle.getPage()) {
-                    rectanglesOnPage.add(rectangle);
-                    redactionLogEntry.getPositions().add(rectangle);
-                }
-            }
-
-            redactionLogEntry.setComments(comments.get(id));
-            if (!rectanglesOnPage.isEmpty() && !approvedAndShouldBeInDictionary(manualRedactionEntry)) {
-                redactionLogEntities.add(redactionLogEntry);
-            }
-        }
-
-        return redactionLogEntities;
+        float max = x + (5 * width);
+        return xDirAdj < max;
    }


-    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+    private boolean isCharInSameLine(float y, float yCompare, float height, float heightCompare) {

-        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
-    }
+        float offsetHeight = height / 2;
+        float minHeight = height - offsetHeight;
+        float maxHeight = height + offsetHeight;

+        float offsetY = height / 10;
+        float minY = y - offsetY;
+        float maxY = y + offsetY;

-    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
-                                                      String dossierTemplateId) {
-
-        return RedactionLogEntry.builder()
-                .id(id)
-                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
-                .reason(manualRedactionEntry.getReason())
-                .legalBasis(manualRedactionEntry.getLegalBasis())
-                .value(manualRedactionEntry.getValue())
-                .type(manualRedactionEntry.getType())
-                .redacted(true)
-                .isHint(false)
-                .section(manualRedactionEntry.getSection())
-                .sectionNumber(manualRedactionEntry.getSectionNumber())
-                .manual(true)
-                .status(manualRedactionEntry.getStatus())
-                .manualRedactionType(ManualRedactionType.ADD)
-                .isDictionaryEntry(false)
-                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
-                .build();
+        return yCompare > minY && yCompare < maxY && heightCompare > minHeight && heightCompare < maxHeight;
    }


    private RedactionLogEntry createRedactionLogEntry(Entity entity, String dossierTemplateId) {

+        Set<String> referenceIds = new HashSet<>();
+        entity.getReferences().forEach(ref -> ref.getPositionSequences().forEach(pos -> referenceIds.add(pos.getId())));
+
        return RedactionLogEntry.builder()
-                .color(getColor(entity, dossierTemplateId, false))
+                .color(getColor(entity.getType(), dossierTemplateId, entity.isRedaction()))
                .reason(entity.getRedactionReason())
                .legalBasis(entity.getLegalBasis())
                .value(entity.getWord())
                .type(entity.getType())
                .redacted(entity.isRedaction())
-                .isHint(isHint(entity, dossierTemplateId))
-                .isRecommendation(isRecommendation(entity, dossierTemplateId))
+                .isHint(isHint(entity.getType(), dossierTemplateId))
+                .isRecommendation(isRecommendation(entity.getType(), dossierTemplateId))
                .section(entity.getHeadline())
                .sectionNumber(entity.getSectionNumber())
                .matchedRule(entity.getMatchedRule())
@@ -380,104 +213,30 @@ public class RedactionLogCreatorService {
                .startOffset(entity.getStart())
                .endOffset(entity.getEnd())
                .isDossierDictionaryEntry(entity.isDossierDictionaryEntry())
+                .engines(entity.getEngines())
+                .reference(referenceIds)
                .build();
    }


-    private float[] getColor(Entity entity, String dossierTemplateId, boolean requestedToRemove) {
+    private float[] getColor(String type, String dossierTemplateId, boolean isRedaction) {

-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
-        }
-        if (!entity.isRedaction() && !isHint(entity, dossierTemplateId)) {
+        if (!isRedaction && !isHint(type, dossierTemplateId)) {
            return dictionaryService.getNotRedactedColor(dossierTemplateId);
        }
-        return dictionaryService.getColor(entity.getType(), dossierTemplateId);
-    }
-
-
-    private float[] getColorForManualAdd(String type, String dossierTemplateId, Status status) {
-
-        if (status.equals(Status.REQUESTED)) {
-            return dictionaryService.getRequestAddColor(dossierTemplateId);
-        } else if (status.equals(Status.DECLINED)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return getColor(type, dossierTemplateId);
-    }
-
-
-    private float[] getColor(String type, String dossierTemplateId) {
-
        return dictionaryService.getColor(type, dossierTemplateId);
    }


-    private float[] getColorForImage(Image image, String dossierTemplateId, boolean requestedToRemove) {
+    private boolean isHint(String type, String dossierTemplateId) {

-        if (requestedToRemove) {
-            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
-        }
-        if (!image.isRedaction() && !dictionaryService.isHint(image.getType(), dossierTemplateId)) {
-            return dictionaryService.getNotRedactedColor(dossierTemplateId);
-        }
-        return dictionaryService.getColor(image.getType(), dossierTemplateId);
+        return dictionaryService.isHint(type, dossierTemplateId);
    }


-    private boolean isHint(Entity entity, String dossierTemplateId) {
+    private boolean isRecommendation(String type, String dossierTemplateId) {

-        return dictionaryService.isHint(entity.getType(), dossierTemplateId);
-    }
-
-
-    private boolean isRecommendation(Entity entity, String dossierTemplateId) {
-
-        return dictionaryService.isRecommendation(entity.getType(), dossierTemplateId);
-    }
-
-
-    private void addSectionGrid(Document classifiedDoc, int page) {
-
-        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
-
-            for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
-
-                AbstractTextContainer textBlock = paragraph.getPageBlocks().get(i);
-
-                if (textBlock.getPage() != page) {
-                    continue;
-                }
-
-                if (textBlock instanceof TextBlock) {
-
-                    classifiedDoc.getSectionGrid()
-                            .getRectanglesPerPage()
-                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
-
-                } else if (textBlock instanceof Table) {
-
-                    List<CellRectangle> cellRectangles = new ArrayList<>();
-                    for (List<Cell> row : ((Table) textBlock).getRows()) {
-                        for (Cell cell : row) {
-                            if (cell != null) {
-                                cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
-                                        .getWidth(), (float) cell.getHeight()));
-                            }
-                        }
-                    }
-
-                    classifiedDoc.getSectionGrid()
-                            .getRectanglesPerPage()
-                            .computeIfAbsent(page, (x) -> new ArrayList<>())
-                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
-                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(), cellRectangles));
-
-                }
-            }
-        }
+        return dictionaryService.isRecommendation(type, dossierTemplateId);
    }

 }
@@ -0,0 +1,390 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Comment;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.ManualRedactions;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.*;
+import com.iqser.red.service.redaction.v1.model.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RedactionLogMergeService {
+
+    private final DictionaryService dictionaryService;
+
+    private final SectionTextService sectionTextService;
+
+
+    public RedactionLog mergeRedactionLogData(RedactionLog redactionLog, SectionGrid sectionGrid,
+                                              String dossierTemplateId, ManualRedactions manualRedactions,
+                                              Set<Integer> excludedPages) {
+
+        log.info("Merging Redaction log with manual redactions");
+        if (manualRedactions != null) {
+
+            var manualRedactionLogEntries = addManualAddEntries(sectionGrid, manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), dossierTemplateId);
+
+            redactionLog.getRedactionLogEntry().addAll(manualRedactionLogEntries);
+
+            var manualRedactionWrappers = createManualRedactionWrappers(manualRedactions);
+
+            for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+
+                processRedactionLogEntry(manualRedactionWrappers.stream()
+                        .filter(mr -> entry.getId().equals(mr.getId()))
+                        .collect(Collectors.toList()), dossierTemplateId, entry);
+
+                entry.setComments(manualRedactions.getComments().get(entry.getId()));
+
+                if (excludedPages != null && !excludedPages.isEmpty()) {
+                    entry.getPositions().forEach(pos -> {
+                        if (!entry.isLocalManualRedaction() && excludedPages.contains(pos.getPage())) {
+                            entry.setExcluded(true);
+                        }
+                    });
+                }
+            }
+
+        }
+
+        Set<String> processedIds = new HashSet<>();
+        redactionLog.getRedactionLogEntry().removeIf(entry -> {
+            if (processedIds.contains(entry.getId())) {
+                log.info("Duplicate annotation found with id {}", entry.getId());
+                return true;
+            }
+            processedIds.add(entry.getId());
+            return false;
+        });
+        return redactionLog;
+    }
+
+
+    private List<ManualRedactionWrapper> createManualRedactionWrappers(ManualRedactions manualRedactions) {
+
+        List<ManualRedactionWrapper> manualRedactionWrappers = new ArrayList<>();
+
+        manualRedactions.getImageRecategorization().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getIdsToRemove().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getForceRedactions().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getLegalBasisChanges().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
+            }
+        });
+
+        manualRedactions.getResizeRedactions().forEach(item -> {
+            if (item.getSoftDeletedTime() == null) {
+                manualRedactionWrappers.add(new ManualRedactionWrapper(item.getAnnotationId(), item.getRequestDate(), item));
+            }
+        });
+
+        Collections.sort(manualRedactionWrappers);
+
+        return manualRedactionWrappers;
+    }
+
+
+    private void processRedactionLogEntry(List<ManualRedactionWrapper> manualRedactionWrappers,
+                                          String dossierTemplateId, RedactionLogEntry redactionLogEntry) {
+
+        manualRedactionWrappers.forEach(mrw -> {
+
+            if (mrw.getItem() instanceof ManualImageRecategorization) {
+                var imageRecategorization = (ManualImageRecategorization) mrw.getItem();
+                String manualOverrideReason = null;
+                if (imageRecategorization.getStatus().equals(AnnotationStatus.APPROVED)) {
+
+
+                    redactionLogEntry.setType(imageRecategorization.getType());
+                    redactionLogEntry.setSection("Image:" + redactionLogEntry.getType());
+
+                    if (dictionaryService.isHint(imageRecategorization.getType(), dossierTemplateId)) {
+                        redactionLogEntry.setRedacted(false);
+                        redactionLogEntry.setHint(true);
+                    } else {
+                        redactionLogEntry.setHint(false);
+                    }
+
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", recategorized by manual override");
+                } else if (imageRecategorization.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to recategorize");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+
+                redactionLogEntry.getManualChanges().add(ManualChange.from(imageRecategorization)
+                        .withManualRedactionType(ManualRedactionType.RECATEGORIZE)
+                        .withChange("type", imageRecategorization.getType()));
+            }
+
+            if (mrw.getItem() instanceof IdRemoval) {
+                var manualRemoval = (IdRemoval) mrw.getItem();
+                if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED) && manualRemoval.isRemoveFromDictionary()) {
+                    log.debug("Skipping merge for dictionary-modifying entry");
+                } else {
+                    String manualOverrideReason = null;
+                    if (manualRemoval.getStatus().equals(AnnotationStatus.APPROVED)) {
+                        redactionLogEntry.setRedacted(false);
+                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", removed by manual override");
+                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), true));
+                        redactionLogEntry.setHint(false);
+                    } else if (manualRemoval.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                        manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to remove");
+                        redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    }
+
+                    redactionLogEntry.setReason(manualOverrideReason);
+
+                    redactionLogEntry.getManualChanges().add(ManualChange.from(manualRemoval)
+                            .withManualRedactionType(manualRemoval.isRemoveFromDictionary() ?
+                                    ManualRedactionType.REMOVE_FROM_DICTIONARY : ManualRedactionType.REMOVE_LOCALLY));
+                }
+            }
+
+            if (mrw.getItem() instanceof ManualForceRedaction) {
+                var manualForceRedact = (ManualForceRedaction) mrw.getItem();
+                String manualOverrideReason = null;
+                var dictionaryIsHint = dictionaryService.isHint(redactionLogEntry.getType(), dossierTemplateId);
+                if (manualForceRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    // Forcing a skipped hint should result in a hint
+                    if (dictionaryIsHint) {
+                        redactionLogEntry.setHint(true);
+                    } else {
+                        redactionLogEntry.setRedacted(true);
+                    }
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", forced by manual override");
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                } else if (manualForceRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to force " + (dictionaryIsHint ? "hint" : "redact"));
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setLegalBasis(manualForceRedact.getLegalBasis());
+                }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+                var manualChange = ManualChange.from(manualForceRedact)
+                        .withManualRedactionType(dictionaryIsHint ? ManualRedactionType.FORCE_HINT : ManualRedactionType.FORCE_REDACT);
+
+                redactionLogEntry.getManualChanges().add(manualChange);
+
+            }
+
+            if (mrw.getItem() instanceof ManualLegalBasisChange) {
+                var manualLegalBasisChange = (ManualLegalBasisChange) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis was manually changed");
+                    redactionLogEntry.setLegalBasis(manualLegalBasisChange.getLegalBasis());
+                    redactionLogEntry.setRedacted(true);
+                    if (manualLegalBasisChange.getSection() != null) {
+                        redactionLogEntry.setSection(manualLegalBasisChange.getSection());
+                    }
+                    if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) {
+                        redactionLogEntry.setValue(manualLegalBasisChange.getValue());
+                    }
+                } else if (manualLegalBasisChange.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", legal basis change requested");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+
+                var manualChange = ManualChange.from(manualLegalBasisChange)
+                        .withManualRedactionType(ManualRedactionType.LEGAL_BASIS_CHANGE);
+                manualChange.withChange("legalBasis", manualLegalBasisChange.getLegalBasis());
+                if (manualLegalBasisChange.getSection() != null) {
+                    manualChange.withChange("section", manualLegalBasisChange.getSection());
+                }
+                if (redactionLogEntry.isRectangle() && manualLegalBasisChange.getValue() != null) {
+                    manualChange.withChange("value", manualLegalBasisChange.getValue());
+                }
+                redactionLogEntry.getManualChanges().add(manualChange);
+            }
+
+            if (mrw.getItem() instanceof ManualResizeRedaction) {
+                var manualResizeRedact = (ManualResizeRedaction) mrw.getItem();
+                String manualOverrideReason = null;
+                if (manualResizeRedact.getStatus().equals(AnnotationStatus.APPROVED)) {
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, false, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
+                    redactionLogEntry.setValue(manualResizeRedact.getValue());
+                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
+                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", resized by manual override");
+                } else if (manualResizeRedact.getStatus().equals(AnnotationStatus.REQUESTED)) {
+                    manualOverrideReason = mergeReasonIfNecessary(redactionLogEntry.getReason(), ", requested to resize redact");
+                    redactionLogEntry.setColor(getColor(redactionLogEntry.getType(), dossierTemplateId, true, redactionLogEntry.isRedacted(), false));
+                    redactionLogEntry.setPositions(convertPositions(manualResizeRedact.getPositions()));
+                    redactionLogEntry.setTextBefore(manualResizeRedact.getTextBefore());
+                    redactionLogEntry.setTextAfter(manualResizeRedact.getTextAfter());
+                }
+
+                redactionLogEntry.setReason(manualOverrideReason);
+                redactionLogEntry.getManualChanges().add(ManualChange.from(manualResizeRedact)
+                        .withManualRedactionType(ManualRedactionType.RESIZE)
+                        .withChange("value", manualResizeRedact.getValue()));
+            }
+
+        });
+
+    }
+
+
+    private String mergeReasonIfNecessary(String currentReason, String addition) {
+
+        if (currentReason != null) {
+            if (!currentReason.contains(addition)) {
+                return currentReason + addition;
+            }
+            return currentReason;
+        } else {
+            return "";
+        }
+    }
+
+
+    public List<RedactionLogEntry> addManualAddEntries(SectionGrid sectionGrid, Set<ManualRedactionEntry> manualAdds,
+                                                       Map<String, List<Comment>> comments, String dossierTemplateId) {
+
+        List<RedactionLogEntry> redactionLogEntries = new ArrayList<>();
+
+        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
+
+            if (!approvedAndShouldBeInDictionary(manualRedactionEntry)) {
+                RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, manualRedactionEntry.getAnnotationId(), dossierTemplateId);
+                redactionLogEntry.setPositions(convertPositions(manualRedactionEntry.getPositions()));
+                redactionLogEntry.setComments(comments.get(manualRedactionEntry.getAnnotationId()));
+                redactionLogEntry.setTextBefore(manualRedactionEntry.getTextBefore());
+                redactionLogEntry.setTextAfter(manualRedactionEntry.getTextAfter());
+
+                sectionTextService.handleSectionText(sectionGrid, redactionLogEntry);
+
+                redactionLogEntries.add(redactionLogEntry);
+            }
+        }
+
+        return redactionLogEntries;
+    }
+
+
+    private List<Rectangle> convertPositions(
+            List<com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle> positions) {
+
+        return positions.stream()
+                .map(pos -> new Rectangle(new Point(pos.getTopLeftX(), pos.getTopLeftY()), pos.getWidth(), pos.getHeight(), pos.getPage()))
+                .collect(Collectors.toList());
+    }
+
+
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus().equals(AnnotationStatus.APPROVED) &&
+                (manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary());
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
+                                                      String dossierTemplateId) {
+
+        var addToDictionary = manualRedactionEntry.isAddToDictionary() || manualRedactionEntry.isAddToDossierDictionary();
+
+        var change = ManualChange.from(manualRedactionEntry)
+                .withManualRedactionType(addToDictionary ? ManualRedactionType.ADD_TO_DICTIONARY : ManualRedactionType.ADD_LOCALLY);
+        List<ManualChange> changeList = new ArrayList<>();
+        changeList.add(change);
+
+        return RedactionLogEntry.builder()
+                .id(id)
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), dossierTemplateId, manualRedactionEntry.getStatus()))
+                .reason(manualRedactionEntry.getReason())
+                .isDictionaryEntry(manualRedactionEntry.isAddToDictionary())
+                .isDossierDictionaryEntry(manualRedactionEntry.isAddToDossierDictionary())
+                .legalBasis(manualRedactionEntry.getLegalBasis())
+                .value(manualRedactionEntry.getValue())
+                .section(manualRedactionEntry.getSection())
+                .type(manualRedactionEntry.getType())
+                .redacted(true)
+                .isHint(false)
+                .sectionNumber(-1)
+                .rectangle(manualRedactionEntry.isRectangle())
+                .manualChanges(changeList)
+                .build();
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId, boolean requested, boolean isRedaction,
+                             boolean skipped) {
+
+        if (requested) {
+            return dictionaryService.getRequestRemoveColor(dossierTemplateId);
+        }
+        if (skipped || !isRedaction && !dictionaryService.isHint(type, dossierTemplateId)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColorForManualAdd(String type, String dossierTemplateId, AnnotationStatus status) {
+
+        if (status.equals(AnnotationStatus.REQUESTED)) {
+            return dictionaryService.getRequestAddColor(dossierTemplateId);
+        } else if (status.equals(AnnotationStatus.DECLINED)) {
+            return dictionaryService.getNotRedactedColor(dossierTemplateId);
+        }
+        return getColor(type, dossierTemplateId);
+    }
+
+
+    private float[] getColor(String type, String dossierTemplateId) {
+
+        return dictionaryService.getColor(type, dossierTemplateId);
+    }
+
+
+    @Data
+    @AllArgsConstructor
+    private static class ManualRedactionWrapper implements Comparable<ManualRedactionWrapper> {
+
+        private String id;
+        private OffsetDateTime date;
+        private Object item;
+
+
+        @Override
+        public int compareTo(ManualRedactionWrapper o) {
+
+            return this.date.compareTo(o.date);
+        }
+
+    }
+
+}
+
@@ -0,0 +1,74 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Paragraph;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class SectionGridCreatorService {
+
+
+    public void createSectionGrid(Document classifiedDoc, int numberOfPages) {
+
+        for (int page = 1; page <= numberOfPages; page++) {
+            addSectionGrid(classifiedDoc, page);
+        }
+    }
+
+
+    private void addSectionGrid(Document classifiedDoc, int page) {
+
+        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
+
+            for (int i = 0; i <= paragraph.getPageBlocks().size() - 1; i++) {
+
+                AbstractTextContainer textBlock = paragraph.getPageBlocks().get(i);
+
+                if (textBlock.getPage() != page) {
+                    continue;
+                }
+
+                if (textBlock instanceof TextBlock) {
+
+                    classifiedDoc.getSectionGrid()
+                            .getRectanglesPerPage()
+                            .computeIfAbsent(page, (x) -> new ArrayList<>())
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size()));
+
+                } else if (textBlock instanceof Table) {
+
+                    List<CellRectangle> cellRectangles = new ArrayList<>();
+                    for (List<Cell> row : ((Table) textBlock).getRows()) {
+                        for (Cell cell : row) {
+                            if (cell != null) {
+                                cellRectangles.add(new CellRectangle(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                                        .getWidth(), (float) cell.getHeight()));
+                            }
+                        }
+                    }
+
+                    classifiedDoc.getSectionGrid()
+                            .getRectanglesPerPage()
+                            .computeIfAbsent(page, (x) -> new ArrayList<>())
+                            .add(new SectionRectangle(new Point(textBlock.getMinX(), textBlock.getMinY()), textBlock.getWidth(), textBlock
+                                    .getHeight(), i + 1, paragraph.getPageBlocks().size(), cellRectangles));
+
+                }
+            }
+        }
+    }
+
+}
@@ -0,0 +1,204 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.server.classification.model.*;
+import com.iqser.red.service.redaction.v1.server.redaction.model.*;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SectionTextBuilderService {
+
+    public List<SectionText> buildSectionText(Document classifiedDoc) {
+
+        List<SectionText> sectionTexts = new ArrayList<>();
+        AtomicInteger sectionNumber = new AtomicInteger(1);
+        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
+
+            List<Table> tables = paragraph.getTables();
+            for (Table table : tables) {
+                if (table.getColCount() == 2) {
+                    sectionTexts.add(processTableAsOneText(table, sectionNumber));
+                } else {
+                    sectionTexts.addAll(processTablePerRow(table, sectionNumber));
+                }
+                sectionNumber.incrementAndGet();
+            }
+            sectionTexts.add(processText(paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph.getHeadline(), sectionNumber, paragraph
+                    .getImages()));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (Header header : classifiedDoc.getHeaders()) {
+            sectionTexts.add(processText(header.getSearchableText(), header.getTextBlocks(), "Header", sectionNumber, new ArrayList<>()));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (Footer footer : classifiedDoc.getFooters()) {
+            sectionTexts.add(processText(footer.getSearchableText(), footer.getTextBlocks(), "Footer", sectionNumber, new ArrayList<>()));
+            sectionNumber.incrementAndGet();
+        }
+
+        for (UnclassifiedText unclassifiedText : classifiedDoc.getUnclassifiedTexts()) {
+            sectionTexts.add(processText(unclassifiedText.getSearchableText(), unclassifiedText.getTextBlocks(), "", sectionNumber, new ArrayList<>()));
+            sectionNumber.incrementAndGet();
+        }
+
+        return sectionTexts;
+    }
+
+
+    private List<SectionText> processTablePerRow(Table table, AtomicInteger sectionNumber) {
+
+        List<SectionText> sectionTexts = new ArrayList<>();
+        for (List<Cell> row : table.getRows()) {
+            SearchableText searchableRow = new SearchableText();
+            Map<String, CellValue> tabularData = new HashMap<>();
+            int start = 0;
+            List<Integer> cellStarts = new ArrayList<>();
+            SectionText sectionText = new SectionText();
+            for (Cell cell : row) {
+
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+
+                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
+                        .get(0)
+                        .getSequences()
+                        .get(0)
+                        .getPage());
+                sectionText.getSectionAreas().add(sectionArea);
+                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+
+                int cellStart = start;
+
+                if (!cell.isHeaderCell()) {
+                    cell.getHeaderCells().forEach(headerCell -> {
+                        StringBuilder headerBuilder = new StringBuilder();
+                        headerCell.getTextBlocks().forEach(textBlock -> headerBuilder.append(textBlock.getText()));
+                        String headerName = headerBuilder.toString()
+                                .replaceAll("\n", "")
+                                .replaceAll(" ", "")
+                                .replaceAll("-", "");
+                        sectionArea.setHeader(headerName);
+                        tabularData.put(headerName, new CellValue(cell.getTextBlocks(), cellStart));
+                    });
+                }
+
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    // TODO avoid cell overlap merging.
+                    searchableRow.addAll(textBlock.getSequences());
+                }
+                cellStarts.add(cellStart);
+                start = start + cell.toString().trim().length() + 1;
+
+            }
+
+            sectionText.setText(searchableRow.toString());
+            sectionText.setHeadline(table.getHeadline());
+            sectionText.setSectionNumber(sectionNumber.intValue());
+            sectionText.setTable(true);
+            sectionText.setTabularData(tabularData);
+            sectionText.setCellStarts(cellStarts);
+            sectionTexts.add(sectionText);
+
+            sectionNumber.incrementAndGet();
+        }
+
+        return sectionTexts;
+    }
+
+
+    private SectionText processTableAsOneText(Table table, AtomicInteger sectionNumber) {
+
+        SearchableText entireTableText = new SearchableText();
+        SectionText sectionText = new SectionText();
+        int start = 0;
+        List<Integer> cellStarts = new ArrayList<>();
+        for (List<Cell> row : table.getRows()) {
+
+
+            for (Cell cell : row) {
+                if (CollectionUtils.isEmpty(cell.getTextBlocks())) {
+                    continue;
+                }
+
+                SectionArea sectionArea = new SectionArea(new Point((float) cell.getX(), (float) cell.getY()), (float) cell
+                        .getWidth(), (float) cell.getHeight(), cell.getTextBlocks()
+                        .get(0)
+                        .getSequences()
+                        .get(0)
+                        .getPage());
+                sectionText.getTextBlocks().addAll(cell.getTextBlocks());
+                sectionText.getSectionAreas().add(sectionArea);
+
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    entireTableText.addAll(textBlock.getSequences());
+                }
+
+
+                cellStarts.add(start);
+                start = start + cell.toString().trim().length() + 1;
+            }
+
+        }
+        sectionText.setCellStarts(cellStarts);
+
+        sectionText.setText(entireTableText.toString());
+        sectionText.setHeadline(table.getHeadline());
+        sectionText.setSectionNumber(sectionNumber.intValue());
+        sectionText.setTable(true);
+        return sectionText;
+    }
+
+
+    private SectionText processText(SearchableText searchableText, List<TextBlock> paragraphTextBlocks, String headline,
+                                    AtomicInteger sectionNumber, List<PdfImage> images) {
+
+        SectionText sectionText = new SectionText();
+        for (TextBlock paragraphTextBlock : paragraphTextBlocks) {
+            SectionArea sectionArea = new SectionArea(new Point(paragraphTextBlock.getMinX(), paragraphTextBlock.getMinY()), paragraphTextBlock
+                    .getWidth(), paragraphTextBlock.getHeight(), paragraphTextBlock.getPage());
+            sectionText.getSectionAreas().add(sectionArea);
+        }
+
+        sectionText.setText(searchableText.toString());
+        sectionText.setHeadline(headline);
+        sectionText.setSectionNumber(sectionNumber.intValue());
+        sectionText.setTable(false);
+        sectionText.setImages(images.stream()
+                .map(image -> convertImage(image, sectionNumber.intValue(), headline))
+                .collect(Collectors.toSet()));
+        sectionText.setTextBlocks(paragraphTextBlocks);
+        return sectionText;
+    }
+
+
+    private Image convertImage(PdfImage pdfImage, int sectionNumber, String headline) {
+
+        return Image.builder()
+                .type(pdfImage.getImageType().equals(ImageType.OTHER) ? "image" : pdfImage.getImageType()
+                        .name()
+                        .toLowerCase(Locale.ROOT))
+                .position(pdfImage.getPosition())
+                .sectionNumber(sectionNumber)
+                .section(headline)
+                .page(pdfImage.getPage())
+                .hasTransparency(pdfImage.isHasTransparency())
+                .build();
+    }
+
+}
@@ -0,0 +1,39 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class SectionTextService {
+
+
+    public void handleSectionText(SectionGrid sectionGrid, RedactionLogEntry redactionLogEntry) {
+
+        if (redactionLogEntry.getSection() != null) {
+            // set by UI
+            return;
+        }
+
+        if (sectionGrid != null) {
+            var firstPosition = !redactionLogEntry.getPositions().isEmpty() ? redactionLogEntry.getPositions().iterator().next() : null;
+
+            if (firstPosition != null) {
+
+                for (var section : sectionGrid.getSections()) {
+                    if (section.getPages().contains(firstPosition.getPage())) {
+                        for (var sectionArea : section.getSectionAreas()) {
+                            if (sectionArea.contains(firstPosition)) {
+                                redactionLogEntry.setSection(section.getHeadline());
+                                redactionLogEntry.setSectionNumber(section.getSectionNumber());
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/Show More
+++ b/Show More