Fixed endless loop on documents that contains no text

Pull request #135 : RED-1260: Enabled to add rules and manuel redaction actions for images
Merge in RED/redaction-service from RED-1260 to master * commit '55ba351362785de41090fb4252c9ee7c4c486991': RED-1260: Enabled to add rules and manuel redaction actions for images
2021-04-16 09:42:29 +02:00 · 2021-04-15 13:08:24 +02:00 · 2021-04-15 12:51:29 +02:00 · 2021-04-09 15:11:49 +02:00 · 2021-04-09 13:37:00 +02:00 · 2021-04-09 11:44:12 +02:00
148 changed files with 24840 additions and 3195 deletions
@@ -5,7 +5,7 @@
  <parent>
    <groupId>com.atlassian.bamboo</groupId>
    <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.0.4</version>
+    <version>7.1.2</version>
    <relativePath/>
  </parent>

@@ -34,4 +34,4 @@

  <!-- run 'mvn test' to perform offline validation of the plan -->
  <!-- run 'mvn -Ppublish-specs' to upload the plan to your Bamboo server -->
-</project>
+</project>
@@ -51,7 +51,7 @@ public class PlanSpec {
    private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
        Permissions permission = new Permissions()
                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
-                .groupPermissions("gin4", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
+                .groupPermissions("red-backend", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                .loggedInUserPermissions(PermissionType.VIEW)
                .anonymousUserPermissionView();
        return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
@@ -72,14 +72,6 @@ public class PlanSpec {
                        .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("Clean")
                                                .inlineBody("#!/bin/bash\n" +
@@ -134,4 +126,4 @@ public class PlanSpec {
                                .whenInactiveInRepositoryAfterDays(14))
                        .notificationForCommitters());
    }
-}
+}
@@ -1,4 +1,4 @@
-FROM gin5/platform-base:5.2.0
+FROM red/base-image:1.0.0

 ARG PLATFORM_JAR

@@ -6,4 +6,13 @@ ENV PLATFORM_JAR ${PLATFORM_JAR}

 ENV USES_ELASTICSEARCH false

-COPY ["${PLATFORM_JAR}", "/"]
+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,7 @@
    <parent>
        <artifactId>platform-dependency</artifactId>
        <groupId>com.iqser.red</groupId>
-        <version>1.0.1</version>
+        <version>1.0.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

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

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


@@ -32,21 +32,21 @@
            <dependency>
                <groupId>com.iqser.red</groupId>
                <artifactId>platform-commons-dependency</artifactId>
-                <version>1.0.0</version>
+                <version>1.2.5</version>
                <scope>import</scope>
                <type>pom</type>
            </dependency>

-                <dependency>
-                    <groupId>org.apache.pdfbox</groupId>
-                    <artifactId>pdfbox</artifactId>
-                    <version>${pdfbox.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.pdfbox</groupId>
-                    <artifactId>pdfbox-tools</artifactId>
-                    <version>${pdfbox.version}</version>
-                </dependency>
+            <dependency>
+                <groupId>org.apache.pdfbox</groupId>
+                <artifactId>pdfbox</artifactId>
+                <version>${pdfbox.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.pdfbox</groupId>
+                <artifactId>pdfbox-tools</artifactId>
+                <version>${pdfbox.version}</version>
+            </dependency>

        </dependencies>

@@ -0,0 +1,17 @@
+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 AnalyzeRequest {
+
+    private byte[] document;
+    private String ruleSetId;
+    private ManualRedactions manualRedactions;
+}
@@ -0,0 +1,19 @@
+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 AnalyzeResult {
+
+    private int numberOfPages;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;
+    private Text text;
+
+}
@@ -0,0 +1,17 @@
+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 AnnotateRequest {
+
+    private byte[] document;
+    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;
+}
@@ -0,0 +1,15 @@
+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 AnnotateResponse {
+
+    private byte[] document;
+}
@@ -0,0 +1,16 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CellRectangle {
+
+    private Point topLeft;
+    private float width;
+    private float height;
+
+}
@@ -0,0 +1,21 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.time.OffsetDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Comment {
+
+    private String id;
+    private OffsetDateTime date;
+    private String text;
+    private String user;
+
+}
@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IdRemoval {
+
+    private String id;
+    private String user;
+    private Status status;
+    private boolean removeFromDictionary;
+
+}
@@ -0,0 +1,19 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualForceRedact {
+
+    private String id;
+    private String user;
+    private Status status;
+    private String legalBasis;
+
+}
@@ -0,0 +1,30 @@
+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;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ManualRedactionEntry {
+
+    private String id;
+    private String user;
+    private String type;
+    private String value;
+    private String reason;
+    private String legalBasis;
+    private List<Rectangle> positions = new ArrayList<>();
+    private Status status;
+    private boolean addToDictionary;
+
+    private String section;
+    private int sectionNumber;
+
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum ManualRedactionType {
+    ADD, REMOVE, FORCE_REDACT
+}
@@ -0,0 +1,32 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@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,15 @@
+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 ReanalyzeResult {
+
+    private RedactionLog redactionLog;
+}
@@ -1,11 +1,11 @@
 package com.iqser.red.service.redaction.v1.model;

-import java.util.List;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.util.List;
+
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -13,4 +13,20 @@ public class RedactionLog {

    private List<RedactionLogEntry> redactionLogEntry;

+    private long dictionaryVersion = -1;
+    private long rulesVersion = -1;
+
+    private String ruleSetId;
+    private String filename;
+
+
+    public RedactionLog(List<RedactionLogEntry> redactionLogEntry, long dictionaryVersion, long rulesVersion, String ruleSetId) {
+
+        this.redactionLogEntry = redactionLogEntry;
+        this.dictionaryVersion = dictionaryVersion;
+        this.rulesVersion = rulesVersion;
+        this.ruleSetId = ruleSetId;
+    }
+
+
 }
@@ -3,20 +3,46 @@ 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;

@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class RedactionLogEntry {

    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 int startOffset;
+    private int endOffset;
+
+    private boolean isImage;

 }
@@ -12,5 +12,6 @@ import lombok.NoArgsConstructor;
 public class RedactionRequest {

    private byte[] document;
-    private boolean flatRedaction;
+    private String ruleSetId;
+    private ManualRedactions manualRedactions;
 }
@@ -14,5 +14,6 @@ public class RedactionResult {
    private byte[] document;
    private int numberOfPages;
    private RedactionLog redactionLog;
+    private SectionGrid sectionGrid;

 }
@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.time.OffsetDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RenalyzeRequest {
+
+    private byte[] document;
+    private String ruleSetId;
+    private ManualRedactions manualRedactions;
+    private Text text;
+    private RedactionLog redactionLog;
+    private OffsetDateTime lastProcessed;
+}
@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionArea {
+
+    @NonNull
+    private Point topLeft;
+
+    @NonNull
+    private float width;
+
+    @NonNull
+    private float height;
+
+    @NonNull
+    private int page;
+
+    private String header;
+
+    public boolean contains(Rectangle other) {
+        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();
+    }
+
+}
@@ -0,0 +1,18 @@
+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.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SectionGrid {
+
+    private Map<Integer, List<SectionRectangle>> rectanglesPerPage = new HashMap<>();
+
+}
@@ -0,0 +1,33 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@RequiredArgsConstructor
+public class SectionRectangle {
+
+    @NonNull
+    private Point topLeft;
+
+    @NonNull
+    private float width;
+
+    @NonNull
+    private float height;
+
+    @NonNull
+    private int part;
+
+    @NonNull
+    private int numberOfParts;
+
+    private List<CellRectangle> tableCells;
+}
@@ -0,0 +1,25 @@
+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;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SectionText {
+
+    private int sectionNumber;
+    private String text;
+
+    private boolean isTable;
+    private String headline;
+
+    private List<SectionArea> sectionAreas = new ArrayList<>();
+
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.model;
+
+public enum Status {
+    REQUESTED, APPROVED, DECLINED
+}
@@ -0,0 +1,17 @@
+package com.iqser.red.service.redaction.v1.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Text {
+
+    private List<SectionText> sectionTexts = new ArrayList<>();
+
+}
@@ -1,18 +1,34 @@
 package com.iqser.red.service.redaction.v1.resources;

-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
+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.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.model.ReanalyzeResult;
 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.RenalyzeRequest;
+
+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;

 public interface RedactionResource {

    String SERVICE_NAME = "redaction-service-v1";

-    @PostMapping(value = "/redact", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    RedactionResult redact(@RequestBody RedactionRequest redactionRequest);
+    String RULE_SET_PARAMETER_NAME = "ruleSetId";
+    String RULE_SET_PATH_VARIABLE = "/{" + RULE_SET_PARAMETER_NAME + "}";
+
+    @PostMapping(value = "/analyze", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest);
+
+    @PostMapping(value = "/reanalyze", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    ReanalyzeResult reanalyze(@RequestBody RenalyzeRequest renalyzeRequest);
+
+    @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);
@@ -23,7 +39,10 @@ public interface RedactionResource {
    @PostMapping(value = "/debug/htmlTables", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
    RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest);

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

 }
@@ -11,25 +11,6 @@

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

-    <properties>
-        <pdfbox.version>2.0.20</pdfbox.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.pdfbox</groupId>
-                <artifactId>pdfbox-tools</artifactId>
-                <version>${pdfbox.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
    <dependencies>
        <dependency>
            <groupId>com.iqser.red.service</groupId>
@@ -39,7 +20,7 @@
        <dependency>
            <groupId>com.iqser.red.service</groupId>
            <artifactId>configuration-service-api-v1</artifactId>
-            <version>1.0.12</version>
+            <version>2.2.9</version>
        </dependency>
        <dependency>
            <groupId>org.drools</groupId>
@@ -56,17 +37,22 @@
            <artifactId>jts-core</artifactId>
            <version>1.16.1</version>
        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
        <!-- commons -->
        <dependency>
-            <groupId>com.iqser.gin4.commons</groupId>
+            <groupId>com.iqser.red.commons</groupId>
            <artifactId>spring-commons</artifactId>
        </dependency>
        <dependency>
-            <groupId>com.iqser.gin4.commons</groupId>
+            <groupId>com.iqser.red.commons</groupId>
            <artifactId>logging-commons</artifactId>
        </dependency>
        <dependency>
-            <groupId>com.iqser.gin4.commons</groupId>
+            <groupId>com.iqser.red.commons</groupId>
            <artifactId>metric-commons</artifactId>
        </dependency>
        <!-- other external -->
@@ -87,11 +73,7 @@
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
        </dependency>
-        <!-- ribbon must be included because transitive a dependency on it.-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-        </dependency>
+
        <!-- test dependencies -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -99,7 +81,7 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>com.iqser.gin4.commons</groupId>
+            <groupId>com.iqser.red.commons</groupId>
            <artifactId>test-commons</artifactId>
            <scope>test</scope>
        </dependency>
@@ -1,29 +1,15 @@
 package com.iqser.red.service.redaction.v1.server;

-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.lang3.StringUtils;
-import org.kie.api.KieServices;
-import org.kie.api.builder.KieBuilder;
-import org.kie.api.builder.KieFileSystem;
-import org.kie.api.builder.KieModule;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;

-import com.iqser.gin4.commons.spring.DefaultWebMvcConfiguration;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 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.settings.RedactionServiceSettings;

@Import({DefaultWebMvcConfiguration.class})
@@ -32,39 +18,9 @@ import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettin
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
 public class Application {

-    @Autowired
-    private RulesClient rulesClient;
-
-
    public static void main(String[] args) {
-
        SpringApplication.run(Application.class, args);
    }


-    @Bean
-    public KieContainer kieContainer() {
-
-        try {
-            KieServices kieServices = KieServices.Factory.get();
-
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            RulesResponse rules = rulesClient.getRules();
-            if (StringUtils.isEmpty(rules.getRules())) {
-                throw new RuntimeException("Rules cannot be empty.");
-            }
-            InputStream input = new ByteArrayInputStream(rules.getRules().getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources()
-                    .newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-
-            return kieServices.newKieContainer(kieModule.getReleaseId());
-        } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
-        }
-
-    }
-
 }
@@ -4,9 +4,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;

 import com.iqser.red.service.redaction.v1.model.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.SectionText;
 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;
@@ -17,12 +21,23 @@ public class Document {

    private List<Page> pages = new ArrayList<>();
    private List<Paragraph> paragraphs = new ArrayList<>();
+    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 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 long dictionaryVersion;
+    private long rulesVersion;
+
+    private List<SectionText> sectionText = new ArrayList<>();
+
+    private Map<Integer, Set<Image>> images = new HashMap<>();
+
 }
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class Footer {
+
+    private List<TextBlock> textBlocks;
+
+
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class Header {
+
+    private List<TextBlock> textBlocks;
+
+
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.classification.model;

 import java.util.List;

+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;

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

+    private List<PdfImage> images;
+
    private Rectangle bodyTextFrame;

    private boolean landscape;
@@ -28,7 +31,9 @@ public class Page {
    private StringFrequencyCounter fontCounter = new StringFrequencyCounter();
    private StringFrequencyCounter fontStyleCounter = new StringFrequencyCounter();

+
    public boolean isRotated() {
+
        return rotation != 0;
    }

@@ -3,6 +3,7 @@ package com.iqser.red.service.redaction.v1.server.classification.model;
 import java.util.ArrayList;
 import java.util.List;

+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
@@ -12,9 +13,10 @@ import lombok.NoArgsConstructor;

@Data
@NoArgsConstructor
-public class Paragraph {
+public class Paragraph implements Comparable{

    private List<AbstractTextContainer> pageBlocks = new ArrayList<>();
+    private List<PdfImage> images = new ArrayList<>();
    private String headline;


@@ -41,4 +43,23 @@ public class Paragraph {
        return tables;
    }

+
+    public List<TextBlock> getTextBlocks() {
+
+        List<TextBlock> textBlocks = new ArrayList<>();
+        pageBlocks.forEach(block -> {
+            if (block instanceof TextBlock) {
+                textBlocks.add((TextBlock) block);
+            }
+        });
+        return textBlocks;
+    }
+
+
+    @Override
+    public int compareTo(Object o) {
+
+        return 0;
+    }
+
 }
@@ -97,13 +97,7 @@ public class TextBlock extends AbstractTextContainer {
        this.maxY = Math.max(y1, y2);
    }

-    public float getHeight() {
-        return maxY - minY;
-    }

-    public float getWidth() {
-        return maxX - minX;
-    }

    @Override
    public String toString() {
@@ -131,7 +125,7 @@ public class TextBlock extends AbstractTextContainer {
        TextPositionSequence previous = null;
        for (TextPositionSequence word : sequences) {
            if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                    sb.append('\n');
                } else {
                    sb.append(' ');
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.classification.model;
+
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UnclassifiedText {
+
+    private List<TextBlock> textBlocks;
+
+
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> searchableText.addAll(block.getSequences()));
+        return searchableText;
+    }
+
+}
@@ -5,15 +5,17 @@ import java.util.regex.Pattern;

 import org.springframework.stereotype.Service;

-import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 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.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.classification.utils.PositionUtils;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Rectangle;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
@RequiredArgsConstructor
 public class ClassificationService {
@@ -28,7 +30,7 @@ public class ClassificationService {

        List<Float> headlineFontSizes = document.getFontSizeCounter().getHighterThanMostPopular();

-        System.out.println(document.getFontSizeCounter().getCountPerValue());
+        log.debug("Document FontSize counters are: {}", document.getFontSizeCounter().getCountPerValue());

        for (Page page : document.getPages()) {
            Rectangle btf = page.isLandscape() ? landscapeBodyTextFrame : bodyTextFrame;
@@ -39,6 +41,7 @@ public class ClassificationService {


    public void classifyPage(Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+
        for (AbstractTextContainer textBlock : page.getTextBlocks()) {
            if (textBlock instanceof TextBlock) {
                classifyBlock((TextBlock) textBlock, bodyTextFrame, page, document, headlineFontSizes);
@@ -47,24 +50,33 @@ public class ClassificationService {
    }


-    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document, List<Float> headlineFontSizes) {
+    public void classifyBlock(TextBlock textBlock, Rectangle bodyTextFrame, Page page, Document document,
+                              List<Float> headlineFontSizes) {
+
        if (document.getFontSizeCounter().getMostPopular() == null) {
            // TODO Figure out why this happens.
            return;
        }
-        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter().getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
+        if (PositionUtils.isOverBodyTextFrame(bodyTextFrame, textBlock, page.isRotated()) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
+                .getMostPopular())) {
            textBlock.setClassification("Header");

-        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter().getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter().getMostPopular())) {
+        } else if (PositionUtils.isUnderBodyTextFrame(bodyTextFrame, textBlock) && (document.getFontSizeCounter()
+                .getMostPopular() == null || textBlock.getHighestFontSize() <= document.getFontSizeCounter()
+                .getMostPopular())) {
            textBlock.setClassification("Footer");
-        }  else if (page.getPageNumber() == 1
-                && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock)
-                && PositionUtils.getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter().getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter().getMostPopular() || page.getTextBlocks().size() == 1)) {
+        } else if (page.getPageNumber() == 1 && (!PositionUtils.isTouchingUnderBodyTextFrame(bodyTextFrame, textBlock) && PositionUtils
+                .getHeightDifferenceBetweenChunkWordAndDocumentWord(textBlock, document.getTextHeightCounter()
+                        .getMostPopular()) > 2.5 && textBlock.getHighestFontSize() > document.getFontSizeCounter()
+                .getMostPopular() || page.getTextBlocks().size() == 1)) {
            if (!Pattern.matches("[0-9]+", textBlock.toString())) {
                textBlock.setClassification("Title");
            }
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document.getFontSizeCounter().getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle().equals("bold")) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() > document
+                .getFontSizeCounter()
+                .getMostPopular() && PositionUtils.getApproxLineCount(textBlock) < 4.9 && textBlock.getMostPopularWordStyle()
+                .equals("bold")) {

            for (int i = 1; i <= headlineFontSizes.size(); i++) {
                if (textBlock.getMostPopularWordFontSize() == headlineFontSizes.get(i - 1)) {
@@ -72,20 +84,36 @@ public class ClassificationService {
                    document.setHeadlines(true);
                }
            }
-        }else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText().startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+        } else if (!textBlock.getText().startsWith("Table ") && !textBlock.getText()
+                .startsWith("Figure ") && PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("bold") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
            textBlock.setClassification("H " + (headlineFontSizes.size() + 1));
            document.setHeadlines(true);
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("bold") && !document.getFontStyleCounter().getMostPopular().equals("bold")) {
            textBlock.setClassification("TextBlock Bold");
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont().equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle().equals(document.getFontStyleCounter().getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular()) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFont()
+                .equals(document.getFontCounter().getMostPopular()) && textBlock.getMostPopularWordStyle()
+                .equals(document.getFontStyleCounter()
+                        .getMostPopular()) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter()
+                .getMostPopular()) {
            textBlock.setClassification("TextBlock");
-        }
-        else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document.getFontSizeCounter().getMostPopular() && textBlock.getMostPopularWordStyle().equals("italic") && !document.getFontStyleCounter().getMostPopular().equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getMostPopularWordFontSize() == document
+                .getFontSizeCounter()
+                .getMostPopular() && textBlock.getMostPopularWordStyle()
+                .equals("italic") && !document.getFontStyleCounter()
+                .getMostPopular()
+                .equals("italic") && PositionUtils.getApproxLineCount(textBlock) < 2.9) {
            textBlock.setClassification("TextBlock Italic");
-        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock) && textBlock.getSequences().size() > 3){
+        } else if (PositionUtils.isWithinBodyTextFrame(bodyTextFrame, textBlock)) {
            textBlock.setClassification("TextBlock Unknown");
+        } else {
+            textBlock.setClassification("Other");
        }
    }
+
 }
@@ -1,10 +1,8 @@
 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;

-import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
-
-@FeignClient(name = "DictionaryResource", url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "DictionaryResource", url = "${configuration-service.url}")
 public interface DictionaryClient extends DictionaryResource {
 }
@@ -0,0 +1,15 @@
+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);
+
+}
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ImageClassificationResponse {
+
+    private String category;
+}
@@ -0,0 +1,102 @@
+package com.iqser.red.service.redaction.v1.server.client;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.FileCopyUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+public class MockMultipartFile implements MultipartFile {
+
+    private final String name;
+    private final String originalFilename;
+    @Nullable
+    private final String contentType;
+    private final byte[] content;
+
+
+    public MockMultipartFile(String name, @Nullable byte[] content) {
+
+        this(name, "", (String) null, (byte[]) content);
+    }
+
+
+    public MockMultipartFile(String name, InputStream contentStream) throws IOException {
+
+        this(name, "", (String) null, (byte[]) FileCopyUtils.copyToByteArray(contentStream));
+    }
+
+
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
+                             @Nullable byte[] content) {
+
+        Assert.hasLength(name, "Name must not be empty");
+        this.name = name;
+        this.originalFilename = originalFilename != null ? originalFilename : "";
+        this.contentType = contentType;
+        this.content = content != null ? content : new byte[0];
+    }
+
+
+    public MockMultipartFile(String name, @Nullable String originalFilename, @Nullable String contentType,
+                             InputStream contentStream) throws IOException {
+
+        this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
+    }
+
+
+    public String getName() {
+
+        return this.name;
+    }
+
+
+    @NonNull
+    public String getOriginalFilename() {
+
+        return this.originalFilename;
+    }
+
+
+    @Nullable
+    public String getContentType() {
+
+        return this.contentType;
+    }
+
+
+    public boolean isEmpty() {
+
+        return this.content.length == 0;
+    }
+
+
+    public long getSize() {
+
+        return (long) this.content.length;
+    }
+
+
+    public byte[] getBytes() throws IOException {
+
+        return this.content;
+    }
+
+
+    public InputStream getInputStream() throws IOException {
+
+        return new ByteArrayInputStream(this.content);
+    }
+
+
+    public void transferTo(File dest) throws IOException, IllegalStateException {
+
+        FileCopyUtils.copy(this.content, dest);
+    }
+
+}
@@ -1,9 +1,8 @@
 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;

-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
-
-@FeignClient(name = RulesResource.SERVICE_NAME, url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = RulesResource.SERVICE_NAME, url = "${configuration-service.url}")
 public interface RulesClient extends RulesResource {
 }
@@ -2,13 +2,13 @@ package com.iqser.red.service.redaction.v1.server.controller;

 import java.time.OffsetDateTime;

+import com.iqser.red.commons.spring.ErrorMessage;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

-import com.iqser.gin4.commons.api.errorhandling.ErrorMessage;
 import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;

 import lombok.extern.slf4j.Slf4j;
@@ -1,65 +1,119 @@
 package com.iqser.red.service.redaction.v1.server.controller;

-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
+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.AnnotateRequest;
+import com.iqser.red.service.redaction.v1.model.AnnotateResponse;
+import com.iqser.red.service.redaction.v1.model.ReanalyzeResult;
 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.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.RenalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.Text;
 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.redaction.service.EntityRedactionService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ImageClassificationService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.ReanalyzeService;
+import com.iqser.red.service.redaction.v1.server.redaction.service.RedactionLogCreatorService;
 import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 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.AnnotationHighlightService;
-import com.iqser.red.service.redaction.v1.server.visualization.service.PdfFlattenService;
 import com.iqser.red.service.redaction.v1.server.visualization.service.PdfVisualisationService;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

+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.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+@Slf4j
@RestController
@RequiredArgsConstructor
 public class RedactionController implements RedactionResource {

    private final PdfVisualisationService pdfVisualisationService;
    private final PdfSegmentationService pdfSegmentationService;
-    private final AnnotationHighlightService annotationHighlightService;
+    private final RedactionLogCreatorService redactionLogCreatorService;
    private final EntityRedactionService entityRedactionService;
-    private final PdfFlattenService pdfFlattenService;
    private final DroolsExecutionService droolsExecutionService;
+    private final DictionaryService dictionaryService;
+    private final AnnotationService annotationService;
+    private final ReanalyzeService reanalyzeService;
+    private final ImageClassificationService imageClassificationService;
+

    @Override
-    public RedactionResult redact(@RequestBody RedactionRequest redactionRequest) {
+    public AnalyzeResult analyze(@RequestBody AnalyzeRequest analyzeRequest) {

-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(analyzeRequest.getDocument()))) {
            pdDocument.setAllSecurityToBeRemoved(true);

            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc);
-            annotationHighlightService.highlight(pdDocument, classifiedDoc, redactionRequest.isFlatRedaction());

-            if (redactionRequest.isFlatRedaction()) {
-                PDDocument flatDocument = pdfFlattenService.flattenPDF(pdDocument);
-                return convert(flatDocument, classifiedDoc.getPages().size(), new RedactionLog(classifiedDoc.getRedactionLogEntities()));
-            }
+            log.info("Document structure analysis successful, starting redaction analysis...");

-            return convert(pdDocument, classifiedDoc.getPages().size(), new RedactionLog(classifiedDoc.getRedactionLogEntities()));
+            imageClassificationService.classifyImages(classifiedDoc);
+            entityRedactionService.processDocument(classifiedDoc, analyzeRequest.getRuleSetId(), analyzeRequest.getManualRedactions());
+            redactionLogCreatorService.createRedactionLog(classifiedDoc, pdDocument.getNumberOfPages(), analyzeRequest.getManualRedactions(), analyzeRequest
+                    .getRuleSetId());

-        } catch (IOException e) {
+            log.info("Redaction analysis successful...");
+
+            return AnalyzeResult.builder()
+                    .sectionGrid(classifiedDoc.getSectionGrid())
+                    .redactionLog(new RedactionLog(classifiedDoc.getRedactionLogEntities(), classifiedDoc.getDictionaryVersion(), classifiedDoc
+                            .getRulesVersion(), analyzeRequest.getRuleSetId()))
+                    .numberOfPages(classifiedDoc.getPages().size())
+                    .text(new Text(classifiedDoc.getSectionText()))
+                    .build();
+
+        } catch (Exception e) {
            throw new RedactionException(e);
        }

    }

+
+    public ReanalyzeResult reanalyze(@RequestBody RenalyzeRequest renalyzeRequest) {
+
+        return reanalyzeService.reanalyze(renalyzeRequest);
+    }
+
+
+    public AnnotateResponse annotate(@RequestBody AnnotateRequest annotateRequest) {
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(annotateRequest.getDocument()))) {
+
+            pdDocument.setAllSecurityToBeRemoved(true);
+            dictionaryService.updateDictionary(annotateRequest.getRedactionLog().getRuleSetId());
+            annotationService.annotate(pdDocument, annotateRequest.getRedactionLog(), annotateRequest.getSectionGrid());
+
+            try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+                pdDocument.save(byteArrayOutputStream);
+                return AnnotateResponse.builder().document(byteArrayOutputStream.toByteArray()).build();
+            }
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+    }
+
+
    @Override
    public RedactionResult classify(@RequestBody RedactionRequest pdfSegmentationRequest) {

@@ -69,7 +123,7 @@ public class RedactionController implements RedactionResource {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            pdfVisualisationService.visualizeClassifications(classifiedDoc, pdDocument);

-            return convert(pdDocument, classifiedDoc.getPages().size());
+            return convert(pdDocument, classifiedDoc.getPages().size(), pdfSegmentationRequest.getRuleSetId());

        } catch (IOException e) {
            throw new RedactionException(e);
@@ -77,6 +131,7 @@ public class RedactionController implements RedactionResource {

    }

+
    @Override
    public RedactionResult sections(@RequestBody RedactionRequest redactionRequest) {

@@ -86,7 +141,7 @@ public class RedactionController implements RedactionResource {
            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
            pdfVisualisationService.visualizeParagraphs(classifiedDoc, pdDocument);

-            return convert(pdDocument, classifiedDoc.getPages().size());
+            return convert(pdDocument, classifiedDoc.getPages().size(), redactionRequest.getRuleSetId());

        } catch (IOException e) {
            throw new RedactionException(e);
@@ -94,6 +149,7 @@ public class RedactionController implements RedactionResource {

    }

+
    @Override
    public RedactionResult htmlTables(@RequestBody RedactionRequest redactionRequest) {

@@ -120,24 +176,38 @@ public class RedactionController implements RedactionResource {

    }

+
    @Override
-    public void updateRules(@RequestBody String rules) {
-        droolsExecutionService.updateRules(rules);
+    public void updateRules(@PathVariable(RULE_SET_PARAMETER_NAME) String ruleSetId) {
+
+        droolsExecutionService.updateRules(ruleSetId);
    }


-    private RedactionResult convert(PDDocument document, int numberOfPages) throws IOException {
-        return convert(document, numberOfPages, null);
+    @Override
+    public void testRules(@RequestBody String rules) {
+
+        droolsExecutionService.testRules(rules);
    }

-    private RedactionResult convert(PDDocument document, int numberOfPages, RedactionLog redactionLog) throws IOException {
+
+    private RedactionResult convert(PDDocument document, int numberOfPages, String ruleSetId) throws IOException {
+
+        return convert(document, numberOfPages, null, null, 0, 0, ruleSetId);
+    }
+
+
+    private RedactionResult convert(PDDocument document, int numberOfPages,
+                                    List<RedactionLogEntry> redactionLogEntities, SectionGrid sectionGrid,
+                                    long dictionaryVersion, long rulesVersion, String ruleSetId) throws IOException {

        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
            document.save(byteArrayOutputStream);
            return RedactionResult.builder()
                    .document(byteArrayOutputStream.toByteArray())
                    .numberOfPages(numberOfPages)
-                    .redactionLog(redactionLog)
+                    .redactionLog(new RedactionLog(redactionLogEntities, dictionaryVersion, rulesVersion, ruleSetId))
+                    .sectionGrid(sectionGrid)
                    .build();
        }

@@ -0,0 +1,83 @@
+package com.iqser.red.service.redaction.v1.server.parsing;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.apache.pdfbox.text.TextPosition;
+
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public class PDFAreaTextStripper extends PDFTextStripperByArea {
+
+    @Getter
+    private List<TextPositionSequence> textPositionSequences = new ArrayList<>();
+
+    @Setter
+    private int pageNumber;
+
+    public PDFAreaTextStripper() throws IOException {
+
+    }
+
+    @Override
+    public void writeString(String text, List<TextPosition> textPositions) throws IOException {
+
+        int startIndex = 0;
+        for (int i = 0; i <= textPositions.size() - 1; i++) {
+
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0"))) {
+                startIndex++;
+                continue;
+            }
+
+            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
+            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
+                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));
+                }
+                startIndex = i;
+            }
+
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0")) && 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));
+                }
+                startIndex = i + 1;
+            }
+        }
+
+        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"))) {
+            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));
+        }
+        super.writeString(text);
+    }
+
+
+    public void clearPositions(){
+        textPositionSequences = new ArrayList<>();
+    }
+
+}
@@ -1,6 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.parsing;

+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;
@@ -28,12 +30,18 @@ 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;
 import org.apache.pdfbox.cos.COSNumber;
 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 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;
@@ -43,11 +51,20 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
 public class PDFLinesTextStripper extends PDFTextStripper {

-    @Getter
-    private float minCharWidth = Float.MAX_VALUE;
+    @Setter
+    protected PDPage pdpage;

    @Getter
-    private float minCharHeight = Float.MAX_VALUE;
+    private int minCharWidth;
+
+    @Getter
+    private int maxCharWidth;
+
+    @Getter
+    private int minCharHeight;
+
+    @Getter
+    private int maxCharHeight;

    @Getter
    private final List<TextPositionSequence> textPositionSequences = new ArrayList<>();
@@ -57,13 +74,18 @@ public class PDFLinesTextStripper extends PDFTextStripper {

    private final List<Ruling> graphicsPath = new ArrayList<>();

+    @Getter
+    private List<PdfImage> images = new ArrayList<>();
+
    private float path_x;
    private float path_y;

    @Setter
    private int pageNumber;

+
    public PDFLinesTextStripper() throws IOException {
+
        super();
        this.addOperator(new SetStrokingColorSpace());
        this.addOperator(new SetNonStrokingColorSpace());
@@ -87,9 +109,9 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        this.addOperator(new SetLineWidth());
    }

+
    @Override
-    protected void processOperator(Operator operator, List<COSBase> arguments)
-            throws IOException {
+    protected void processOperator(Operator operator, List<COSBase> arguments) throws IOException {

        String operation = operator.getName();

@@ -110,9 +132,11 @@ 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();
@@ -133,19 +157,25 @@ 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;
@@ -168,12 +198,59 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            case OperatorName.ENDPATH:
                graphicsPath.clear();
                break;
+
+            case OperatorName.DRAW_OBJECT:
+                processImageOperation(arguments);
+                break;
+
        }

        super.processOperator(operator, arguments);
    }

+
+    protected void processImageOperation(List<COSBase> arguments) {
+
+        try {
+            COSName objectName = (COSName) arguments.get(0);
+            PDXObject xobject = getResources().getXObject(objectName);
+            if (xobject instanceof PDImageXObject) {
+                PDImageXObject pdfImage = (PDImageXObject) xobject;
+
+                Rectangle2D imageBounds = calculateImagePosition(pdfImage);
+
+                Rectangle2D rect = new Rectangle2D.Float((float) imageBounds.getX(), (float) imageBounds.getY(), (float) imageBounds
+                        .getWidth(), (float) imageBounds.getHeight());
+
+                if (rect.getHeight() > 2 && rect.getWidth() > 2) {
+                    this.images.add(new PdfImage(pdfImage.getImage(), rect, pageNumber));
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Problem during image extraction: {}", e.getMessage());
+        }
+    }
+
+
+    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) {
            return ((COSNumber) value).floatValue();
        } else {
@@ -181,30 +258,56 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        }
    }

+
    private Point2D.Float transformPosition(float x, float y) {
+
        return super.transformedPoint(x, y);
    }

+
    private void addVisibleRulings(List<Ruling> path, boolean stroke) throws IOException {

        try {
-            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor().toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor().isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
+            if (stroke && !getGraphicsState().getStrokingColor().isPattern() && getGraphicsState().getStrokingColor()
+                    .toRGB() == 0 || !stroke && !getGraphicsState().getNonStrokingColor()
+                    .isPattern() && getGraphicsState().getNonStrokingColor().toRGB() == 0) {
                rulings.addAll(path);
            }
        } catch (UnsupportedOperationException e) {
-            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor().getColorSpace().getName() + " or " + getGraphicsState().getNonStrokingColor().getColorSpace().getName() + " does not support toRGB");
+            log.error("UnsupportedOperationException: " + getGraphicsState().getStrokingColor()
+                    .getColorSpace()
+                    .getName() + " or " + getGraphicsState().getNonStrokingColor()
+                    .getColorSpace()
+                    .getName() + " does not support toRGB");
        }
    }

+
    @Override
    public void writeString(String text, List<TextPosition> textPositions) throws IOException {

        int startIndex = 0;
        for (int i = 0; i <= textPositions.size() - 1; i++) {
-            minCharWidth = Math.min(minCharWidth, textPositions.get(i).getWidthDirAdj());
-            minCharHeight = Math.min(minCharHeight, textPositions.get(i).getHeightDir());

-            if (i == 0 && textPositions.get(i).getUnicode().equals(" ")) {
+            int charWidth = (int) textPositions.get(i).getWidthDirAdj();
+            if (charWidth < minCharWidth) {
+                minCharWidth = charWidth;
+            }
+            if (charWidth > maxCharWidth) {
+                maxCharWidth = charWidth;
+            }
+
+            int charHeight = (int) textPositions.get(i).getHeightDir();
+            if (charHeight < minCharHeight) {
+                minCharHeight = charHeight;
+            }
+            if (charWidth > maxCharHeight) {
+                maxCharHeight = charHeight;
+            }
+
+            if (i == 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0"))) {
                startIndex++;
                continue;
            }
@@ -212,15 +315,21 @@ public class PDFLinesTextStripper extends PDFTextStripper {
            // Strange but sometimes this is happening, for example: Metolachlor2.pdf
            if (i > 0 && textPositions.get(i).getX() < textPositions.get(i - 1).getX()) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i;
            }

-            if (i > 0 && textPositions.get(i).getUnicode().equals(" ") && i <= textPositions.size() - 2) {
+            if (i > 0 && (textPositions.get(i).getUnicode().equals(" ") || textPositions.get(i)
+                    .getUnicode()
+                    .equals("\u00A0")) && i <= textPositions.size() - 2) {
                List<TextPosition> sublist = textPositions.subList(startIndex, i);
-                if (!(sublist.isEmpty() || sublist.size() == 1 && sublist.get(0).getUnicode().equals(" "))) {
+                if (!(sublist.isEmpty() || sublist.size() == 1 && (sublist.get(0)
+                        .getUnicode()
+                        .equals(" ") || sublist.get(0).getUnicode().equals("\u00A0")))) {
                    textPositionSequences.add(new TextPositionSequence(sublist, pageNumber));
                }
                startIndex = i + 1;
@@ -228,22 +337,29 @@ public class PDFLinesTextStripper extends PDFTextStripper {
        }

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

+
    @Override
    public String getText(PDDocument doc) throws IOException {

-        minCharWidth = Float.MAX_VALUE;
-        minCharHeight = Float.MAX_VALUE;
+        minCharWidth = Integer.MAX_VALUE;
+        maxCharWidth = 0;
+        minCharHeight = Integer.MAX_VALUE;
+        maxCharHeight = 0;
        textPositionSequences.clear();
+        images = new ArrayList<>();
        rulings.clear();
        graphicsPath.clear();
        path_x = 0.0f;
@@ -1,22 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.parsing.model;
-
-import java.util.List;
-
-import com.iqser.red.service.redaction.v1.server.tableextraction.model.Ruling;
-
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class ParsedElements {
-
-    private List<TextPositionSequence> sequences;
-    private List<Ruling> rulings;
-
-    private boolean landscape;
-    private boolean rotated;
-
-    private float minCharWidth;
-    private float minCharHeight;
-}
@@ -5,10 +5,11 @@ import java.util.List;

 import org.apache.pdfbox.text.TextPosition;

+import com.iqser.red.service.redaction.v1.model.Point;
+import com.iqser.red.service.redaction.v1.model.Rectangle;
+
 import lombok.Data;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import lombok.Setter;

@Data
@RequiredArgsConstructor
@@ -16,42 +17,50 @@ public class TextPositionSequence implements CharSequence {

    private List<TextPosition> textPositions = new ArrayList<>();

-    @Getter
-    @Setter
-    private float[] annotationColor;
-
    private final int page;

-    public TextPositionSequence(List<TextPosition> textPositions, int page){
+
+    public TextPositionSequence(List<TextPosition> textPositions, int page) {
+
        this.textPositions = textPositions;
        this.page = page;
    }

+
    @Override
    public int length() {
+
        return textPositions.size();
    }

+
    @Override
    public char charAt(int index) {
+
        TextPosition textPosition = textPositionAt(index);
        String text = textPosition.getUnicode();
        return text.charAt(0);
    }

+
    public char charAt(int index, boolean caseInSensitive) {
+
        TextPosition textPosition = textPositionAt(index);
        String text = textPosition.getUnicode();
        return caseInSensitive ? text.toLowerCase().charAt(0) : text.charAt(0);
    }

+
    @Override
    public TextPositionSequence subSequence(int start, int end) {
+
        return new TextPositionSequence(textPositions.subList(start, end), page);
    }

+
    @Override
    public String toString() {
+
        StringBuilder builder = new StringBuilder(length());
        for (int i = 0; i < length(); i++) {
            builder.append(charAt(i));
@@ -59,15 +68,21 @@ public class TextPositionSequence implements CharSequence {
        return builder.toString();
    }

+
    public TextPosition textPositionAt(int index) {
+
        return textPositions.get(index);
    }

+
    public void add(TextPosition textPosition) {
+
        this.textPositions.add(textPosition);
    }

+
    public float getX1() {
+
        if (textPositions.get(0).getRotation() == 90) {
            return textPositions.get(0).getYDirAdj() - getTextHeight();
        } else {
@@ -75,15 +90,26 @@ public class TextPositionSequence implements CharSequence {
        }
    }

+
    public float getX2() {
+
        if (textPositions.get(0).getRotation() == 90) {
            return textPositions.get(0).getYDirAdj();
        } else {
-            return textPositions.get(textPositions.size() - 1).getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
+            return textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
        }
    }

+
+    public float getRotationAdjustedY() {
+
+        return textPositions.get(0).getY();
+    }
+
+
    public float getY1() {
+
        if (textPositions.get(0).getRotation() == 90) {
            return textPositions.get(0).getXDirAdj();
        } else {
@@ -91,30 +117,46 @@ public class TextPositionSequence implements CharSequence {
        }
    }

+
    public float getY2() {
+
        if (textPositions.get(0).getRotation() == 90) {
-            return textPositions.get(textPositions.size() - 1).getXDirAdj() + getTextHeight() -2 ;
+            return textPositions.get(textPositions.size() - 1).getXDirAdj() + getTextHeight() - 2;
        } else {
            return textPositions.get(0).getPageHeight() - textPositions.get(0).getYDirAdj() + getTextHeight();
        }
    }

+
    public float getTextHeight() {
+
        return textPositions.get(0).getHeightDir() + 2;
    }

+
    public float getHeight() {
+
        return getY2() - getY1();
    }

+
    public float getWidth() {
+
        return getX2() - getX1();
    }

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

+
    public String getFontStyle() {

        String lowercaseFontName = textPositions.get(0).getFont().toString().toLowerCase();
@@ -131,16 +173,54 @@ public class TextPositionSequence implements CharSequence {

    }

+
    public float getFontSize() {
+
        return textPositions.get(0).getFontSizeInPt();
    }

+
    public float getSpaceWidth() {
+
        return textPositions.get(0).getWidthOfSpace();
    }

+
    public int getRotation() {
+
        return textPositions.get(0).getRotation();
    }

+
+    public Rectangle getRectangle() {
+
+        float height = getTextHeight();
+
+        float posXInit = getX1();
+        float posXEnd;
+        float posYInit;
+        float posYEnd;
+
+        if (textPositions.get(0).getRotation() == 90) {
+            posXEnd = textPositions.get(0).getYDirAdj() + 2;
+            posYInit = getY1();
+            posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
+        } else if (textPositions.get(0).getRotation() == 270) {
+            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 {
+            posXEnd = textPositions.get(textPositions.size() - 1)
+                    .getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 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);
+    }
+
 }
@@ -0,0 +1,50 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.Iterator;
+import java.util.List;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
+
+import lombok.Value;
+
+@Value
+public class CellValue {
+
+    private List<TextBlock> textBlocks;
+
+    private int rowSpanStart;
+
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+
+        Iterator<TextBlock> itty = textBlocks.iterator();
+        while (itty.hasNext()) {
+            TextBlock textBlock = itty.next();
+            TextPositionSequence previous = null;
+            for (TextPositionSequence word : textBlock.getSequences()) {
+                if (previous != null) {
+                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                        sb.append('\n');
+                    } else {
+                        sb.append(' ');
+                    }
+                }
+                sb.append(word.toString());
+                previous = word;
+            }
+            if (itty.hasNext()) {
+                sb.append(' ');
+            }
+        }
+
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
+                .replaceAll("\n", " ")
+                .replaceAll(" {2}", " ");
+    }
+
+}
@@ -0,0 +1,96 @@
+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.Data;
+import lombok.Getter;
+
+@Data
+public class Dictionary {
+
+    public static final String RECOMMENDATION_PREFIX = "recommendation_";
+
+    @Getter
+    private List<DictionaryModel> dictionaryModels;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+    @Getter
+    private long version;
+
+
+    public Dictionary(List<DictionaryModel> dictionaryModels, long dictionaryVersion){
+        this.dictionaryModels = dictionaryModels;
+        this.dictionaryModels.forEach(dm -> localAccessMap.put(dm.getType(), dm));
+        this.version = dictionaryVersion;
+    }
+
+
+    public int getDictionaryRank(String type){
+        if(!localAccessMap.containsKey(type)){
+            return 0;
+        }
+        return localAccessMap.get(type).getRank();
+    }
+
+
+    public boolean isRecommendation(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public boolean hasLocalEntries() {
+
+        return dictionaryModels.stream().anyMatch(dm -> !dm.getLocalEntries().isEmpty());
+    }
+
+
+    public Set<String> getTypes() {
+
+        return localAccessMap.keySet();
+    }
+
+
+    public boolean containsValue(String type, String value) {
+
+        if (localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(type) && localAccessMap.get(type)
+                .getLocalEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getEntries()
+                .contains(value) || localAccessMap.containsKey(RECOMMENDATION_PREFIX + type) && localAccessMap.get(RECOMMENDATION_PREFIX + type)
+                .getLocalEntries()
+                .contains(value)) {
+            return true;
+        }
+        return false;
+    }
+
+
+    public boolean isHint(String type) {
+
+        DictionaryModel model = localAccessMap.get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+    public boolean isCaseInsensitiveDictionary(String type) {
+
+        DictionaryModel dictionaryModel = localAccessMap.get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+}
@@ -0,0 +1,15 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.Set;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DictionaryIncrement {
+
+    private Set<DictionaryIncrementValue> values;
+    private long dictionaryVersion;
+
+}
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DictionaryIncrementValue {
+
+    private String value;
+    private boolean caseinsensitive;
+
+}
@@ -0,0 +1,31 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+
+import java.io.Serializable;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.configuration.v1.api.model.DictionaryEntry;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class DictionaryModel implements Serializable {
+
+    private String type;
+    private int rank;
+    private float[] color;
+    private boolean caseInsensitive;
+    private boolean hint;
+    private boolean recommendation;
+    private Set<DictionaryEntry> entries;
+    private Set<String> localEntries;
+
+    public Set<String> getValues(boolean local){
+        return local ? localEntries : entries.stream().filter(e -> !e.isDeleted()).map(e-> e.getValue()).collect(Collectors
+                .toSet());
+    }
+
+}
@@ -0,0 +1,24 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class DictionaryRepresentation {
+
+    private String ruleSetId;
+    private long dictionaryVersion = -1;
+    private List<DictionaryModel> dictionary = new ArrayList<>();
+    private float[] defaultColor;
+    private float[] requestAddColor;
+    private float[] requestRemoveColor;
+    private float[] notRedactedColor;
+    private Map<String, DictionaryModel> localAccessMap = new HashMap<>();
+
+
+
+}
@@ -3,6 +3,8 @@ package com.iqser.red.service.redaction.v1.server.redaction.model;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -10,13 +12,18 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Entity {

-    @EqualsAndHashCode.Include
+
    private final String word;
    private final String type;
    private boolean redaction;
    private String redactionReason;
+    private String legalBasis;
    private List<EntityPositionSequence> positionSequences = new ArrayList<>();
+    private List<TextPositionSequence> targetSequences;
+
+    @EqualsAndHashCode.Include
    private Integer start;
+    @EqualsAndHashCode.Include
    private Integer end;

    @EqualsAndHashCode.Include
@@ -26,8 +33,13 @@ public class Entity {
    @EqualsAndHashCode.Include
    private int sectionNumber;

+    private boolean isDictionaryEntry;

-    public Entity(String word, String type, boolean redaction, String redactionReason, List<EntityPositionSequence> positionSequences, String headline, int matchedRule, int sectionNumber) {
+    private String textBefore;
+    private String textAfter;
+
+
+    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) {

        this.word = word;
        this.type = type;
@@ -37,10 +49,16 @@ public class Entity {
        this.headline = headline;
        this.matchedRule = matchedRule;
        this.sectionNumber = sectionNumber;
+        this.legalBasis = legalBasis;
+        this.isDictionaryEntry = isDictionaryEntry;
+        this.textBefore = textBefore;
+        this.textAfter = textAfter;
+        this.start = start;
+        this.end = end;
    }


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

        this.word = word;
        this.type = type;
@@ -48,6 +66,7 @@ public class Entity {
        this.end = end;
        this.headline = headline;
        this.sectionNumber = sectionNumber;
+        this.isDictionaryEntry = isDictionaryEntry;
    }

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

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

 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;

@@ -20,6 +19,6 @@ public class EntityPositionSequence {
    @EqualsAndHashCode.Exclude
    private List<TextPositionSequence> sequences = new ArrayList<>();
    private int pageNumber;
-    private final UUID id;
+    private final String id;

 }
@@ -0,0 +1,26 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.awt.geom.Rectangle2D;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class Image {
+
+    private String type;
+    private Rectangle2D position;
+    private boolean redaction;
+    private String redactionReason;
+    private String legalBasis;
+    private int matchedRule;
+    private int sectionNumber;
+    private String section;
+    private int page;
+
+}
@@ -0,0 +1,5 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+public enum ImageType {
+    LOGO, FORMULA, SIGNATURE, OTHER, OCR
+}
@@ -0,0 +1,28 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@RequiredArgsConstructor
+public class PdfImage {
+
+    @NonNull
+    private BufferedImage image;
+    @NonNull
+    private Rectangle2D position;
+    private ImageType imageType;
+    private boolean isAppendedToParagraph;
+
+    @NonNull
+    private int page;
+
+}
@@ -0,0 +1,37 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class ReanalysisSection {
+
+    private int sectionNumber;
+    private String headline;
+    private List<TextBlock> textBlocks;
+    private Map<String, CellValue> tabularData = new HashMap<>();
+    private List<Integer> cellStarts;
+    private Set<Image> images = new HashSet<>();
+
+
+    public SearchableText getSearchableText() {
+
+        SearchableText searchableText = new SearchableText();
+        textBlocks.forEach(block -> {
+            if (block instanceof TextBlock) {
+                searchableText.addAll(block.getSequences());
+            }
+        });
+        return searchableText;
+    }
+
+}
@@ -1,11 +1,12 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 import java.util.regex.Pattern;

 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.IdBuilder;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;

 public class SearchableText {
@@ -25,9 +26,17 @@ public class SearchableText {
    }


-    @SuppressWarnings("checkstyle:ModifiedControlVariable")
    public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive) {

+        return getSequences(searchString, caseInsensitive, null);
+
+    }
+
+
+    @SuppressWarnings("checkstyle:ModifiedControlVariable")
+    public List<EntityPositionSequence> getSequences(String searchString, boolean caseInsensitive,
+                                                     List<TextPositionSequence> sequencesSubList) {
+
        String normalizedSearchString;
        if (caseInsensitive) {
            normalizedSearchString = searchString.toLowerCase();
@@ -40,37 +49,53 @@ public class SearchableText {

        List<TextPositionSequence> crossSequenceParts = new ArrayList<>();
        List<EntityPositionSequence> finalMatches = new ArrayList<>();
-        for (int i = 0; i < sequences.size(); i++) {
-            TextPositionSequence partMatch = new TextPositionSequence(sequences.get(i).getPage());
-            for (int j = 0; j < sequences.get(i).length(); j++) {

-                if (i > 0 && j == 0 && sequences.get(i).charAt(0, caseInsensitive) == ' ' && sequences.get(i - 1)
-                        .charAt(sequences.get(i - 1).length() - 1, caseInsensitive) == ' ' || j > 0 && sequences.get(i)
-                        .charAt(j, caseInsensitive) == ' ' && sequences.get(i).charAt(j - 1, caseInsensitive) == ' ') {
-                    if (j == sequences.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions().isEmpty()) {
+        List<TextPositionSequence> searchSpace;
+        if (sequencesSubList != null) {
+            int subListIndex = Collections.indexOfSubList(sequences, sequencesSubList);
+            if (subListIndex != -1) {
+                searchSpace = sequences.subList(subListIndex, subListIndex + sequencesSubList.size());
+            } else {
+                searchSpace = sequences;
+            }
+        } else {
+            searchSpace = sequences;
+        }
+
+        for (int i = 0; i < searchSpace.size(); i++) {
+            TextPositionSequence partMatch = new TextPositionSequence(searchSpace.get(i).getPage());
+            for (int j = 0; j < searchSpace.get(i).length(); j++) {
+
+                if (i > 0 && j == 0 && searchSpace.get(i).charAt(0, caseInsensitive) == ' ' && searchSpace.get(i - 1)
+                        .charAt(searchSpace.get(i - 1)
+                                .length() - 1, caseInsensitive) == ' ' || j > 0 && searchSpace.get(i)
+                        .charAt(j, caseInsensitive) == ' ' && searchSpace.get(i)
+                        .charAt(j - 1, caseInsensitive) == ' ') {
+                    if (j == searchSpace.get(i).length() - 1 && counter != 0 && !partMatch.getTextPositions()
+                            .isEmpty()) {
                        crossSequenceParts.add(partMatch);
                    }
                    continue;
                }

-                if (j == 0 && sequences.get(i).charAt(j, caseInsensitive) != ' ' && i != 0 && sequences.get(i - 1)
-                        .charAt(sequences.get(i - 1)
+                if (j == 0 && searchSpace.get(i).charAt(j, caseInsensitive) != ' ' && i != 0 && searchSpace.get(i - 1)
+                        .charAt(searchSpace.get(i - 1)
                                .length() - 1, caseInsensitive) != ' ' && searchChars[counter] == ' ') {
                    counter++;
                }

-                if (sequences.get(i)
-                        .charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && sequences.get(i)
+                if (searchSpace.get(i).charAt(j, caseInsensitive) == searchChars[counter] || counter != 0 && searchSpace
+                        .get(i)
                        .charAt(j, caseInsensitive) == '-') {

-                    if (counter != 0 || i == 0 && j == 0 || j != 0 && isSeparator(sequences.get(i)
-                            .charAt(j - 1, caseInsensitive)) || j == 0 && i != 0 && isSeparator(sequences.get(i - 1)
-                            .charAt(sequences.get(i - 1)
-                                    .length() - 1, caseInsensitive)) || j == 0 && i != 0 && sequences.get(i - 1)
-                            .charAt(sequences.get(i - 1).length() - 1, caseInsensitive) != ' ' && sequences.get(i)
+                    if (counter != 0 || i == 0 && j == 0 || j != 0 && isSeparator(searchSpace.get(i)
+                            .charAt(j - 1, caseInsensitive)) || j == 0 && i != 0 && isSeparator(searchSpace.get(i - 1)
+                            .charAt(searchSpace.get(i - 1)
+                                    .length() - 1, caseInsensitive)) || j == 0 && i != 0 && searchSpace.get(i - 1)
+                            .charAt(searchSpace.get(i - 1).length() - 1, caseInsensitive) != ' ' && searchSpace.get(i)
                            .charAt(j, caseInsensitive) != ' ') {
-                        partMatch.add(sequences.get(i).textPositionAt(j));
-                        if (!(j == sequences.get(i).length() - 1 && sequences.get(i)
+                        partMatch.add(searchSpace.get(i).textPositionAt(j));
+                        if (!(j == searchSpace.get(i).length() - 1 && searchSpace.get(i)
                                .charAt(j, caseInsensitive) == '-' && searchChars[counter] != '-')) {
                            counter++;
                        }
@@ -79,19 +104,20 @@ public class SearchableText {
                    if (counter == searchString.length()) {
                        crossSequenceParts.add(partMatch);

-                        if (i == sequences.size() - 1 && j == sequences.get(i).length() - 1 || j != sequences.get(i)
-                                .length() - 1 && isSeparator(sequences.get(i)
-                                .charAt(j + 1, caseInsensitive)) || j == sequences.get(i)
-                                .length() - 1 && isSeparator(sequences.get(i + 1)
-                                .charAt(0, caseInsensitive)) || j == sequences.get(i).length() - 1 && sequences.get(i)
-                                .charAt(j, caseInsensitive) != ' ' && sequences.get(i + 1)
+                        if (i == searchSpace.size() - 1 && j == searchSpace.get(i)
+                                .length() - 1 || j != searchSpace.get(i).length() - 1 && isSeparator(searchSpace.get(i)
+                                .charAt(j + 1, caseInsensitive)) || j == searchSpace.get(i)
+                                .length() - 1 && isSeparator(searchSpace.get(i + 1)
+                                .charAt(0, caseInsensitive)) || j == searchSpace.get(i)
+                                .length() - 1 && searchSpace.get(i)
+                                .charAt(j, caseInsensitive) != ' ' && searchSpace.get(i + 1)
                                .charAt(0, caseInsensitive) != ' ') {
-                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts));
+                            finalMatches.addAll(buildEntityPositionSequence(crossSequenceParts, normalizedSearchString));
                        }

                        counter = 0;
                        crossSequenceParts = new ArrayList<>();
-                        partMatch = new TextPositionSequence(sequences.get(i).getPage());
+                        partMatch = new TextPositionSequence(searchSpace.get(i).getPage());
                    }
                } else {
                    counter = 0;
@@ -99,10 +125,10 @@ public class SearchableText {
                        j--;
                    }
                    crossSequenceParts = new ArrayList<>();
-                    partMatch = new TextPositionSequence(sequences.get(i).getPage());
+                    partMatch = new TextPositionSequence(searchSpace.get(i).getPage());
                }

-                if (j == sequences.get(i).length() - 1 && counter != 0) {
+                if (j == searchSpace.get(i).length() - 1 && counter != 0) {
                    crossSequenceParts.add(partMatch);
                }
            }
@@ -112,11 +138,20 @@ public class SearchableText {
    }


-    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts) {
+    private List<EntityPositionSequence> buildEntityPositionSequence(List<TextPositionSequence> crossSequenceParts,
+                                                                     String searchString) {

-        UUID id = UUID.randomUUID();
        List<EntityPositionSequence> result = new ArrayList<>();
+        String asString = buildString(crossSequenceParts);
+        if (!asString.equalsIgnoreCase(searchString)) {
+            return result;
+        }
+
+        String plainId = IdBuilder.buildId(crossSequenceParts);
+        String id = plainId;
+
        int currentPage = -1;
+        int idDiffentPageSuffix = 1;
        EntityPositionSequence entityPositionSequence = new EntityPositionSequence(id);
        for (TextPositionSequence textPositionSequence : crossSequenceParts) {
            if (currentPage == -1) {
@@ -126,9 +161,13 @@ public class SearchableText {
            } else if (currentPage == textPositionSequence.getPage()) {
                entityPositionSequence.getSequences().add(textPositionSequence);
            } else {
+                id = plainId + "-" + idDiffentPageSuffix;
+                idDiffentPageSuffix++;
                result.add(entityPositionSequence);
                entityPositionSequence = new EntityPositionSequence(id);
                entityPositionSequence.setPageNumber(textPositionSequence.getPage());
+                entityPositionSequence.getSequences().add(textPositionSequence);
+                currentPage = textPositionSequence.getPage();
            }
        }
        result.add(entityPositionSequence);
@@ -145,13 +184,19 @@ public class SearchableText {
    @Override
    public String toString() {

+        return buildString(sequences);
+    }
+
+
+    public String buildString(List<TextPositionSequence> sequences) {
+
        StringBuilder sb = new StringBuilder();

        TextPositionSequence previous = null;
        for (TextPositionSequence word : sequences) {

            if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                    sb.append('\n');
                } else {
                    sb.append(' ');
@@ -175,7 +220,7 @@ public class SearchableText {
        for (TextPositionSequence word : sequences) {

            if (previous != null) {
-                if (Math.abs(previous.getY1() - word.getY1()) > word.getTextHeight()) {
+                if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
                    sb.append('\n');
                } else {
                    sb.append(' ');
@@ -1,15 +1,22 @@
 package com.iqser.red.service.redaction.v1.server.redaction.model;

-import java.util.ArrayList;
+import static com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary.RECOMMENDATION_PREFIX;
+
+import java.util.Collection;
+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 org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

+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;
@@ -19,6 +26,13 @@ import lombok.extern.slf4j.Slf4j;
@Builder
 public class Section {

+    private boolean isLocal;
+
+    private Set<String> dictionaryTypes;
+
+    @Builder.Default
+    private Map<String, Set<String>> localDictionaryAdds = new HashMap<>();
+
    private Set<Entity> entities;

    // This still contains linebreaks etc.
@@ -31,28 +45,115 @@ public class Section {

    private int sectionNumber;

-    private Map<String, String> tabularData;
+    private Map<String, CellValue> tabularData;
+
+    private Dictionary dictionary;
+
+    private SearchableText searchableText;
+
+    @Builder.Default
+    private Set<Image> images = new HashSet<>();


-    public boolean contains(String type) {
+    public boolean rowEquals(String headerName, String value) {
+
+        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+
+        return tabularData != null && tabularData.containsKey(cleanHeaderName) && tabularData.get(cleanHeaderName)
+                .toString()
+                .equals(value);
+    }
+
+
+    public boolean hasTableHeader(String headerName) {
+
+        String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");
+        return tabularData != null && tabularData.containsKey(cleanHeaderName);
+    }
+
+
+    public boolean matchesType(String type) {

        return entities.stream().anyMatch(entity -> entity.getType().equals(type));
    }


+    public boolean matchesImageType(String type) {
+
+        return images.stream().anyMatch(image -> image.getType().equals(type));
+    }
+
+
    public boolean headlineContainsWord(String word) {

        return StringUtils.containsIgnoreCase(headline, word);
    }


-    public void redact(String type, int ruleNumber, String reason) {
+    public void expandByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group) {
+
+        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, type, false, entity.isRedaction(), entity.getMatchedRule(), entity
+                            .getRedactionReason(), entity.getLegalBasis()));
+
+                }
+            }
+        }
+
+        EntitySearchUtils.addEntitiesWithHigherRank(entities, expanded, dictionary);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+    }
+
+
+    public void redactImage(String type, int ruleNumber, String reason, String legalBasis) {
+
+        images.forEach(image -> {
+            if (image.getType().equals(type)) {
+                image.setRedaction(true);
+                image.setMatchedRule(ruleNumber);
+                image.setRedactionReason(reason);
+                image.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    public void redact(String type, int ruleNumber, String reason, String legalBasis) {
+
+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);

        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    public void redactNotImage(String type, int ruleNumber, String reason) {
+
+        images.forEach(image -> {
+            if (image.getType().equals(type)) {
+                image.setRedaction(false);
+                image.setMatchedRule(ruleNumber);
+                image.setRedactionReason(reason);
            }
        });
    }
@@ -60,8 +161,11 @@ public class Section {

    public void redactNot(String type, int ruleNumber, String reason) {

+        boolean hasRecommendationDictionary = dictionaryTypes.contains(RECOMMENDATION_PREFIX + type);
+
        entities.forEach(entity -> {
-            if (entity.getType().equals(type)) {
+            if (entity.getType().equals(type) || hasRecommendationDictionary && entity.getType()
+                    .equals(RECOMMENDATION_PREFIX + type)) {
                entity.setRedaction(false);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
@@ -70,115 +174,313 @@ public class Section {
    }


-    public void redactLineAfter(String start, String asType, int ruleNumber, String reason) {
+    public void expandToHintAnnotationByRegEx(String type, String pattern, boolean patternCaseInsensitive, int group,
+                                              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);
+
+        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);
+            }
+        }
+    }
+
+
+    public void redactIfPrecededBy(String prefix, String type, int ruleNumber, String reason, String legalBasis) {
+
+        entities.forEach(entity -> {
+            if (entity.getType().equals(type) && searchText.indexOf(prefix + entity.getWord()) != 1) {
+                entity.setRedaction(true);
+                entity.setMatchedRule(ruleNumber);
+                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
+            }
+        });
+    }
+
+
+    public void addHintAnnotation(String value, String asType) {
+
+        Set<Entity> found = findEntities(value.trim(), asType, true, false, 0, null, null);
+        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
+    }
+
+
+    public void addRedaction(String value, String asType, int ruleNumber, String reason, String legalBasis) {
+
+        Set<Entity> found = findEntities(value.trim(), asType, true, true, ruleNumber, reason, legalBasis);
+        EntitySearchUtils.addEntitiesIgnoreRank(entities, found);
+    }
+
+
+    public void redactLineAfter(String start, String asType, int ruleNumber, boolean redactEverywhere, String reason,
+                                String legalBasis) {

        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);
-                    entities.addAll(found);
+                    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());
+                    }
                }
            }
        }
-
-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
-                entity.setRedaction(true);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(reason);
-            }
-        });
-
    }


-    public void redactBetween(String start, String stop, String asType, int ruleNumber, String reason) {
+    public void recommendLineAfter(String start, String asType) {
+
+        String[] values = StringUtils.substringsBetween(text, start, "\n");
+
+        if (values != null) {
+            for (String value : values) {
+
+                String trimmedValue = value.trim();
+                String cleanValue;
+                if (trimmedValue.startsWith(":")) {
+                    cleanValue = trimmedValue.substring(1).trim();
+                } else {
+                    cleanValue = trimmedValue;
+                }
+
+                if (StringUtils.isNotBlank(cleanValue) && cleanValue.length() >= 3) {
+                    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);
-                    entities.addAll(found);
+
+                    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());
+                    }
                }
            }
        }
+    }

-        // TODO No need to iterate
-        entities.forEach(entity -> {
-            if (entity.getType().equals(asType)) {
+
+    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) {
+
+        annotateCell(cellHeader, ruleNumber, type, false, false, null, null);
+    }
+
+
+    public void redactCell(String cellHeader, int ruleNumber, String type, boolean addAsRecommendations, String reason,
+                           String legalBasis) {
+
+        annotateCell(cellHeader, ruleNumber, type, true, addAsRecommendations, reason, legalBasis);
+    }
+
+
+    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) {
+
+        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);
+
+        found.forEach(entity -> {
+            if (redacted) {
                entity.setRedaction(true);
                entity.setMatchedRule(ruleNumber);
                entity.setRedactionReason(reason);
+                entity.setLegalBasis(legalBasis);
            }
        });
+
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
    }


-    private Set<Entity> findEntities(String value, String asType) {
+    private void annotateCell(String cellHeader, int ruleNumber, String type, boolean redact,
+                              boolean addAsRecommendations, String reason, String legalBasis) {

-        Set<Entity> found = new HashSet<>();
+        String cleanHeaderName = cellHeader.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

-        int startIndex;
-        int stopIndex = 0;
-        do {
-            startIndex = searchText.indexOf(value, stopIndex);
-            stopIndex = startIndex + value.length();
-
-            if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(searchText.charAt(startIndex - 1)) || isSeparator(searchText
-                    .charAt(startIndex - 1))) && (stopIndex == searchText.length() || isSeparator(searchText.charAt(stopIndex)))) {
-                found.add(new Entity(searchText.substring(startIndex, stopIndex), asType, startIndex, stopIndex, headline, sectionNumber));
-            }
-        } while (startIndex > -1);
-
-        return removeEntitiesContainedInLarger(found);
-    }
-
-
-    private boolean isSeparator(char c) {
-
-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
-    }
-
-
-    public Set<Entity> removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        for (Entity word : entities) {
-            for (Entity inner : entities) {
-                if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
-                    wordsToRemove.add(inner);
-                }
-            }
-        }
-        entities.removeAll(wordsToRemove);
-        return entities;
-    }
-
-
-    public void highlightCell(String cellHeader, int ruleNumber) {
-
-        String value = tabularData.get(cellHeader);
+        CellValue value = tabularData.get(cleanHeaderName);
        if (value == null) {
            log.warn("Could not find any data for {}.", cellHeader);
        } else {
-            Set<Entity> found = findEntities(value, "must_redact");
-            if (CollectionUtils.isEmpty(found)) {
-                log.warn("Could not identify value {} in row.", value);
-            } else {
-                Entity entity = found.iterator().next();
-                entity.setRedaction(false);
-                entity.setMatchedRule(ruleNumber);
-                entity.setRedactionReason(cellHeader);
-                entities.add(entity);
+            String word = value.toString();
+
+            Entity entity = new Entity(word, type, value.getRowSpanStart(), value.getRowSpanStart() + word.length(), headline, sectionNumber, false);
+            entity.setRedaction(redact);
+            entity.setMatchedRule(ruleNumber);
+            entity.setRedactionReason(reason);
+            entity.setTargetSequences(value.getTextBlocks()
+                    .stream()
+                    .map(TextBlock::getSequences)
+                    .flatMap(Collection::stream)
+                    .collect(Collectors.toList())); // Make sure no other cells with same content are highlighted
+            entity.setLegalBasis(legalBasis);
+
+            Set<Entity> singleEntitySet = new HashSet<>();
+            singleEntitySet.add(entity);
+            EntitySearchUtils.clearAndFindPositions(singleEntitySet, searchableText, dictionary);
+
+            EntitySearchUtils.addEntitiesWithHigherRank(entities, entity, dictionary);
+
+            EntitySearchUtils.removeEntitiesContainedInLarger(entities);
+
+            if (addAsRecommendations && !isLocal()) {
+                String cleanedWord = word.replaceAll(",", " ").replaceAll("  ", " ").trim() + " ";
+                Pattern pattern = Patterns.AUTHOR_TABLE_SPITTER;
+                Matcher matcher = pattern.matcher(cleanedWord);
+
+                while (matcher.find()) {
+                    String match = matcher.group().trim();
+                    if (match.length() >= 3) {
+                        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);
+                    }
+                }
            }
        }
-
    }

-}
+}
+
+
+
+
+
+
@@ -0,0 +1,13 @@
+package com.iqser.red.service.redaction.v1.server.redaction.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class SectionSearchableTextPair {
+
+    private Section section;
+    private SearchableText searchableText;
+
+}
@@ -0,0 +1,268 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.awt.Color;
+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.stream.Collectors;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
+import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationText;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Comment;
+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.SectionGrid;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AnnotationService {
+
+    private final DictionaryService dictionaryService;
+
+
+    public void annotate(PDDocument document, RedactionLog redactionLog, SectionGrid sectionGrid) throws IOException {
+
+        Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = convertRedactionLog(redactionLog);
+
+        for (int page = 1; page <= document.getNumberOfPages(); page++) {
+
+            PDPage pdPage = document.getPage(page - 1);
+
+            List<SectionRectangle> sectionRectangles = sectionGrid.getRectanglesPerPage().get(page);
+            if (sectionRectangles != null && !sectionRectangles.isEmpty()) {
+                drawSectionGrid(document, pdPage, sectionRectangles);
+            }
+
+            List<RedactionLogEntry> logEntries = redactionLogPerPage.get(page);
+            if (logEntries != null && !logEntries.isEmpty()) {
+                addAnnotations(logEntries, pdPage, page);
+            }
+        }
+    }
+
+
+    private void addAnnotations(List<RedactionLogEntry> logEntries, PDPage pdPage, int page) throws IOException {
+
+        List<PDAnnotation> annotations = pdPage.getAnnotations();
+
+        for (RedactionLogEntry entry : logEntries) {
+            annotations.addAll(createAnnotation(entry, page, pdPage.getMediaBox(), pdPage.getCropBox()));
+        }
+    }
+
+
+    private List<PDAnnotation> createAnnotation(RedactionLogEntry redactionLogEntry, int page, PDRectangle mediaBox,
+                                                PDRectangle cropBox) {
+
+        List<PDAnnotation> annotations = new ArrayList<>();
+
+        List<Rectangle> rectangles = redactionLogEntry.getPositions()
+                .stream()
+                .filter(pos -> pos.getPage() == page)
+                .collect(Collectors.toList());
+
+        if (rectangles.isEmpty()) {
+            return annotations;
+        }
+
+        PDAnnotationTextMarkup annotation = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
+        annotation.constructAppearances();
+        PDRectangle pdRectangle = toPDRectangle(rectangles, mediaBox, cropBox);
+        annotation.setRectangle(pdRectangle);
+        annotation.setQuadPoints(toQuadPoints(rectangles, mediaBox, cropBox));
+        if (!redactionLogEntry.isHint()) {
+            annotation.setContents(createAnnotationContent(redactionLogEntry));
+        }
+        annotation.setTitlePopup(redactionLogEntry.getId());
+        annotation.setAnnotationName(redactionLogEntry.getId());
+        annotation.setColor(new PDColor(redactionLogEntry.getColor(), PDDeviceRGB.INSTANCE));
+        annotations.add(annotation);
+
+        if (redactionLogEntry.getComments() != null) {
+            for (Comment comment : redactionLogEntry.getComments()) {
+                PDAnnotationText txtAnnot = new PDAnnotationText();
+                txtAnnot.setAnnotationName(comment.getId());
+                txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
+                txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
+                txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));
+                txtAnnot.setTitlePopup(comment.getUser());
+                txtAnnot.setContents(comment.getText());
+                txtAnnot.setRectangle(pdRectangle);
+                annotations.add(txtAnnot);
+            }
+        }
+
+        return annotations;
+    }
+
+
+    private String createAnnotationContent(RedactionLogEntry redactionLogEntry) {
+
+        if (redactionLogEntry.isManual()) {
+            return "\nManual Redaction\n\nIn Section : \"" + redactionLogEntry.getSection() + "\"";
+        }
+        return "\nRule " + redactionLogEntry.getMatchedRule() + " matched\n\n" + redactionLogEntry.getReason() + "\n\nLegal basis:" + redactionLogEntry
+                .getLegalBasis() + "\n\nIn section: \"" + redactionLogEntry.getSection() + "\"";
+    }
+
+
+    private PDRectangle toPDRectangle(List<Rectangle> rectangles, PDRectangle mediaBox, PDRectangle cropBox) {
+
+        float lowerLeftX = Float.MAX_VALUE;
+        float upperRightX = 0;
+        float lowerLeftY = 0;
+        float upperRightY = Float.MAX_VALUE;
+
+        for (Rectangle rectangle : rectangles) {
+            if (rectangle.getTopLeft().getX() < lowerLeftX) {
+                lowerLeftX = rectangle.getTopLeft().getX();
+            }
+            if (rectangle.getTopLeft().getX() + rectangle.getWidth() > upperRightX) {
+                upperRightX = rectangle.getTopLeft().getX() + rectangle.getWidth();
+            }
+            if (rectangle.getTopLeft().getY() + rectangle.getHeight() > lowerLeftY) {
+                lowerLeftY = rectangle.getTopLeft().getY() + rectangle.getHeight();
+            }
+            if (rectangle.getTopLeft().getY() < upperRightY) {
+                upperRightY = rectangle.getTopLeft().getY();
+            }
+        }
+
+        var x1 = lowerLeftX + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y1 = lowerLeftY + (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+        var x2 = upperRightX + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y2 = upperRightY - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+
+        PDRectangle annotationPosition = new PDRectangle();
+        annotationPosition.setLowerLeftX(x1);
+        annotationPosition.setLowerLeftY(y1);
+        annotationPosition.setUpperRightX(x2);
+        annotationPosition.setUpperRightY(y2);
+        return annotationPosition;
+    }
+
+
+    private float[] toQuadPoints(List<Rectangle> rectangles, PDRectangle mediaBox, PDRectangle cropBox) {
+
+        float[] quadPoints = new float[rectangles.size() * 8];
+        int i = 0;
+
+        for (Rectangle rectangle : rectangles) {
+            float[] quadPoint = toQuadPoint(rectangle, mediaBox, cropBox);
+            for (int j = 0; j <= 7; j++) {
+                quadPoints[i + j] = quadPoint[j];
+            }
+            i += 8;
+        }
+        return quadPoints;
+    }
+
+
+    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 x2 = rectangle.getTopLeft()
+                .getX() + rectangle.getWidth() + cropBox.getLowerLeftX() - mediaBox.getLowerLeftY();
+        var y2 = rectangle.getTopLeft()
+                .getY() + rectangle.getHeight() - (mediaBox.getLowerLeftY() - cropBox.getLowerLeftY());
+
+        // 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
+        return new float[]{x1, y1, x2, y2, x1, y2 - rectangle.getHeight(), x2, y1 - rectangle.getHeight()};
+    }
+
+
+    private void drawSectionGrid(PDDocument document, PDPage pdPage,
+                                 List<SectionRectangle> sectionRectangles) throws IOException {
+
+        PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
+        for (SectionRectangle sectionRectangle : sectionRectangles) {
+            drawSectionRectangle(contentStream, sectionRectangle);
+            drawSectionPartNumberText(contentStream, sectionRectangle);
+            drawTableCells(contentStream, sectionRectangle);
+        }
+        contentStream.close();
+    }
+
+
+    private void drawSectionRectangle(PDPageContentStream contentStream,
+                                      SectionRectangle sectionRectangle) throws IOException {
+
+        contentStream.setStrokingColor(Color.LIGHT_GRAY);
+        contentStream.setLineWidth(0.5f);
+        contentStream.addRect(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft()
+                .getY(), sectionRectangle.getWidth(), sectionRectangle.getHeight());
+        contentStream.stroke();
+    }
+
+
+    private void drawSectionPartNumberText(PDPageContentStream contentStream,
+                                           SectionRectangle sectionRectangle) throws IOException {
+
+        contentStream.beginText();
+        contentStream.setNonStrokingColor(Color.DARK_GRAY);
+        contentStream.setFont(PDType1Font.TIMES_ROMAN, 8f);
+        if (sectionRectangle.getTableCells() == null) {
+            contentStream.newLineAtOffset(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft()
+                    .getY() + sectionRectangle.getHeight());
+        } else {
+            contentStream.newLineAtOffset(sectionRectangle.getTopLeft().getX(), sectionRectangle.getTopLeft().getY());
+        }
+        contentStream.showText(sectionRectangle.getPart() + "/" + sectionRectangle.getNumberOfParts());
+        contentStream.endText();
+    }
+
+
+    private void drawTableCells(PDPageContentStream contentStream,
+                                SectionRectangle sectionRectangle) throws IOException {
+
+        if (sectionRectangle.getTableCells() != null) {
+            for (CellRectangle cell : sectionRectangle.getTableCells()) {
+                contentStream.setLineWidth(0.5f);
+                contentStream.setStrokingColor(Color.CYAN);
+                contentStream.addRect(cell.getTopLeft().getX(), cell.getTopLeft()
+                        .getY(), cell.getWidth(), cell.getHeight());
+                contentStream.stroke();
+            }
+        }
+    }
+
+
+    private Map<Integer, List<RedactionLogEntry>> convertRedactionLog(RedactionLog redactionLog) {
+
+        Map<Integer, List<RedactionLogEntry>> redactionLogPerPage = new HashMap<>();
+        if (redactionLog == null) {
+            return redactionLogPerPage;
+        }
+        for (RedactionLogEntry entry : redactionLog.getRedactionLogEntry()) {
+            int page = 0;
+            for (Rectangle position : entry.getPositions()) {
+                if (position.getPage() != page) {
+                    redactionLogPerPage.computeIfAbsent(position.getPage(), x -> new ArrayList<>()).add(entry);
+                    page = position.getPage();
+                }
+            }
+        }
+        return redactionLogPerPage;
+    }
+
+}
@@ -1,80 +1,105 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

+import java.awt.Color;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;

 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.springframework.stereotype.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.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.DictionaryIncrement;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryModel;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryRepresentation;

 import feign.FeignException;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+@Slf4j
@Service
@RequiredArgsConstructor
-@Slf4j
 public class DictionaryService {

    private final DictionaryClient dictionaryClient;

-    private long dictionaryVersion = -1;
-
-    @Getter
-    private Map<String, Set<String>> dictionary = new HashMap<>();
-
-    @Getter
-    private Map<String, float[]> entryColors = new HashMap<>();
-
-    @Getter
-    private List<String> hintTypes = new ArrayList<>();
-
-    @Getter
-    private List<String> caseInsensitiveTypes = new ArrayList<>();
-
-    @Getter
-    private float[] defaultColor;
+    private Map<String, DictionaryRepresentation> dictionariesByRuleSets = new HashMap<>();


-    public void updateDictionary() {
+    public long updateDictionary(String ruleSetId) {

-        long version = dictionaryClient.getVersion();
-        if (version > dictionaryVersion) {
-            dictionaryVersion = version;
-            updateDictionaryEntry();
+        long version = dictionaryClient.getVersion(ruleSetId);
+
+        var foundDictionary = dictionariesByRuleSets.get(ruleSetId);
+
+        if (foundDictionary == null || version > foundDictionary.getDictionaryVersion()) {
+            updateDictionaryEntry(ruleSetId, version);
        }
+
+        return version;
    }


-    private void updateDictionaryEntry() {
+    public DictionaryIncrement getDictionaryIncrements(String ruleSetId, long fromVersion) {
+
+        long version = updateDictionary(ruleSetId);
+
+        Set<DictionaryIncrementValue> newValues = new HashSet<>();
+        List<DictionaryModel> dictionaryModels = dictionariesByRuleSets.get(ruleSetId).getDictionary();
+        dictionaryModels.forEach(dictionaryModel -> {
+            dictionaryModel.getEntries().forEach(dictionaryEntry -> {
+                if (dictionaryEntry.getVersion() > fromVersion) {
+                    newValues.add(new DictionaryIncrementValue(dictionaryEntry.getValue(), dictionaryModel.isCaseInsensitive()));
+                }
+            });
+        });
+
+        return new DictionaryIncrement(newValues, version);
+    }
+
+
+    private void updateDictionaryEntry(String ruleSetId, long version) {

        try {
-            TypeResponse typeResponse = dictionaryClient.getAllTypes();
+            DictionaryRepresentation dictionaryRepresentation = new DictionaryRepresentation();
+
+            TypeResponse typeResponse = dictionaryClient.getAllTypes(ruleSetId);
            if (typeResponse != null && CollectionUtils.isNotEmpty(typeResponse.getTypes())) {
-                entryColors = typeResponse.getTypes()
+
+                List<DictionaryModel> dictionary = typeResponse.getTypes()
                        .stream()
-                        .collect(Collectors.toMap(TypeResult::getType, TypeResult::getColor));
-                hintTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isHint)
-                        .map(TypeResult::getType)
+                        .map(t -> new DictionaryModel(t.getType(), t.getRank(), convertColor(t.getHexColor()), t.isCaseInsensitive(), t
+                                .isHint(), t.isRecommendation(), convertEntries(t), new HashSet<>()))
+                        .sorted(Comparator.comparingInt(DictionaryModel::getRank).reversed())
                        .collect(Collectors.toList());
-                caseInsensitiveTypes = typeResponse.getTypes()
-                        .stream()
-                        .filter(TypeResult::isCaseInsensitive)
-                        .map(TypeResult::getType)
-                        .collect(Collectors.toList());
-                dictionary = entryColors.keySet().stream().collect(Collectors.toMap(type -> type, this::convertEntries));
-                defaultColor = dictionaryClient.getDefaultColor().getColor();
+
+                dictionary.forEach(dm -> dictionaryRepresentation.getLocalAccessMap().put(dm.getType(), dm));
+
+                Colors colors = dictionaryClient.getColors(ruleSetId);
+
+                dictionaryRepresentation.setDefaultColor(convertColor(colors.getDefaultColor()));
+                dictionaryRepresentation.setRequestAddColor(convertColor(colors.getRequestAdd()));
+                dictionaryRepresentation.setRequestRemoveColor(convertColor(colors.getRequestRemove()));
+                dictionaryRepresentation.setNotRedactedColor(convertColor(colors.getNotRedacted()));
+                dictionaryRepresentation.setRuleSetId(ruleSetId);
+                dictionaryRepresentation.setDictionaryVersion(version);
+                dictionaryRepresentation.setDictionary(dictionary);
+
+                dictionariesByRuleSets.put(ruleSetId, dictionaryRepresentation);
            }
        } catch (FeignException e) {
            log.warn("Got some unknown feignException", e);
@@ -83,15 +108,108 @@ public class DictionaryService {
    }


-    private Set<String> convertEntries(String s) {
-        if (caseInsensitiveTypes.contains(s)) {
-            return dictionaryClient.getDictionaryForType(s)
-                    .getEntries()
-                    .stream()
-                    .map(String::toLowerCase)
-                    .collect(Collectors.toSet());
+    public void updateExternalDictionary(Dictionary dictionary, String ruleSetId) {
+
+        dictionary.getDictionaryModels().forEach(dm -> {
+            if (dm.isRecommendation() && !dm.getLocalEntries().isEmpty()) {
+                dictionaryClient.addEntries(dm.getType(), ruleSetId, new ArrayList<>(dm.getLocalEntries()), false);
+                long externalVersion = dictionaryClient.getVersion(ruleSetId);
+                if (externalVersion == dictionary.getVersion() + 1) {
+                    dictionary.setVersion(externalVersion);
+                }
+            }
+        });
+    }
+
+
+    private Set<DictionaryEntry> convertEntries(TypeResult t) {
+
+        Set<DictionaryEntry> entries = new HashSet<>(dictionaryClient.getDictionaryForType(t.getType(), t.getRuleSetId())
+                .getEntries());
+
+        if (t.isCaseInsensitive()) {
+            entries.forEach(entry -> entry.setValue(entry.getValue().toLowerCase(Locale.ROOT)));
        }
-        return new HashSet<>(dictionaryClient.getDictionaryForType(s).getEntries());
+        return entries;
+    }
+
+
+    private float[] convertColor(String hex) {
+
+        Color color = Color.decode(hex);
+        return new float[]{color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f};
+    }
+
+
+    public boolean isCaseInsensitiveDictionary(String type, String ruleSetId) {
+
+        DictionaryModel dictionaryModel = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (dictionaryModel != null) {
+            return dictionaryModel.isCaseInsensitive();
+        }
+        return false;
+    }
+
+
+    public float[] getColor(String type, String ruleSetId) {
+
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (model != null) {
+            return model.getColor();
+        }
+        return dictionariesByRuleSets.get(ruleSetId).getDefaultColor();
+    }
+
+
+    public boolean isHint(String type, String ruleSetId) {
+
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (model != null) {
+            return model.isHint();
+        }
+        return false;
+    }
+
+
+    public boolean isRecommendation(String type, String ruleSetId) {
+
+        DictionaryModel model = dictionariesByRuleSets.get(ruleSetId).getLocalAccessMap().get(type);
+        if (model != null) {
+            return model.isRecommendation();
+        }
+        return false;
+    }
+
+
+    public Dictionary getDeepCopyDictionary(String ruleSetId) {
+
+        List<DictionaryModel> copy = new ArrayList<>();
+
+        var representation = dictionariesByRuleSets.get(ruleSetId);
+        var dictionary = dictionariesByRuleSets.get(ruleSetId).getDictionary();
+        dictionary.forEach(dm -> {
+            copy.add(SerializationUtils.clone(dm));
+        });
+
+        return new Dictionary(copy, representation.getDictionaryVersion());
+    }
+
+
+    public float[] getRequestRemoveColor(String ruleSetId) {
+
+        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
+    }
+
+
+    public float[] getNotRedactedColor(String ruleSetId) {
+
+        return dictionariesByRuleSets.get(ruleSetId).getNotRedactedColor();
+    }
+
+
+    public float[] getRequestAddColor(String ruleSetId) {
+
+        return dictionariesByRuleSets.get(ruleSetId).getRequestAddColor();
    }

 }
@@ -3,6 +3,8 @@ package com.iqser.red.service.redaction.v1.server.redaction.service;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;

 import org.apache.commons.lang3.StringUtils;
 import org.kie.api.KieServices;
@@ -11,9 +13,9 @@ import org.kie.api.builder.KieFileSystem;
 import org.kie.api.builder.KieModule;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.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;
@@ -26,12 +28,23 @@ public class DroolsExecutionService {

    private final RulesClient rulesClient;

-    @Autowired
-    private KieContainer kieContainer;
+    private Map<String, KieContainer> kieContainers = new HashMap<>();

-    private long rulesVersion = -1;
+    private Map<String, Long> rulesVersionPerRuleSetId = new HashMap<>();

-    public Section executeRules(Section section) {
+
+    public KieContainer getKieContainer(String ruleSetId) {
+
+        KieContainer container = kieContainers.get(ruleSetId);
+        if (container == null) {
+            return createOrUpdateKieContainer(ruleSetId);
+        } else {
+            return container;
+        }
+    }
+
+
+    public Section executeRules(KieContainer kieContainer, Section section) {

        KieSession kieSession = kieContainer.newKieSession();
        kieSession.setGlobal("section", section);
@@ -43,34 +56,81 @@ public class DroolsExecutionService {

    }

-    public void updateRules() {

-        long version = rulesClient.getVersion();
-        if (version > rulesVersion) {
-            rulesVersion = version;
-            updateRules(rulesClient.getRules().getRules());
+    public KieContainer updateRules(String ruleSetId) {
+
+        long version = rulesClient.getVersion(ruleSetId);
+        Long rulesVersion = rulesVersionPerRuleSetId.get(ruleSetId);
+        if (rulesVersion == null) {
+            rulesVersion = -1L;
        }

+        if (version > rulesVersion.longValue()) {
+            rulesVersionPerRuleSetId.put(ruleSetId, version);
+            return createOrUpdateKieContainer(ruleSetId);
+        }
+        return getKieContainer(ruleSetId);
+
    }

-    public void updateRules(String drlAsString) {
+
+    private KieContainer createOrUpdateKieContainer(String ruleSetId) {

        try {
-            if (StringUtils.isEmpty(drlAsString)) {
+
+            RulesResponse rules = rulesClient.getRules(ruleSetId);
+            if (rules == null || StringUtils.isEmpty(rules.getRules())) {
                throw new RuntimeException("Rules cannot be empty.");
            }
+
            KieServices kieServices = KieServices.Factory.get();
-            InputStream input = new ByteArrayInputStream(drlAsString.getBytes(StandardCharsets.UTF_8));
-            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
-            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
-            kieBuilder.buildAll();
-            KieModule kieModule = kieBuilder.getKieModule();
-            kieContainer.updateToVersion(kieModule.getReleaseId());
+            KieModule kieModule = getKieModule(ruleSetId, rules.getRules(), kieServices);
+
+            var container = kieContainers.get(ruleSetId);
+            if (container != null) {
+                container.updateToVersion(kieModule.getReleaseId());
+                return container;
+            }
+
+            container = kieServices.newKieContainer(kieModule.getReleaseId());
+            kieContainers.put(ruleSetId, container);
+            return container;
        } catch (Exception e) {
            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
        }

    }

+
+    private KieModule getKieModule(String ruleSetId, String rules, KieServices kieServices) {
+
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        InputStream input = new ByteArrayInputStream(rules.getBytes(StandardCharsets.UTF_8));
+        kieFileSystem.write("src/main/resources/drools/rules" + ruleSetId + ".drl", kieServices.getResources()
+                .newInputStreamResource(input));
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+        kieBuilder.buildAll();
+        return kieBuilder.getKieModule();
+    }
+
+
+    public void testRules(String rules) {
+
+        KieServices kieServices = KieServices.Factory.get();
+        KieModule kieModule = getKieModule("test-rules", rules, kieServices);
+        var container = kieServices.newKieContainer(kieModule.getReleaseId());
+        container.newKieSession();
+        container.dispose();
+    }
+
+
+    public long getRulesVersion(String ruleSetId) {
+
+        Long rulesVersion = rulesVersionPerRuleSetId.get(ruleSetId);
+        if (rulesVersion == null) {
+            return -1;
+        }
+        return rulesVersion.longValue();
+    }
+
 }
@@ -4,21 +4,42 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Pattern;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.kie.api.runtime.KieContainer;
 import org.springframework.stereotype.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.model.SectionText;
 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
+import com.iqser.red.service.redaction.v1.server.classification.model.Header;
 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.classification.model.UnclassifiedText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
+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.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.ImageType;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 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.tableextraction.model.Cell;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;

@@ -32,65 +53,32 @@ public class EntityRedactionService {

    private final DictionaryService dictionaryService;
    private final DroolsExecutionService droolsExecutionService;
+    private final SurroundingWordsService surroundingWordsService;


-    public void processDocument(Document classifiedDoc) {
+    public void processDocument(Document classifiedDoc, String ruleSetId, ManualRedactions manualRedactions) {

-        dictionaryService.updateDictionary();
-        droolsExecutionService.updateRules();
+        dictionaryService.updateDictionary(ruleSetId);
+        KieContainer container = droolsExecutionService.updateRules(ruleSetId);
+        long rulesVersion = droolsExecutionService.getRulesVersion(ruleSetId);

-        Set<Entity> documentEntities = new HashSet<>();
-        int sectionNumber = 1;
-        for (Paragraph paragraph : classifiedDoc.getParagraphs()) {
+        Dictionary dictionary = dictionaryService.getDeepCopyDictionary(ruleSetId);

-            SearchableText searchableText = paragraph.getSearchableText();
+        Set<Entity> documentEntities = new HashSet<>(findEntities(classifiedDoc, container, manualRedactions, dictionary, false, null));

-            List<Table> tables = paragraph.getTables();
+        if (dictionary.hasLocalEntries()) {

-            for (Table table : tables) {
-                List<String> metadata = table.getHeaders();
-                for (List<Cell> row : table.getRows()) {
-                    SearchableText searchableRow = new SearchableText();
-                    List<String> cellValues = new ArrayList<>();
-                    for (Cell cell : row) {
-                        if (cell == null || CollectionUtils.isEmpty(cell.getTextBlocks())) {
-                            cellValues.add(null);
-                            continue;
-                        }
-                        cellValues.add(cell.getTextBlocks().get(0).getText());
-                        for (TextBlock textBlock : cell.getTextBlocks()) {
-                            searchableRow.addAll(textBlock.getSequences());
-                        }
-                    }
-                    Set<Entity> rowEntities = findEntities(searchableRow, table.getHeadline(), sectionNumber);
-
-                    Map<String, String> tabularData = toMap(metadata, cellValues);
-                    Section analysedRowSection = droolsExecutionService.executeRules(Section.builder()
-                            .entities(rowEntities)
-                            .text(searchableRow.getAsStringWithLinebreaks())
-                            .searchText(searchableRow.toString())
-                            .headline(table.getHeadline())
-                            .sectionNumber(sectionNumber)
-                            .tabularData(tabularData)
-                            .build());
-
-                    documentEntities.addAll(clearAndFindPositions(analysedRowSection.getEntities(), searchableRow));
-                    sectionNumber++;
+            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);
                }
-                sectionNumber++;
-            }
+            });

-            Set<Entity> entities = findEntities(searchableText, paragraph.getHeadline(), sectionNumber);
-            Section analysedSection = droolsExecutionService.executeRules(Section.builder()
-                    .entities(entities)
-                    .text(searchableText.getAsStringWithLinebreaks())
-                    .searchText(searchableText.toString())
-                    .headline(paragraph.getHeadline())
-                    .sectionNumber(sectionNumber)
-                    .build());
-
-            documentEntities.addAll(clearAndFindPositions(analysedSection.getEntities(), searchableText));
-            sectionNumber++;
+            Set<Entity> foundByLocal = findEntities(classifiedDoc, container, manualRedactions, dictionary, true, hintsPerSectionNumber);
+            EntitySearchUtils.addEntitiesWithHigherRank(documentEntities, foundByLocal, dictionary);
+            EntitySearchUtils.removeEntitiesContainedInLarger(documentEntities);
        }

        for (Entity entity : documentEntities) {
@@ -103,114 +91,342 @@ public class EntityRedactionService {
            for (Map.Entry<Integer, List<EntityPositionSequence>> entry : sequenceOnPage.entrySet()) {
                classifiedDoc.getEntities()
                        .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()));
+                        .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()));
            }
        }

+        dictionaryService.updateExternalDictionary(dictionary, ruleSetId);
+
+        classifiedDoc.setDictionaryVersion(dictionary.getVersion());
+        classifiedDoc.setRulesVersion(rulesVersion);
    }


-    private Map<String, String> toMap(List<String> keys, List<String> values) {
+    private Set<Entity> findEntities(Document classifiedDoc, KieContainer kieContainer,
+                                     ManualRedactions manualRedactions, Dictionary dictionary, boolean local,
+                                     Map<Integer, Set<Entity>> hintsPerSectionNumber) {

-        if (keys.size() != values.size()) {
-            log.warn("Cannot merge lists of unequal size, returning empty map.");
-            return new HashMap<>();
-        }
-        Map<String, String> result = new HashMap<>();
-        for (int i = 0; i < keys.size(); i++) {
-            String value = values.get(i);
-            if (value == null) {
-                continue;
+        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();
            }
-            result.put(keys.get(i), value);
+            sectionSearchableTextPairs.add(processText(classifiedDoc, paragraph.getSearchableText(), paragraph.getTextBlocks(), paragraph
+                    .getHeadline(), manualRedactions, sectionNumber, dictionary, local, hintsPerSectionNumber, paragraph
+                    .getImages()));
+            sectionNumber.incrementAndGet();
        }

-        return result;
+        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;
    }


-    private Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text) {
+    private List<SectionSearchableTextPair> processTablePerRow(Document classifiedDoc, Table table,
+                                                               ManualRedactions manualRedactions,
+                                                               AtomicInteger sectionNumber, Dictionary dictionary,
+                                                               boolean local,
+                                                               Map<Integer, Set<Entity>> hintsPerSectionNumber) {

-        removeEntitiesContainedInLarger(entities);
+        List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();

-        for (Entity entity : entities) {
-            if (dictionaryService.getCaseInsensitiveTypes().contains(entity.getType())) {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), true));
-            } else {
-                entity.setPositionSequences(text.getSequences(entity.getWord(), false));
+        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);
+
+                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;
+
+            }
+            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);
+                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.getSectionAreas().add(sectionArea);
+                }
+
+                for (TextBlock textBlock : cell.getTextBlocks()) {
+                    entireTableText.addAll(textBlock.getSequences());
+                }
+                addSectionToManualRedactions(cell.getTextBlocks(), manualRedactions, table.getHeadline(), sectionNumber.intValue());
            }
        }

-        return entities;
+        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 Set<Entity> findEntities(SearchableText searchableText, String headline, int sectionNumber) {
+    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);
+            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) {

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

-        String inputString = searchableText.toString();
-        String lowercaseInputString = inputString.toLowerCase();
-        for (Map.Entry<String, Set<String>> entry : dictionaryService.getDictionary().entrySet()) {
-            if (dictionaryService.getCaseInsensitiveTypes().contains(entry.getKey())) {
-                found.addAll(find(lowercaseInputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+        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));
            } else {
-                found.addAll(find(inputString, entry.getValue(), entry.getKey(), headline, sectionNumber));
+                found.addAll(EntitySearchUtils.find(searchableString, model.getValues(local), model.getType(), headline, sectionNumber, local));
            }
        }

-        removeEntitiesContainedInLarger(found);
-
-        return found;
-
+        return EntitySearchUtils.clearAndFindPositions(found, searchableText, dictionary);
    }


-    private Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber) {
+    private void addSectionToManualRedactions(List<TextBlock> textBlocks, ManualRedactions manualRedactions,
+                                              String section, int sectionNumber) {

-        Set<Entity> found = new HashSet<>();
-        for (String value : values) {
-            int startIndex;
-            int stopIndex = 0;
-            do {
-                startIndex = inputString.indexOf(value, stopIndex);
-                stopIndex = startIndex + value.length();
-
-                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
-                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
-                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex,
-                            headline, sectionNumber));
-                }
-            } while (startIndex > -1);
+        if (manualRedactions == null || manualRedactions.getEntriesToAdd().isEmpty()) {
+            return;
        }
-        return found;
-    }

-
-    private boolean isSeparator(char c) {
-
-        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
-    }
-
-
-    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
-
-        List<Entity> wordsToRemove = new ArrayList<>();
-        for (Entity word : entities) {
-            for (Entity inner : entities) {
-                if (inner.getWord().length() < word.getWord()
-                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner) {
-                    wordsToRemove.add(inner);
+        for (TextBlock textBlock : textBlocks) {
+            for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
+                for (Rectangle rectangle : manualRedactionEntry.getPositions()) {
+                    if (textBlock.contains(rectangle)) {
+                        manualRedactionEntry.setSection(section);
+                        manualRedactionEntry.setSectionNumber(sectionNumber);
+                    }
                }
            }
        }
-        entities.removeAll(wordsToRemove);
+    }
+
+
+    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();
    }

 }
@@ -0,0 +1,62 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+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.settings.RedactionServiceSettings;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageClassificationService {
+
+    private final ImageClassificationClient imageClassificationClient;
+    private final RedactionServiceSettings settings;
+
+
+    public void classifyImages(Document classifiedDoc) {
+
+        long start = System.currentTimeMillis();
+        classifiedDoc.getPages().forEach(page -> {
+            page.getImages().forEach(image -> {
+
+                if (settings.isEnableImageClassification()) {
+                    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                        ImageIO.write(image.getImage(), "png", baos);
+                        ImageClassificationResponse response = imageClassificationClient.classify(new MockMultipartFile("file", "Image.png", "image/png", baos
+                                .toByteArray()));
+                        image.setImageType(ImageType.valueOf(response.getCategory()));
+
+                    } catch (IOException e) {
+                        log.error("Could not classify image", e);
+                    }
+                } else {
+                    image.setImageType(ImageType.OTHER);
+                }
+
+                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);
+                        }
+                    });
+                }
+            });
+        });
+        log.info("Image classification took: " + (System.currentTimeMillis() - start));
+    }
+
+}
@@ -0,0 +1,320 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+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.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.iqser.red.service.redaction.v1.model.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
+import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
+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.ReanalyzeResult;
+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.model.RenalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.SectionArea;
+import com.iqser.red.service.redaction.v1.model.SectionText;
+import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.exception.RedactionException;
+import com.iqser.red.service.redaction.v1.server.parsing.PDFAreaTextStripper;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.model.CellValue;
+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.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.ReanalysisSection;
+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.tableextraction.model.Cell;
+
+import lombok.RequiredArgsConstructor;
+
+@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;
+
+
+    public ReanalyzeResult reanalyze(@RequestBody RenalyzeRequest renalyzeRequest) {
+
+        DictionaryIncrement dictionaryIncrement = dictionaryService.getDictionaryIncrements(renalyzeRequest.getRuleSetId(), renalyzeRequest
+                .getRedactionLog()
+                .getDictionaryVersion());
+
+        Set<String> manualForceAndRemoveIds = getForceAndRemoveIds(renalyzeRequest.getManualRedactions());
+        Map<String, List<Comment>> comments = null;
+        Set<ManualRedactionEntry> manualAdds = null;
+
+        if (renalyzeRequest.getManualRedactions() != null) {
+            // TODO comments will be removed from redactionLog, so we ignore this first.
+            comments = renalyzeRequest.getManualRedactions().getComments();
+            manualAdds = renalyzeRequest.getManualRedactions().getEntriesToAdd();
+        }
+
+        Set<Integer> sectionsToReanaylse = new HashSet<>();
+        Map<Integer, Set<Image>> imageEntries = new HashMap<>();
+        for (RedactionLogEntry entry : renalyzeRequest.getRedactionLog().getRedactionLogEntry()) {
+            if (entry.isManual() || manualForceAndRemoveIds.contains(entry.getId())) {
+                sectionsToReanaylse.add(entry.getSectionNumber());
+            }
+            if (entry.isImage() || entry.getType().equals("image")) {
+                imageEntries.computeIfAbsent(entry.getSectionNumber(), x -> new HashSet<>()).add(convert(entry));
+            }
+        }
+
+        for (SectionText sectionText : renalyzeRequest.getText().getSectionTexts()) {
+
+            if (EntitySearchUtils.sectionContainsAny(sectionText.getText(), dictionaryIncrement.getValues())) {
+                sectionsToReanaylse.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());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (sectionsToReanaylse.isEmpty() && (manualAdds == null || manualAdds.isEmpty())) {
+            renalyzeRequest.getRedactionLog().setDictionaryVersion(dictionaryIncrement.getDictionaryVersion());
+            return ReanalyzeResult.builder().redactionLog(renalyzeRequest.getRedactionLog()).build();
+        }
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(renalyzeRequest.getDocument()))) {
+
+            List<ReanalysisSection> reanalysisSections = new ArrayList<>();
+            for (SectionText sectionText : renalyzeRequest.getText().getSectionTexts()) {
+
+                if (!sectionsToReanaylse.contains(sectionText.getSectionNumber())) {
+                    continue;
+                }
+
+                ReanalysisSection reanalysisSection = new ReanalysisSection();
+                reanalysisSection.setHeadline(sectionText.getHeadline());
+                reanalysisSection.setSectionNumber(sectionText.getSectionNumber());
+                List<TextBlock> textBlocks = new ArrayList<>();
+
+                Map<Integer, List<SectionArea>> sectionAreasPerPage = new HashMap<>();
+                for (SectionArea sectionArea : sectionText.getSectionAreas()) {
+                    sectionAreasPerPage.computeIfAbsent(sectionArea.getPage(), (x) -> new ArrayList<>())
+                            .add(sectionArea);
+                }
+
+                Map<String, CellValue> tabularData = new HashMap<>();
+                List<Integer> cellStarts = new ArrayList<>();
+                for (Integer page : sectionAreasPerPage.keySet()) {
+                    List<SectionArea> areasOnPage = sectionAreasPerPage.get(page);
+
+                    PDPage pdPage = pdDocument.getPage(page - 1);
+                    PDRectangle cropBox = pdPage.getCropBox();
+                    PDFAreaTextStripper textStripper = new PDFAreaTextStripper();
+                    textStripper.setPageNumber(page);
+
+                    int cellStart = 0;
+                    for (SectionArea sectionArea : areasOnPage) {
+
+                        Rectangle2D rect = null;
+                        if (pdPage.getRotation() == 90) {
+                            rect = new Rectangle2D.Float(sectionArea.getTopLeft().getY(), sectionArea.getTopLeft()
+                                    .getX(), sectionArea.getHeight(), sectionArea.getWidth() + 0.001f);
+                        } else {
+                            rect = new Rectangle2D.Float(sectionArea.getTopLeft().getX(), -sectionArea.getTopLeft()
+                                    .getY() + cropBox.getUpperRightY() - sectionArea.getHeight(), sectionArea.getWidth(), sectionArea
+                                    .getHeight() + 0.001f);
+                        }
+
+                        textStripper.addRegion(String.valueOf(1), rect);
+                        textStripper.extractRegions(pdPage);
+                        textStripper.getTextForRegion(String.valueOf(1));
+                        List<TextPositionSequence> positions = textStripper.getTextPositionSequences();
+
+                        TextBlock textBlock = new TextBlock(sectionArea.getTopLeft().getX(), sectionArea.getTopLeft()
+                                .getX() + sectionArea.getWidth(), sectionArea.getTopLeft()
+                                .getY(), sectionArea.getTopLeft().getY() + sectionArea.getHeight(), positions, 0);
+
+                        if (sectionText.isTable()) {
+                            Cell cell = new Cell();
+                            cell.addTextBlock(textBlock);
+                            tabularData.put(sectionArea.getHeader(), new CellValue(cell.getTextBlocks(), cellStart));
+                            cellStarts.add(cellStart);
+                            cellStart = cellStart + cell.toString().trim().length() + 1;
+                        }
+
+                        textBlocks.add(textBlock);
+                        textStripper.clearPositions();
+                    }
+
+                }
+                reanalysisSection.setTextBlocks(textBlocks);
+                reanalysisSection.setTabularData(tabularData);
+
+                if (sectionText.isTable()) {
+                    reanalysisSection.setCellStarts(cellStarts);
+                }
+                if (imageEntries.containsKey(sectionText.getSectionNumber())) {
+                    reanalysisSection.getImages().addAll(imageEntries.get(sectionText.getSectionNumber()));
+                }
+
+                reanalysisSections.add(reanalysisSection);
+            }
+
+            //--
+
+            KieContainer kieContainer = droolsExecutionService.updateRules(renalyzeRequest.getRuleSetId());
+
+            Dictionary dictionary = dictionaryService.getDeepCopyDictionary(renalyzeRequest.getRuleSetId());
+
+            List<SectionSearchableTextPair> sectionSearchableTextPairs = new ArrayList<>();
+            for (ReanalysisSection 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()));
+                }
+            }
+
+            List<RedactionLogEntry> newRedactionLogEntries = new ArrayList<>();
+            for (int page = 1; page <= pdDocument.getNumberOfPages(); page++) {
+                if (entitiesPerPage.get(page) != null) {
+                    newRedactionLogEntries.addAll(redactionLogCreatorService.addEntries(entitiesPerPage, renalyzeRequest
+                            .getManualRedactions(), page, renalyzeRequest.getRuleSetId()));
+                }
+
+                if (imagesPerPage.get(page) != null) {
+                    newRedactionLogEntries.addAll(redactionLogCreatorService.addImageEntries(imagesPerPage, renalyzeRequest
+                            .getManualRedactions(), page, renalyzeRequest.getRuleSetId()));
+                }
+
+                newRedactionLogEntries.addAll(redactionLogCreatorService.addManualAddEntries(manualAdds, comments, page, renalyzeRequest
+                        .getRuleSetId()));
+            }
+
+            Iterator<RedactionLogEntry> itty = renalyzeRequest.getRedactionLog().getRedactionLogEntry().iterator();
+            while (itty.hasNext()) {
+                RedactionLogEntry entry = itty.next();
+                if (sectionsToReanaylse.contains(entry.getSectionNumber())) {
+                    itty.remove();
+                }
+            }
+
+            renalyzeRequest.getRedactionLog().getRedactionLogEntry().addAll(newRedactionLogEntries);
+
+            renalyzeRequest.getRedactionLog().setDictionaryVersion(dictionaryIncrement.getDictionaryVersion());
+
+            return ReanalyzeResult.builder().redactionLog(renalyzeRequest.getRedactionLog()).build();
+
+        } catch (Exception e) {
+            throw new RedactionException(e);
+        }
+
+    }
+
+
+    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 Rectangle2D.Float(position.getTopLeft().getX(), position.getTopLeft()
+                        .getY(), position.getWidth(), position.getHeight()))
+                .sectionNumber(entry.getSectionNumber())
+                .section(entry.getSection())
+                .page(position.getPage())
+                .build();
+    }
+
+}
@@ -0,0 +1,494 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.pdfbox.text.TextPosition;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.redaction.v1.model.CellRectangle;
+import com.iqser.red.service.redaction.v1.model.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
+import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
+import com.iqser.red.service.redaction.v1.model.ManualRedactionType;
+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.RedactionLogEntry;
+import com.iqser.red.service.redaction.v1.model.SectionRectangle;
+import com.iqser.red.service.redaction.v1.model.Status;
+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.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;
+
+@Service
+@RequiredArgsConstructor
+public class RedactionLogCreatorService {
+
+    private final DictionaryService dictionaryService;
+
+
+    public void createRedactionLog(Document classifiedDoc, int numberOfPages, ManualRedactions manualRedactions,
+                                   String ruleSetId) {
+
+        Set<Integer> manualRedactionPages = getManualRedactionPages(manualRedactions);
+
+        for (int page = 1; page <= numberOfPages; page++) {
+
+            addSectionGrid(classifiedDoc, page);
+
+            if (classifiedDoc.getEntities().get(page) != null) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addEntries(classifiedDoc.getEntities(), manualRedactions, page, ruleSetId));
+            }
+
+            if (manualRedactionPages.contains(page)) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addManualAddEntries(manualRedactions.getEntriesToAdd(), manualRedactions.getComments(), page, ruleSetId));
+            }
+
+            if (classifiedDoc.getImages().get(page) != null && !classifiedDoc.getImages().get(page).isEmpty()) {
+                classifiedDoc.getRedactionLogEntities()
+                        .addAll(addImageEntries(classifiedDoc.getImages(), manualRedactions, page, ruleSetId));
+            }
+        }
+    }
+
+
+    public List<RedactionLogEntry> addImageEntries(Map<Integer, Set<Image>> images, ManualRedactions manualRedactions,
+                                                   int pageNumber, String ruleSetId) {
+
+        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+
+        for (Image image : images.get(pageNumber)) {
+
+            String id = IdBuilder.buildId(image.getPosition(), pageNumber);
+
+            RedactionLogEntry redactionLogEntry = RedactionLogEntry.builder()
+                    .id(id)
+                    .color(getColorForImage(image, ruleSetId, false))
+                    .isImage(true)
+                    .type(image.getType())
+                    .redacted(image.isRedaction())
+                    .reason(image.getRedactionReason())
+                    .legalBasis(image.getLegalBasis())
+                    .matchedRule(image.getMatchedRule())
+                    .isHint(dictionaryService.isHint(image.getType(), ruleSetId))
+                    .manual(false)
+                    .isDictionaryEntry(false)
+                    .isRecommendation(false)
+                    .positions(List.of(new Rectangle(new Point((float) image.getPosition()
+                            .getX(), (float) image.getPosition().getY()), (float) image.getPosition()
+                            .getWidth(), (float) image.getPosition().getHeight(), pageNumber)))
+                    .sectionNumber(image.getSectionNumber())
+                    .section(image.getSection())
+                    .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, ruleSetId, false));
+                        } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                            manualOverrideReason = image.getRedactionReason() + ", requested to remove";
+                            redactionLogEntry.setStatus(Status.REQUESTED);
+                            redactionLogEntry.setColor(getColorForImage(image, ruleSetId, 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, ruleSetId, 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, ruleSetId, 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);
+        }
+
+        return redactionLogEntities;
+    }
+
+
+    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 ruleSetId) {
+
+        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+
+        // Duplicates can exist due table extraction colums 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, ruleSetId);
+                if (processedIds.contains(entityPositionSequence.getId())) {
+
+                    // TODO refactor this outer loop jump as soon as we have the time.
+                    continue entityLoop;
+                } else {
+                    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, ruleSetId, false));
+                            } else if (manualRemoval.getStatus().equals(Status.REQUESTED)) {
+                                manualOverrideReason = entity.getRedactionReason() + ", requested to remove";
+                                redactionLogEntry.setStatus(Status.REQUESTED);
+                                redactionLogEntry.setColor(getColor(entity, ruleSetId, 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, ruleSetId, 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, ruleSetId, 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);
+                        }
+                    }
+                }
+
+                if (CollectionUtils.isNotEmpty(entityPositionSequence.getSequences())) {
+                    List<Rectangle> rectanglesPerLine = getRectanglesPerLine(entityPositionSequence.getSequences()
+                            .stream()
+                            .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);
+                }
+            }
+        }
+
+        return redactionLogEntities;
+    }
+
+
+    private List<Rectangle> getRectanglesPerLine(List<TextPosition> textPositions, int page) {
+
+        List<Rectangle> rectangles = new ArrayList<>();
+        if (textPositions.size() == 1) {
+            rectangles.add(new TextPositionSequence(textPositions, page).getRectangle());
+        } else {
+            float y = textPositions.get(0).getYDirAdj();
+            int startIndex = 0;
+            for (int i = 1; i < textPositions.size(); i++) {
+                float yDirAdj = textPositions.get(i).getYDirAdj();
+                if (yDirAdj != y) {
+                    rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, i), page).getRectangle());
+                    y = yDirAdj;
+                    startIndex = i;
+                }
+            }
+            if (startIndex != textPositions.size()) {
+                rectangles.add(new TextPositionSequence(textPositions.subList(startIndex, textPositions.size()), page).getRectangle());
+            }
+        }
+
+        return rectangles;
+    }
+
+
+    public List<RedactionLogEntry> addManualAddEntries(Set<ManualRedactionEntry> manualAdds,
+                                                       Map<String, List<Comment>> comments, int page,
+                                                       String ruleSetId) {
+
+        List<RedactionLogEntry> redactionLogEntities = new ArrayList<>();
+
+        if (manualAdds == null) {
+            return redactionLogEntities;
+        }
+
+        for (ManualRedactionEntry manualRedactionEntry : manualAdds) {
+
+            String id = manualRedactionEntry.getId();
+
+            RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id, ruleSetId);
+
+            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;
+    }
+
+
+    private boolean approvedAndShouldBeInDictionary(ManualRedactionEntry manualRedactionEntry) {
+
+        return manualRedactionEntry.getStatus().equals(Status.APPROVED) && manualRedactionEntry.isAddToDictionary();
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(ManualRedactionEntry manualRedactionEntry, String id,
+                                                      String ruleSetId) {
+
+        return RedactionLogEntry.builder()
+                .id(id)
+                .color(getColorForManualAdd(manualRedactionEntry.getType(), ruleSetId, 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)
+                .build();
+    }
+
+
+    private RedactionLogEntry createRedactionLogEntry(Entity entity, String ruleSetId) {
+
+        return RedactionLogEntry.builder()
+                .color(getColor(entity, ruleSetId, false))
+                .reason(entity.getRedactionReason())
+                .legalBasis(entity.getLegalBasis())
+                .value(entity.getWord())
+                .type(entity.getType())
+                .redacted(entity.isRedaction())
+                .isHint(isHint(entity, ruleSetId))
+                .isRecommendation(isRecommendation(entity, ruleSetId))
+                .section(entity.getHeadline())
+                .sectionNumber(entity.getSectionNumber())
+                .matchedRule(entity.getMatchedRule())
+                .isDictionaryEntry(entity.isDictionaryEntry())
+                .textAfter(entity.getTextAfter())
+                .textBefore(entity.getTextBefore())
+                .startOffset(entity.getStart())
+                .endOffset(entity.getEnd())
+                .build();
+    }
+
+
+    private float[] getColor(Entity entity, String ruleSetId, boolean requestedToRemove) {
+
+        if (requestedToRemove) {
+            return dictionaryService.getRequestRemoveColor(ruleSetId);
+        }
+        if (!entity.isRedaction() && !isHint(entity, ruleSetId)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
+        }
+        return dictionaryService.getColor(entity.getType(), ruleSetId);
+    }
+
+
+    private float[] getColorForManualAdd(String type, String ruleSetId, Status status) {
+
+        if (status.equals(Status.REQUESTED)) {
+            return dictionaryService.getRequestAddColor(ruleSetId);
+        } else if (status.equals(Status.DECLINED)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
+        }
+        return getColor(type, ruleSetId);
+    }
+
+
+    private float[] getColor(String type, String ruleSetId) {
+
+        return dictionaryService.getColor(type, ruleSetId);
+    }
+
+
+    private float[] getColorForImage(Image image, String ruleSetId, boolean requestedToRemove) {
+
+        if (requestedToRemove) {
+            return dictionaryService.getRequestRemoveColor(ruleSetId);
+        }
+        if (!image.isRedaction() && !dictionaryService.isHint(image.getType(), ruleSetId)) {
+            return dictionaryService.getNotRedactedColor(ruleSetId);
+        }
+        return dictionaryService.getColor(image.getType(), ruleSetId);
+    }
+
+
+    private boolean isHint(Entity entity, String ruleSetId) {
+
+        return dictionaryService.isHint(entity.getType(), ruleSetId);
+    }
+
+
+    private boolean isRecommendation(Entity entity, String ruleSetId) {
+
+        return dictionaryService.isRecommendation(entity.getType(), ruleSetId);
+    }
+
+
+    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,140 @@
+package com.iqser.red.service.redaction.v1.server.redaction.service;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.model.SearchableText;
+import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SurroundingWordsService {
+
+    private final RedactionServiceSettings redactionServiceSettings;
+
+
+    public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary) {
+
+        if (entities.isEmpty()) {
+            return;
+        }
+
+        try {
+            for (Entity entity : entities) {
+
+                if (dictionary.isHint(entity.getType())) {
+                    continue;
+                }
+                findSurroundingWords(entity, searchableText.toString(), entity.getStart(), entity.getEnd());
+            }
+        } catch (Exception e) {
+            log.warn("Could not get surrounding text!");
+        }
+    }
+
+
+    public void addSurroundingText(Set<Entity> entities, SearchableText searchableText, Dictionary dictionary,
+                                   List<Integer> cellstarts) {
+
+        if (entities.isEmpty()) {
+            return;
+        }
+
+        try {
+            String searchableString = searchableText.toString();
+
+            if (cellstarts != null) {
+                for (int i = 0; i < cellstarts.size(); i++) {
+
+                    int startOffset = cellstarts.get(i);
+                    int endOffset = -1;
+
+                    if (i + 1 < cellstarts.size()) {
+                        endOffset = cellstarts.get(i + 1);
+                    } else {
+                        endOffset = searchableString.length() - 1;
+                    }
+
+                    String text = searchableString.substring(startOffset, endOffset);
+                    for (Entity entity : entities) {
+
+                        if (dictionary.isHint(entity.getType())) {
+                            continue;
+                        }
+
+                        if (entity.getStart() >= startOffset && entity.getEnd() <= endOffset) {
+                            int entityStartOffset = entity.getStart() - startOffset;
+                            int entityEndOffset = entity.getEnd() - startOffset;
+                            findSurroundingWords(entity, text, entityStartOffset, entityEndOffset);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Could not get surrounding text!");
+        }
+    }
+
+
+    private void findSurroundingWords(Entity entity, String text, int entityStartOffset, int entityEndOffset) {
+
+        int offsetBefore = entityStartOffset - redactionServiceSettings.getSurroundingWordsOffsetWindow() < 0 ? 0 : entityStartOffset - redactionServiceSettings
+                .getSurroundingWordsOffsetWindow();
+        String textBefore = text.substring(offsetBefore, entityStartOffset);
+        if (!textBefore.isBlank()) {
+            String[] wordsBefore = textBefore.split(" ");
+            int numberOfWordsBefore = wordsBefore.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
+                    .getNumberOfSurroundingWords() : wordsBefore.length;
+            if (wordsBefore.length > 0) {
+                entity.setTextBefore(concatWordsBefore(wordsBefore, numberOfWordsBefore, textBefore.endsWith(" ")));
+            }
+        }
+
+        int endOffset = entityEndOffset + redactionServiceSettings.getSurroundingWordsOffsetWindow() > text.length() ? text
+                .length() : entityEndOffset + redactionServiceSettings.getSurroundingWordsOffsetWindow();
+        String textAfter = text.substring(entityEndOffset, endOffset);
+        if (!textAfter.isBlank()) {
+            String[] wordsAfter = textAfter.split(" ");
+            int numberOfWordsAfter = wordsAfter.length > redactionServiceSettings.getNumberOfSurroundingWords() ? redactionServiceSettings
+                    .getNumberOfSurroundingWords() : wordsAfter.length;
+            if (wordsAfter.length > 0) {
+                entity.setTextAfter(concatWordsAfter(wordsAfter, numberOfWordsAfter, textAfter.startsWith(" ")));
+            }
+        }
+    }
+
+
+    private String concatWordsBefore(String[] words, int number, boolean endWithSpace) {
+
+        StringBuilder sb = new StringBuilder();
+
+        int startNumber = words.length > number ? words.length - number : 0;
+
+        for (int i = startNumber; i < words.length; i++) {
+            sb.append(words[i]).append(" ");
+        }
+
+        String result = sb.toString().trim();
+        return endWithSpace ? result + " " : result;
+    }
+
+
+    private String concatWordsAfter(String[] words, int number, boolean startWithSpace) {
+
+        StringBuilder sb = new StringBuilder();
+
+        for (int i = 0; i < number; i++) {
+            sb.append(words[i]).append(" ");
+        }
+
+        String result = sb.toString().trim();
+        return startWithSpace ? " " + result : result;
+    }
+
+}
@@ -0,0 +1,164 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.Dictionary;
+import com.iqser.red.service.redaction.v1.server.redaction.model.DictionaryIncrementValue;
+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.SearchableText;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@UtilityClass
+@SuppressWarnings("PMD")
+public class EntitySearchUtils {
+
+
+    public boolean sectionContainsAny(String sectionText, Set<DictionaryIncrementValue> values) {
+
+        String inputString = sectionText.toLowerCase(Locale.ROOT);
+
+        for (DictionaryIncrementValue value : values) {
+
+            String cleanValue = value.getValue().toLowerCase(Locale.ROOT).trim();
+
+            if (cleanValue.length() <= 2) {
+                continue;
+            }
+
+            int startIndex;
+            int stopIndex = 0;
+            do {
+                startIndex = inputString.indexOf(cleanValue, stopIndex);
+                stopIndex = startIndex + cleanValue.length();
+
+                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
+                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
+                    if(value.isCaseinsensitive() || !value.isCaseinsensitive() && sectionText.substring(startIndex, stopIndex).equals(value.getValue())){
+                        return true;
+                    }
+                }
+            } while (startIndex > -1);
+        }
+        return false;
+    }
+
+
+    public Set<Entity> find(String inputString, Set<String> values, String type, String headline, int sectionNumber,
+                            boolean local) {
+
+        Set<Entity> found = new HashSet<>();
+
+        for (String value : values) {
+
+            String cleanValue = value.trim();
+
+            if (cleanValue.length() <= 2) {
+                continue;
+            }
+
+            int startIndex;
+            int stopIndex = 0;
+            do {
+                startIndex = inputString.indexOf(cleanValue, stopIndex);
+                stopIndex = startIndex + cleanValue.length();
+
+                if (startIndex > -1 && (startIndex == 0 || Character.isWhitespace(inputString.charAt(startIndex - 1)) || isSeparator(inputString
+                        .charAt(startIndex - 1))) && (stopIndex == inputString.length() || isSeparator(inputString.charAt(stopIndex)))) {
+                    found.add(new Entity(inputString.substring(startIndex, stopIndex), type, startIndex, stopIndex, headline, sectionNumber, !local));
+                }
+            } while (startIndex > -1);
+        }
+        return found;
+    }
+
+
+    private boolean isSeparator(char c) {
+
+        return Character.isWhitespace(c) || Pattern.matches("\\p{Punct}", String.valueOf(c)) || c == '\"' || c == '‘' || c == '’';
+    }
+
+
+    public Set<Entity> clearAndFindPositions(Set<Entity> entities, SearchableText text, Dictionary dictionary) {
+
+        Map<String, List<Entity>> entitiesByWord = new HashMap<>();
+
+        for (Entity entity : entities) {
+            entitiesByWord.computeIfAbsent(entity.getWord(), (x) -> new ArrayList<>()).add(entity);
+        }
+
+        for (String word : entitiesByWord.keySet()) {
+
+            List<Entity> orderedEntities = entitiesByWord.get(word)
+                    .stream()
+                    .sorted(Comparator.comparing(Entity::getStart))
+                    .collect(Collectors.toList());
+            Entity firstEntity = orderedEntities.get(0);
+            List<EntityPositionSequence> positionSequences = text.getSequences(firstEntity.getWord().trim(), dictionary.isCaseInsensitiveDictionary(firstEntity
+                    .getType()), firstEntity.getTargetSequences());
+
+            for (int i = 0; i <= orderedEntities.size() - 1; i++) {
+                try {
+                    orderedEntities.get(i).setPositionSequences(List.of(positionSequences.get(i)));
+                } catch (Exception e) {
+                    log.warn("Mismatch between EntityPositionSequence and found Entity!");
+                }
+            }
+        }
+
+        removeEntitiesContainedInLarger(entities);
+
+        return entities;
+    }
+
+
+    public void removeEntitiesContainedInLarger(Set<Entity> entities) {
+
+        List<Entity> wordsToRemove = new ArrayList<>();
+        for (Entity word : entities) {
+            for (Entity inner : entities) {
+                if (inner.getWord().length() < word.getWord()
+                        .length() && inner.getStart() >= word.getStart() && inner.getEnd() <= word.getEnd() && word != inner && word
+                        .getSectionNumber() == inner.getSectionNumber()) {
+                    wordsToRemove.add(inner);
+                }
+            }
+        }
+        entities.removeAll(wordsToRemove);
+    }
+
+
+    public void addEntitiesWithHigherRank(Set<Entity> entities, Set<Entity> found, Dictionary dictionary) {
+        found.forEach(f -> addEntitiesWithHigherRank(entities, f, dictionary));
+    }
+
+
+    public void addEntitiesWithHigherRank(Set<Entity> entities, Entity found, Dictionary dictionary) {
+
+        if(entities.contains(found)){
+            Entity existing = entities.stream().filter(entity -> entity.equals(found)).findFirst().get();
+            if (dictionary.getDictionaryRank(existing.getType()) <= dictionary.getDictionaryRank(found.getType())){
+                entities.remove(found);
+            }
+        }
+        entities.add(found);
+    }
+
+    public void addEntitiesIgnoreRank(Set<Entity> entities, Set<Entity> found){
+        // HashSet keeps old value but we want the new.
+        entities.removeAll(found);
+        entities.addAll(found);
+    }
+}
@@ -0,0 +1,39 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import java.awt.geom.Rectangle2D;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import com.google.common.hash.HashFunction;
+import com.google.common.hash.Hashing;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class IdBuilder {
+
+    private final HashFunction hashFunction = Hashing.murmur3_128();
+
+    public String buildId(List<TextPositionSequence> crossSequenceParts) {
+
+        StringBuilder sb = new StringBuilder();
+        crossSequenceParts.forEach(sequencePart -> sequencePart.getTextPositions().forEach(textPosition -> {
+            sb.append(textPosition.getTextMatrix()).append(sequencePart.getPage());
+        }));
+
+        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
+    }
+
+
+    public String buildId(Rectangle2D rectangle2D, int page){
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("x").append(rectangle2D.getX()).append("y").append(rectangle2D.getY()).append("h").append(rectangle2D.getHeight()).append("w").append(rectangle2D.getWidth()).append("p").append(page);
+
+        return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
+    }
+
+
+
+}
@@ -0,0 +1,28 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import lombok.experimental.UtilityClass;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+@UtilityClass
+public class Patterns {
+
+    public static Map<String, Pattern> patternCache = new HashMap<>();
+
+    public static Pattern AUTHOR_TABLE_SPITTER = Pattern.compile("((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2}\\.)+|((((di)|(van)) )|[A-Z]’)?[A-ZÄÖÜ][\\wäöüéèê]{2,}( ?[A-ZÄÖÜ]{1,2} )+");
+
+
+    public Pattern getCompiledPattern(String pattern, boolean caseInsensitive) {
+
+        String patternKey = pattern + caseInsensitive;
+        if (patternCache.containsKey(patternKey)) {
+            return patternCache.get(patternKey);
+        }
+        Pattern compiledPattern = Pattern.compile(pattern, caseInsensitive ? Pattern.CASE_INSENSITIVE : 0);
+        patternCache.put(patternKey, compiledPattern);
+        return compiledPattern;
+    }
+
+}
@@ -11,7 +11,7 @@ public class TextNormalizationUtilities {
     * @return Text without line-break hyphenation.
     */
    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("\\s(\\S+)[\\-\\u00AD]\\R|\n\r(.+ )", "\n$1$2");
+        return text.replaceAll("([^\\s\\d\\-]{2,})[\\-\\u00AD]\\R|\n\r(.+ )", "$1$2");
    }

 }
@@ -15,13 +15,11 @@ import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
 import com.iqser.red.service.redaction.v1.server.classification.service.BlockificationService;
 import com.iqser.red.service.redaction.v1.server.classification.service.ClassificationService;
 import com.iqser.red.service.redaction.v1.server.parsing.PDFLinesTextStripper;
-import com.iqser.red.service.redaction.v1.server.parsing.model.ParsedElements;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.AbstractTextContainer;
 import com.iqser.red.service.redaction.v1.server.tableextraction.model.CleanRulings;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
 import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
-import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;

 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +35,7 @@ public class PdfSegmentationService {
    private final ClassificationService classificationService;
    private final SectionsBuilderService sectionsBuilderService;

+
    public Document parseDocument(PDDocument pdDocument) throws IOException {

        Document document = new Document();
@@ -48,6 +47,7 @@ public class PdfSegmentationService {
            stripper.setPageNumber(pageNumber);
            stripper.setStartPage(pageNumber);
            stripper.setEndPage(pageNumber);
+            stripper.setPdpage(pdPage);
            stripper.getText(pdDocument);

            PDRectangle pdr = pdPage.getMediaBox();
@@ -56,42 +56,38 @@ public class PdfSegmentationService {
            int rotation = pdPage.getRotation();
            boolean isRotated = rotation != 0 && rotation != 360;

-            ParsedElements parsedElements = ParsedElements
-                    .builder()
-                    .rulings(stripper.getRulings())
-                    .sequences(stripper.getTextPositionSequences())
-                    .minCharWidth(Utils.round(stripper.getMinCharWidth(), 2))
-                    .minCharHeight(Utils.round(stripper.getMinCharHeight(), 2))
-                    .landscape(isLandscape)
-                    .rotated(isRotated)
-                    .build();
+            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(stripper.getRulings(), stripper.getMinCharWidth(), stripper
+                    .getMaxCharHeight());

-            CleanRulings cleanRulings = rulingCleaningService.getCleanRulings(parsedElements.getRulings(), parsedElements.getMinCharWidth(), parsedElements.getMinCharHeight());
-
-            Page page = blockificationService.blockify(parsedElements.getSequences(), cleanRulings.getHorizontal(), cleanRulings.getVertical());
+            Page page = blockificationService.blockify(stripper.getTextPositionSequences(), cleanRulings.getHorizontal(), cleanRulings
+                    .getVertical());
            page.setRotation(rotation);

            tableExtractionService.extractTables(cleanRulings, page);

            buildPageStatistics(page);

-            page.setLandscape(parsedElements.isLandscape() || parsedElements.isRotated());
+            page.setLandscape(isLandscape || isRotated);

            page.setPageNumber(pageNumber);
            increaseDocumentStatistics(page, document);
+
+            page.setImages(stripper.getImages());
            pages.add(page);
        }
+
        document.setPages(pages);

        classificationService.classifyDocument(document);
-
        sectionsBuilderService.buildSections(document);
+        sectionsBuilderService.addImagesToSections(document);

        return document;
-
    }

+
    private void increaseDocumentStatistics(Page page, Document document) {
+
        if (!page.isLandscape()) {
            document.getFontSizeCounter().addAll(page.getFontSizeCounter().getCountPerValue());
        }
@@ -100,6 +96,7 @@ public class PdfSegmentationService {
        document.getFontStyleCounter().addAll(page.getFontStyleCounter().getCountPerValue());
    }

+
    private void buildPageStatistics(Page page) {

        // Collect all statistics for the page, except from blocks inside tables, as tables will always be added to BodyTextFrame.
@@ -1,18 +1,28 @@
 package com.iqser.red.service.redaction.v1.server.segmentation;

 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.stream.Collectors;

 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

 import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.classification.model.Footer;
+import com.iqser.red.service.redaction.v1.server.classification.model.Header;
 import com.iqser.red.service.redaction.v1.server.classification.model.Page;
 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.classification.model.UnclassifiedText;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
 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;

@Service
@@ -22,46 +32,171 @@ public class SectionsBuilderService {

        List<AbstractTextContainer> chunkWords = new ArrayList<>();
        List<Paragraph> chunkBlockList = new ArrayList<>();
+        List<Header> headers = new ArrayList<>();
+        List<Footer> footers = new ArrayList<>();
+        List<UnclassifiedText> unclassifiedTexts = new ArrayList<>();

        AbstractTextContainer prev = null;

        String lastHeadline = "";
        Table previousTable = null;
        for (Page page : document.getPages()) {
+            List<TextBlock> header = new ArrayList<>();
+            List<TextBlock> footer = new ArrayList<>();
+            List<TextBlock> unclassifiedText = new ArrayList<>();
            for (AbstractTextContainer current : page.getTextBlocks()) {

-                if (current.getClassification() == null || current.getClassification()
-                        .equals("Header") || current.getClassification().equals("Footer")) {
+                if (current.getClassification() == null) {
                    continue;
                }

                current.setPage(page.getPageNumber());

-                if (prev != null && current.getClassification().startsWith("H ") || !document.isHeadlines()) {
-                    Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline, previousTable);
+                if (current.getClassification().equals("Header")) {
+                    header.add((TextBlock) current);
+                    continue;
+                }
+
+                if (current.getClassification().equals("Footer")) {
+                    footer.add((TextBlock) current);
+                    continue;
+                }
+
+                if (current.getClassification().equals("Other")) {
+                    unclassifiedText.add((TextBlock) current);
+                    continue;
+                }
+
+                if (prev != null && current.getClassification().startsWith("H ") && !prev.getClassification()
+                        .startsWith("H ") || !document.isHeadlines()) {
+                    Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
                    chunkBlock.setHeadline(lastHeadline);
-                    lastHeadline = current.getText();
-                    if (CollectionUtils.isNotEmpty(chunkBlock.getTables())) {
-                        previousTable = chunkBlock.getTables().get(0);
+                    if (document.isHeadlines()) {
+                        lastHeadline = current.getText();
                    }
                    chunkBlockList.add(chunkBlock);
                    chunkWords = new ArrayList<>();
+                    if (CollectionUtils.isNotEmpty(chunkBlock.getTables())) {
+                        previousTable = chunkBlock.getTables().get(chunkBlock.getTables().size() - 1);
+                    }
+                }
+                if (current instanceof Table) {
+                    Table table = (Table) current;
+                    // Distribute header information for subsequent tables
+                    mergeTableMetadata(table, previousTable);
+                    previousTable = table;
                }
-
                chunkWords.add(current);
                prev = current;
            }
+
+            if (!header.isEmpty()) {
+                headers.add(new Header(header));
+            }
+            if (!footer.isEmpty()) {
+                footers.add(new Footer(footer));
+            }
+            if (!unclassifiedText.isEmpty()) {
+                unclassifiedTexts.add(new UnclassifiedText(unclassifiedText));
+            }
        }

-        Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline, previousTable);
+        Paragraph chunkBlock = buildTextBlock(chunkWords, lastHeadline);
        chunkBlock.setHeadline(lastHeadline);
        chunkBlockList.add(chunkBlock);

        document.setParagraphs(chunkBlockList);
+        document.setHeaders(headers);
+        document.setFooters(footers);
+        document.setUnclassifiedTexts(unclassifiedTexts);
    }


-    private Paragraph buildTextBlock(List<AbstractTextContainer> wordBlockList, String lastHeadline, Table previousTable) {
+    public void addImagesToSections(Document document) {
+
+        Map<Integer, SortedSet<Paragraph>> paragraphMap = new HashMap<>();
+        for (Paragraph paragraph : document.getParagraphs()) {
+            for (AbstractTextContainer container : paragraph.getPageBlocks()) {
+                paragraphMap.computeIfAbsent(container.getPage(), x -> new TreeSet<>()).add(paragraph);
+            }
+        }
+
+        if (paragraphMap.isEmpty()) {
+            Paragraph paragraph = new Paragraph();
+            document.getParagraphs().add(paragraph);
+            paragraphMap.computeIfAbsent(1, x -> new TreeSet<>()).add(paragraph);
+        }
+
+        for (Page page : document.getPages()) {
+            for (PdfImage image : page.getImages()) {
+                SortedSet<Paragraph> paragraphsOnPage = paragraphMap.get(page.getPageNumber());
+                if (paragraphsOnPage == null) {
+                    int i = page.getPageNumber();
+                    while (paragraphsOnPage == null) {
+                        paragraphsOnPage = paragraphMap.get(i);
+                        i--;
+                    }
+                }
+
+                Float perviousEnd = 0f;
+                for (Paragraph paragraph : paragraphsOnPage) {
+                    Float currentEnd = 0f;
+                    for (AbstractTextContainer abs : paragraph.getPageBlocks()) {
+                        if (abs.getPage() != page.getPageNumber()) {
+                            continue;
+                        }
+                        if (abs.getMaxY() > currentEnd) {
+                            currentEnd = abs.getMaxY();
+                        }
+                    }
+
+                    if (image.getPosition().getY() >= perviousEnd && image.getPosition().getY() <= currentEnd) {
+                        paragraph.getImages().add(image);
+                        image.setAppendedToParagraph(true);
+                    }
+                    perviousEnd = currentEnd;
+                }
+                if (!image.isAppendedToParagraph()) {
+                    paragraphsOnPage.first().getImages().add(image);
+                    image.setAppendedToParagraph(true);
+                }
+            }
+        }
+    }
+
+
+    private void mergeTableMetadata(Table currentTable, Table previousTable) {
+
+        // Distribute header information for subsequent tables
+        if (previousTable != null && hasInvalidHeaderInformation(currentTable) && hasValidHeaderInformation(previousTable)) {
+            List<Cell> previousTableNonHeaderRow = getRowWithNonHeaderCells(previousTable);
+            List<Cell> tableNonHeaderRow = getRowWithNonHeaderCells(currentTable);
+            // Allow merging of tables if header row is separated from first logical non-header row
+            if (previousTableNonHeaderRow.isEmpty() && previousTable.getRowCount() == 1 && previousTable.getRows()
+                    .get(0)
+                    .size() == tableNonHeaderRow.size()) {
+                previousTableNonHeaderRow = previousTable.getRows().get(0).stream().map(cell -> {
+                    Cell fakeCell = new Cell(cell.getPoints()[0], cell.getPoints()[2]);
+                    fakeCell.setHeaderCells(Collections.singletonList(cell));
+                    return fakeCell;
+                }).collect(Collectors.toList());
+            }
+            if (previousTableNonHeaderRow.size() == tableNonHeaderRow.size()) {
+                for (int i = currentTable.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
+                    List<Cell> row = currentTable.getRows().get(i);
+                    if (row.size() == tableNonHeaderRow.size() && row.stream()
+                            .allMatch(cell -> cell.getHeaderCells().isEmpty())) {
+                        for (int j = 0; j < row.size(); j++) {
+                            row.get(j).setHeaderCells(previousTableNonHeaderRow.get(j).getHeaderCells());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    private Paragraph buildTextBlock(List<AbstractTextContainer> wordBlockList, String lastHeadline) {

        Paragraph paragraph = new Paragraph();
        TextBlock textBlock = null;
@@ -84,12 +219,6 @@ public class SectionsBuilderService {
                } else {
                    table.setHeadline("Table in: " + lastHeadline);
                }
-                // Distribute header information for subsequent tables
-                if (previousTable != null && hasInvalidHeaderInformation(table) && hasValidHeaderInformation(previousTable) &&
-                        (previousTable.isVerticalHeader() && previousTable.getRowCount() == table.getRowCount() ||
-                                previousTable.getColCount() == table.getColCount())) {
-                    table.setHeaders(previousTable.getHeaders());
-                }

                if (textBlock != null && !alreadyAdded) {
                    paragraph.getPageBlocks().add(textBlock);
@@ -141,14 +270,35 @@ public class SectionsBuilderService {

    private boolean hasInvalidHeaderInformation(Table table) {

-        if (CollectionUtils.isEmpty(table.getHeaders())) {
-            return true;
-        }
-        if (table.getHeaders().stream().anyMatch(StringUtils::isEmpty)) {
-            return true;
+        return table.getRows()
+                .stream()
+                .flatMap(row -> row.stream().filter(cell -> CollectionUtils.isNotEmpty(cell.getHeaderCells())))
+                .findAny()
+                .isEmpty();
+
+    }
+
+
+    private List<Cell> getRowWithNonHeaderCells(Table table) {
+
+        for (int i = table.getRowCount() - 1; i >= 0; i--) { // Non header rows are most likely at bottom of table
+            List<Cell> row = table.getRows().get(i);
+            if (row.size() == 1) {
+                continue;
+            }
+            boolean allNonHeader = true;
+            for (Cell cell : row) {
+                if (cell.isHeaderCell()) {
+                    allNonHeader = false;
+                    break;
+                }
+            }
+            if (allNonHeader) {
+                return row;
+            }
        }

-        return false;
+        return Collections.emptyList();

    }

@@ -7,12 +7,11 @@ import lombok.Data;
@Data
@ConfigurationProperties("redaction-service")
 public class RedactionServiceSettings {
+    
+    private int numberOfSurroundingWords = 3;

-    /**
-     * Tenant used in single tenant mode.
-     */
-    private String  defaultTenant = "iqser-id";
+    private int surroundingWordsOffsetWindow = 100;

-    private int flattenImageDpi = 100;
+    private boolean enableImageClassification = true;

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

+import com.iqser.red.service.redaction.v1.model.Rectangle;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -22,4 +24,16 @@ public abstract class AbstractTextContainer {
        return this.minX <= other.minX && this.maxX >= other.maxX && this.minY >= other.minY && this.maxY <= other.maxY;
    }

+    public boolean contains(Rectangle other) {
+        return page == other.getPage() && this.minX <= other.getTopLeft().getX() && this.maxX >= other.getTopLeft().getX() + other.getWidth() && this.minY <= other.getTopLeft().getY()  && this.maxY >= other.getTopLeft().getY() + other.getHeight();
+    }
+
+    public float getHeight() {
+        return maxY - minY;
+    }
+
+    public float getWidth() {
+        return maxX - minX;
+    }
+
 }
@@ -2,20 +2,29 @@ package com.iqser.red.service.redaction.v1.server.tableextraction.model;

 import java.awt.geom.Point2D;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;

 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
+import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;

 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

@SuppressWarnings("serial")
@Data
@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
 public class Cell extends Rectangle {

    private List<TextBlock> textBlocks = new ArrayList<>();

+    private List<Cell> headerCells = new ArrayList<>();
+
+    private boolean isHeaderCell;
+

    public Cell(Point2D topLeft, Point2D bottomRight) {

@@ -29,4 +38,40 @@ public class Cell extends Rectangle {
        textBlocks.add(textBlock);
    }

-}
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+
+
+        Iterator<TextBlock> itty = textBlocks.iterator();
+        TextPositionSequence previous = null;
+        while (itty.hasNext()) {
+
+            TextBlock textBlock = itty.next();
+
+            for (TextPositionSequence word : textBlock.getSequences()) {
+                if (previous != null) {
+                    if (Math.abs(previous.getRotationAdjustedY() - word.getRotationAdjustedY()) > word.getTextHeight()) {
+                        sb.append('\n');
+                    } else {
+                        sb.append(' ');
+                    }
+                }
+                sb.append(word.toString());
+                previous = word;
+            }
+
+        }
+
+        return TextNormalizationUtilities.removeHyphenLineBreaks(sb.toString())
+                .replaceAll("\n", " ")
+                .replaceAll(" {2}", " ");
+    }
+
+
+
+
+
+}
@@ -0,0 +1,22 @@
+package com.iqser.red.service.redaction.v1.server.tableextraction.model;
+
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
+
+@Value
+@RequiredArgsConstructor
+public class CellPosition implements Comparable<CellPosition> {
+
+    int row;
+
+    int col;
+
+
+    @Override
+    public int compareTo(CellPosition other) {
+
+        int rowDiff = row - other.row;
+        return rowDiff != 0 ? rowDiff : col - other.col;
+    }
+
+}
@@ -8,12 +8,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.stream.Collectors;

 import org.apache.commons.collections4.CollectionUtils;

 import com.iqser.red.service.redaction.v1.server.classification.model.TextBlock;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;
 import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;

 import lombok.Getter;
@@ -31,22 +29,18 @@ public class Table extends AbstractTextContainer {
    @Setter
    private String headline;

-    @Getter
-    private int rowCount;
+    private int unrotatedRowCount;

-    @Getter
-    private int colCount;
+    private int unrotatedColCount;
+
+    private int rowCount = -1;
+
+    private int colCount = -1;

    private final int rotation;

    private List<List<Cell>> rows;

-    @Getter
-    @Setter
-    private List<String> headers;
-
-    @Getter
-    private boolean verticalHeader;

    public Table(List<Cell> cells, Rectangle area, int rotation) {

@@ -65,7 +59,17 @@ public class Table extends AbstractTextContainer {

        if (rows == null) {
            rows = computeRows();
-            headers = computeHeaders();
+
+            // Ignore rows that does not contain any cells and values.
+            List<List<Cell>> rowsToRemove = new ArrayList<>();
+            for (List<Cell> row: rows){
+                if (row.size() == 1 && row.get(0).getTextBlocks().isEmpty()){
+                    rowsToRemove.add(row);
+                }
+            }
+            rows.removeAll(rowsToRemove);
+
+            computeHeaders();
        }

        return rows;
@@ -73,72 +77,82 @@ public class Table extends AbstractTextContainer {
    }


+    public int getRowCount() {
+
+        if (rowCount == -1) {
+            rowCount = getRows().size();
+        }
+        return rowCount;
+    }
+
+
+    public int getColCount() {
+
+        if (colCount == -1) {
+            colCount = getRows().stream().mapToInt(List::size).max().orElse(0);
+        }
+        return colCount;
+
+    }
+
+
    /**
     * Detect header cells (either first row or first column):
     * Column is marked as header if cell text is bold and row cell text is not bold.
     * Defaults to row.
     */
-    private List<String> computeHeaders() {
+    private void computeHeaders() {

-        boolean allBold = true;
-        if (rows.isEmpty()) {
-            return Collections.emptyList();
+        if (rows == null) {
+            rows = computeRows();
        }
-        List<Cell> rowCells = rows.get(0);
-        for (Cell cell : rowCells) {
-            if (cell == null || CollectionUtils.isEmpty(cell.getTextBlocks()) ||
-                    !cell.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
-                allBold = false;
-                break;
+        // A bold cell is a header cell as long as every cell to the left/top is bold, too
+        // we move from left to right and top to bottom
+        for (int rowIndex = 0; rowIndex < rows.size(); rowIndex++) {
+            List<Cell> rowCells = rows.get(rowIndex);
+            if(rowCells.size() == 1){
+                continue;
            }
-        }
-        if (!allBold) {
-            allBold = true;
-            List<Cell> firstColCells = new ArrayList<>();
-            for (List<Cell> row : rows) {
-                Cell firstInRow = row.get(0);
-                if (firstInRow == null || CollectionUtils.isEmpty(firstInRow.getTextBlocks()) ||
-                        !firstInRow.getTextBlocks().get(0).getMostPopularWordStyle().equals("bold")) {
-                    allBold = false;
-                    break;
-                }
-                firstColCells.add(firstInRow);
-            }
-            if (allBold) {
-                log.info("Headers are in first column");
-                verticalHeader = true;
-                return firstColCells.stream().map(cell -> {
-                    if (CollectionUtils.isNotEmpty(cell.getTextBlocks())) {
-                        return TextNormalizationUtilities.removeHyphenLineBreaks(cell.getTextBlocks().get(0).getText())
-                                .replaceAll("\n", " ")
-                                .replaceAll(" ", " ");
+
+            for (int colIndex = 0; colIndex < rowCells.size(); colIndex++) {
+                Cell cell = rowCells.get(colIndex);
+                List<Cell> cellsToTheLeft = rowCells.subList(0, colIndex);
+                Cell lastHeaderCell = null;
+                for (Cell leftCell : cellsToTheLeft) {
+                    if (leftCell.isHeaderCell()) {
+                        lastHeaderCell = leftCell;
                    } else {
-                        return null;
+                        break;
                    }
-                }).collect(Collectors.toList());
-            } else {
-                log.info("Headers are defaulted in first row.");
-                return rowCells.stream().map(cell -> {
-                    if (cell != null && CollectionUtils.isNotEmpty(cell.getTextBlocks())) {
-                        return TextNormalizationUtilities.removeHyphenLineBreaks(cell.getTextBlocks().get(0).getText())
-                                .replaceAll("\n", " ")
-                                .replaceAll(" ", " ");
-                    } else {
-                        return null;
-                    }
-                }).collect(Collectors.toList());
-            }
-        } else {
-            log.info("Headers are in first row.");
-            return rowCells.stream().map(cell -> {
-                if (CollectionUtils.isNotEmpty(cell.getTextBlocks())) {
-                    return TextNormalizationUtilities.removeHyphenLineBreaks(cell.getTextBlocks().get(0).getText())
-                            .replaceAll("\n", " ")
-                            .replaceAll(" ", " ");
-                } else {
-                    return null;
                }
-            }).collect(Collectors.toList());
+                if (lastHeaderCell != null) {
+                    cell.getHeaderCells().add(lastHeaderCell);
+                }
+                List<Cell> cellsToTheTop = new ArrayList<>();
+                for (int i = 0; i < rowIndex; i++) {
+                    try {
+                        cellsToTheTop.add(rows.get(i).get(colIndex));
+                    } catch (IndexOutOfBoundsException e) {
+                        log.debug("No cell {} in row {}, ignoring.", colIndex, rowIndex);
+                    }
+                }
+                for (Cell topCell : cellsToTheTop) {
+                    if (topCell.isHeaderCell()) {
+                        lastHeaderCell = topCell;
+                    } else {
+                        break;
+                    }
+                }
+                if (lastHeaderCell != null) {
+                    cell.getHeaderCells().add(lastHeaderCell);
+                }
+                if (CollectionUtils.isNotEmpty(cell.getTextBlocks()) && cell.getTextBlocks()
+                        .get(0)
+                        .getMostPopularWordStyle()
+                        .equals("bold")) {
+                    cell.setHeaderCell(true);
+                }
+            }
        }

    }
@@ -148,29 +162,35 @@ public class Table extends AbstractTextContainer {

        List<List<Cell>> rows = new ArrayList<>();
        if (rotation == 90) {
-            for (int i = 0; i < colCount; i++) { // rows
+            for (int i = 0; i < unrotatedColCount; i++) { // rows
                List<Cell> lastRow = new ArrayList<>();
-                for (int j = rowCount - 1; j >= 0; j--) { // cols
+                for (int j = unrotatedRowCount - 1; j >= 0; j--) { // cols
                    Cell cell = cells.get(new CellPosition(j, i));
-                    lastRow.add(cell);
+                    if (cell != null) {
+                        lastRow.add(cell);
+                    }
                }
                rows.add(lastRow);
            }
        } else if (rotation == 270) {
-            for (int i = colCount - 1; i >= 0; i--) { // rows
+            for (int i = unrotatedColCount - 1; i >= 0; i--) { // rows
                List<Cell> lastRow = new ArrayList<>();
-                for (int j = 0; j < rowCount; j++) { // cols
+                for (int j = 0; j < unrotatedRowCount; j++) { // cols
                    Cell cell = cells.get(new CellPosition(i, j));
-                    lastRow.add(cell);
+                    if (cell != null) {
+                        lastRow.add(cell);
+                    }
                }
                rows.add(lastRow);
            }
        } else {
-            for (int i = 0; i < rowCount; i++) {
+            for (int i = 0; i < unrotatedRowCount; i++) {
                List<Cell> lastRow = new ArrayList<>();
-                for (int j = 0; j < colCount; j++) {
+                for (int j = 0; j < unrotatedColCount; j++) {
                    Cell cell = cells.get(new CellPosition(i, j)); // JAVA_8 use getOrDefault()
-                    lastRow.add(cell);
+                    if (cell != null) {
+                        lastRow.add(cell);
+                    }
                }
                rows.add(lastRow);
            }
@@ -183,8 +203,8 @@ public class Table extends AbstractTextContainer {

    private void add(Cell chunk, int row, int col) {

-        rowCount = Math.max(rowCount, row + 1);
-        colCount = Math.max(colCount, col + 1);
+        unrotatedRowCount = Math.max(unrotatedRowCount, row + 1);
+        unrotatedColCount = Math.max(unrotatedColCount, col + 1);

        CellPosition cp = new CellPosition(row, col);
        cells.put(cp, chunk);
@@ -220,20 +240,21 @@ public class Table extends AbstractTextContainer {
            while (rowCells.hasNext()) {
                Cell cell = rowCells.next();
                if (i > 0) {
-                    List<List<Cell>> others = rowsOfCells(si.contains(new Rectangle(cell.getBottom(), si.getBounds()
-                            .getLeft(), cell.getLeft() - si.getBounds().getLeft() + 1, si.getBounds().getBottom() - cell
-                            .getBottom())));
+                    Rectangle rectangle = new Rectangle(cell.getBottom(),
+                            si.getBounds().getLeft(),
+                            cell.getLeft() - si.getBounds().getLeft() + 1,
+                            si.getBounds().getBottom() - cell.getBottom());
+                    List<List<Cell>> others = rowsOfCells(si.contains(rectangle));

                    for (List<Cell> r : others) {
                        jumpToColumn = Math.max(jumpToColumn, r.size());
                    }
-                }

-                while (startColumn != jumpToColumn) {
-                    add(previousNonNullCellForColumnIndex.get(startColumn), i, startColumn);
-                    startColumn++;
+                    while (startColumn != jumpToColumn) {
+                        add(previousNonNullCellForColumnIndex.get(startColumn), i, startColumn);
+                        startColumn++;
+                    }
                }
-
                add(cell, i, startColumn);
                previousNonNullCellForColumnIndex.put(startColumn, cell);
                startColumn++;
@@ -243,26 +264,23 @@ public class Table extends AbstractTextContainer {
    }


-    private static List<List<Cell>> rowsOfCells(List<Cell> cells) {
+    private List<List<Cell>> rowsOfCells(List<Cell> cells) {

-        Cell c;
-        float lastTop;
        List<List<Cell>> rv = new ArrayList<>();
-        List<Cell> lastRow;

        if (cells.isEmpty()) {
            return rv;
        }
-
        cells.sort(Comparator.comparingDouble(Rectangle::getLeft));

-        cells.sort(Collections.reverseOrder((arg0, arg1) -> Float.compare(Utils.round(arg0.getBottom(), 2), Utils.round(arg1
+        cells.sort(Collections.reverseOrder((arg0, arg1) -> Float.compare(Utils.round(arg0.getBottom(), 2),
+                Utils.round(arg1
                .getBottom(), 2))));

        Iterator<Cell> iter = cells.iterator();
-        c = iter.next();
-        lastTop = c.getBottom();
-        lastRow = new ArrayList<>();
+        Cell c = iter.next();
+        float lastTop = c.getBottom();
+        List<Cell> lastRow = new ArrayList<>();
        lastRow.add(c);
        rv.add(lastRow);

@@ -349,51 +367,4 @@ public class Table extends AbstractTextContainer {
        return sb.toString();
    }

-
-    static class CellPosition implements Comparable<CellPosition> {
-
-        CellPosition(int row, int col) {
-
-            this.row = row;
-            this.col = col;
-        }
-
-
-        final int row;
-        final int col;
-
-
-        @Override
-        public int hashCode() {
-
-            return row + 101 * col;
-        }
-
-
-        @Override
-        public boolean equals(Object obj) {
-
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            CellPosition other = (CellPosition) obj;
-            return row == other.row && col == other.col;
-        }
-
-
-        @Override
-        public int compareTo(CellPosition other) {
-
-            int rowDiff = row - other.row;
-            return rowDiff != 0 ? rowDiff : col - other.col;
-        }
-
-    }
-
 }
@@ -18,9 +18,10 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;
@Service
 public class RulingCleaningService {

-    public CleanRulings getCleanRulings(List<Ruling> rulings, float minCharWidth, float minCharHeight){
+    public CleanRulings getCleanRulings(List<Ruling> rulings, float minCharWidth, float maxCharHeight) {
+
        if (!rulings.isEmpty()) {
-            snapPoints(rulings, minCharWidth , minCharHeight);
+            snapPoints(rulings, minCharWidth, maxCharHeight);
        }

        List<Ruling> vrs = new ArrayList<>();
@@ -39,13 +40,10 @@ public class RulingCleaningService {
        }
        List<Ruling> horizontalRulingLines = collapseOrientedRulings(hrs);

-        return CleanRulings
-                .builder()
-                .vertical(verticalRulingLines)
-                .horizontal(horizontalRulingLines)
-                .build();
+        return CleanRulings.builder().vertical(verticalRulingLines).horizontal(horizontalRulingLines).build();
    }

+
    public void snapPoints(List<? extends Line2D.Float> rulings, float xThreshold, float yThreshold) {

        // collect points and keep a Line -> p1,p2 map
@@ -122,12 +120,14 @@ public class RulingCleaningService {


    private List<Ruling> collapseOrientedRulings(List<Ruling> lines) {
+
        int COLINEAR_OR_PARALLEL_PIXEL_EXPAND_AMOUNT = 1;
        return collapseOrientedRulings(lines, COLINEAR_OR_PARALLEL_PIXEL_EXPAND_AMOUNT);
    }


    private List<Ruling> collapseOrientedRulings(List<Ruling> lines, int expandAmount) {
+
        ArrayList<Ruling> rv = new ArrayList<>();
        lines.sort((a, b) -> {
            final float diff = a.getPosition() - b.getPosition();
@@ -141,25 +141,24 @@ public class RulingCleaningService {
                final float lastStart = last.getStart();
                final float lastEnd = last.getEnd();

-                final boolean lastFlipped = lastStart            > lastEnd;
+                final boolean lastFlipped = lastStart > lastEnd;
                final boolean nextFlipped = next_line.getStart() > next_line.getEnd();

                boolean differentDirections = nextFlipped != lastFlipped;
-                float nextS = differentDirections ? next_line.getEnd()   : next_line.getStart();
+                float nextS = differentDirections ? next_line.getEnd() : next_line.getStart();
                float nextE = differentDirections ? next_line.getStart() : next_line.getEnd();

                final float newStart = lastFlipped ? Math.max(nextS, lastStart) : Math.min(nextS, lastStart);
-                final float newEnd   = lastFlipped ? Math.min(nextE, lastEnd)   : Math.max(nextE, lastEnd);
+                final float newEnd = lastFlipped ? Math.min(nextE, lastEnd) : Math.max(nextE, lastEnd);
                last.setStartEnd(newStart, newEnd);
                assert !last.oblique();
-            }
-            else if (next_line.length() == 0) {
+            } else if (next_line.length() == 0) {
                continue;
-            }
-            else {
+            } else {
                rv.add(next_line);
            }
        }
        return rv;
    }
+
 }
@@ -2,7 +2,6 @@ package com.iqser.red.service.redaction.v1.server.tableextraction.service;

 import java.awt.geom.Point2D;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -25,26 +24,29 @@ import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
 import com.iqser.red.service.redaction.v1.server.tableextraction.utils.Utils;

@Service
-@SuppressWarnings("all")
 public class TableExtractionService {

-    public void extractTables(CleanRulings cleanRulings, Page page){
+    public void extractTables(CleanRulings cleanRulings, Page page) {

        List<Cell> cells = findCells(cleanRulings.getHorizontal(), cleanRulings.getVertical());

-        Iterator<AbstractTextContainer> itty = page.getTextBlocks().iterator();
-        while (itty.hasNext()) {
-            TextBlock textBlock = (TextBlock) itty.next();
+        List<TextBlock> toBeRemoved = new ArrayList<>();
+
+        for (AbstractTextContainer abstractTextContainer : page.getTextBlocks()) {
+            TextBlock textBlock = (TextBlock) abstractTextContainer;
            for (Cell cell : cells) {
                if (cell.intersects(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(), textBlock.getHeight())) {
                    cell.addTextBlock(textBlock);
+                    toBeRemoved.add(textBlock);
                    break;
                }
            }
        }

-        List<Rectangle> spreadsheetAreas = findSpreadsheetsFromCells(cells)
-                .stream()
+        cells = new ArrayList<>(new HashSet<>(cells));
+        Utils.sort(cells, Rectangle.ILL_DEFINED_ORDER);
+
+        List<Rectangle> spreadsheetAreas = findSpreadsheetsFromCells(cells).stream()
                .filter(r -> r.getWidth() > 0f && r.getHeight() > 0f)
                .collect(Collectors.toList());

@@ -63,33 +65,32 @@ public class TableExtractionService {
        for (Table table : tables) {
            int position = -1;

-            itty = page.getTextBlocks().iterator();
+            Iterator<AbstractTextContainer> itty = page.getTextBlocks().iterator();
            while (itty.hasNext()) {
-                AbstractTextContainer textBlock = (AbstractTextContainer) itty.next();
-                if (table.contains(textBlock)) {
-                    if (position == -1) {
-                        position = page.getTextBlocks().indexOf(textBlock);
-                    }
-                    itty.remove();
+                AbstractTextContainer textBlock = itty.next();
+                if (table.contains(textBlock) && position == -1) {
+                    position = page.getTextBlocks().indexOf(textBlock);
                }
            }
            if (position != -1) {
                page.getTextBlocks().add(position, table);
            }
        }
+
+        page.getTextBlocks().removeAll(toBeRemoved);
    }

+
    public List<Cell> findCells(List<Ruling> horizontalRulingLines, List<Ruling> verticalRulingLines) {
+
        List<Cell> cellsFound = new ArrayList<>();
        Map<Point2D, Ruling[]> intersectionPoints = Ruling.findIntersections(horizontalRulingLines, verticalRulingLines);
        List<Point2D> intersectionPointsList = new ArrayList<>(intersectionPoints.keySet());
-        Collections.sort(intersectionPointsList, POINT_COMPARATOR);
-        boolean doBreak;
+        intersectionPointsList.sort(POINT_COMPARATOR);

        for (int i = 0; i < intersectionPointsList.size(); i++) {
            Point2D topLeft = intersectionPointsList.get(i);
            Ruling[] hv = intersectionPoints.get(topLeft);
-            doBreak = false;

            // CrossingPointsDirectlyBelow( topLeft );
            List<Point2D> xPoints = new ArrayList<>();
@@ -106,10 +107,6 @@ public class TableExtractionService {
            }
            outer:
            for (Point2D xPoint : xPoints) {
-                if (doBreak) {
-                    break;
-                }
-
                // is there a vertical edge b/w topLeft and xPoint?
                if (!hv[1].equals(intersectionPoints.get(xPoint)[1])) {
                    continue;
@@ -120,11 +117,9 @@ public class TableExtractionService {
                        continue;
                    }
                    Point2D btmRight = new Point2D.Float((float) yPoint.getX(), (float) xPoint.getY());
-                    if (intersectionPoints.containsKey(btmRight)
-                            && intersectionPoints.get(btmRight)[0].equals(intersectionPoints.get(xPoint)[0])
-                            && intersectionPoints.get(btmRight)[1].equals(intersectionPoints.get(yPoint)[1])) {
+                    if (intersectionPoints.containsKey(btmRight) && intersectionPoints.get(btmRight)[0].equals(intersectionPoints
+                            .get(xPoint)[0]) && intersectionPoints.get(btmRight)[1].equals(intersectionPoints.get(yPoint)[1])) {
                        cellsFound.add(new Cell(topLeft, btmRight));
-                        doBreak = true;
                        break outer;
                    }
                }
@@ -139,7 +134,7 @@ public class TableExtractionService {
    }


-    public List<Rectangle> findSpreadsheetsFromCells(List<? extends Rectangle> cells) {
+    private List<Rectangle> findSpreadsheetsFromCells(List<? extends Rectangle> cells) {
        // via: http://stackoverflow.com/questions/13746284/merging-multiple-adjacent-rectangles-into-one-polygon
        List<Rectangle> rectangles = new ArrayList<>();
        Set<Point2D> pointSet = new HashSet<>();
@@ -147,10 +142,6 @@ public class TableExtractionService {
        Map<Point2D, Point2D> edgesV = new HashMap<>();
        int i = 0;

-        cells = new ArrayList<>(new HashSet<>(cells));
-
-        Utils.sort(cells, Rectangle.ILL_DEFINED_ORDER);
-
        for (Rectangle cell : cells) {
            for (Point2D pt : cell.getPoints()) {
                if (pointSet.contains(pt)) { // shared vertex, remove it
@@ -163,10 +154,10 @@ public class TableExtractionService {

        // X first sort
        List<Point2D> pointsSortX = new ArrayList<>(pointSet);
-        Collections.sort(pointsSortX, X_FIRST_POINT_COMPARATOR);
+        pointsSortX.sort(X_FIRST_POINT_COMPARATOR);
        // Y first sort
        List<Point2D> pointsSortY = new ArrayList<>(pointSet);
-        Collections.sort(pointsSortY, POINT_COMPARATOR);
+        pointsSortY.sort(POINT_COMPARATOR);

        while (i < pointSet.size()) {
            float currY = (float) pointsSortY.get(i).getY();
@@ -203,13 +194,12 @@ public class TableExtractionService {
                    nextVertex = edgesV.get(curr.point);
                    edgesV.remove(curr.point);
                    lastAddedVertex = new PolygonVertex(nextVertex, Direction.VERTICAL);
-                    polygon.add(lastAddedVertex);
                } else {
                    nextVertex = edgesH.get(curr.point);
                    edgesH.remove(curr.point);
                    lastAddedVertex = new PolygonVertex(nextVertex, Direction.HORIZONTAL);
-                    polygon.add(lastAddedVertex);
                }
+                polygon.add(lastAddedVertex);

                if (lastAddedVertex.equals(polygon.get(0))) {
                    // closed polygon
@@ -227,10 +217,10 @@ public class TableExtractionService {

        // calculate grid-aligned minimum area rectangles for each found polygon
        for (List<PolygonVertex> poly : polygons) {
-            float top = java.lang.Float.MAX_VALUE;
-            float left = java.lang.Float.MAX_VALUE;
-            float bottom = java.lang.Float.MIN_VALUE;
-            float right = java.lang.Float.MIN_VALUE;
+            float top = Float.MAX_VALUE;
+            float left = Float.MAX_VALUE;
+            float bottom = Float.MIN_VALUE;
+            float right = Float.MIN_VALUE;
            for (PolygonVertex pt : poly) {
                top = (float) Math.min(top, pt.point.getY());
                left = (float) Math.min(left, pt.point.getX());
@@ -244,69 +234,66 @@ public class TableExtractionService {
    }


-    private static final Comparator<Point2D> X_FIRST_POINT_COMPARATOR = new Comparator<Point2D>() {
-        @Override
-        public int compare(Point2D arg0, Point2D arg1) {
-            int rv = 0;
-            float arg0X = Utils.round(arg0.getX(), 2);
-            float arg0Y = Utils.round(arg0.getY(), 2);
-            float arg1X = Utils.round(arg1.getX(), 2);
-            float arg1Y = Utils.round(arg1.getY(), 2);
+    private static final Comparator<Point2D> X_FIRST_POINT_COMPARATOR = (arg0, arg1) -> {

-            if (arg0X > arg1X) {
-                rv = 1;
-            } else if (arg0X < arg1X) {
-                rv = -1;
-            } else if (arg0Y > arg1Y) {
-                rv = 1;
-            } else if (arg0Y < arg1Y) {
-                rv = -1;
-            }
-            return rv;
+        int rv = 0;
+        float arg0X = Utils.round(arg0.getX(), 2);
+        float arg0Y = Utils.round(arg0.getY(), 2);
+        float arg1X = Utils.round(arg1.getX(), 2);
+        float arg1Y = Utils.round(arg1.getY(), 2);
+
+        if (arg0X > arg1X) {
+            rv = 1;
+        } else if (arg0X < arg1X) {
+            rv = -1;
+        } else if (arg0Y > arg1Y) {
+            rv = 1;
+        } else if (arg0Y < arg1Y) {
+            rv = -1;
        }
+        return rv;
    };

+    private static final Comparator<Point2D> POINT_COMPARATOR = (arg0, arg1) -> {

-    private static final Comparator<Point2D> POINT_COMPARATOR = new Comparator<Point2D>() {
-        @Override
-        public int compare(Point2D arg0, Point2D arg1) {
-            int rv = 0;
-            float arg0X = Utils.round(arg0.getX(), 2);
-            float arg0Y = Utils.round(arg0.getY(), 2);
-            float arg1X = Utils.round(arg1.getX(), 2);
-            float arg1Y = Utils.round(arg1.getY(), 2);
+        int rv = 0;
+        float arg0X = Utils.round(arg0.getX(), 2);
+        float arg0Y = Utils.round(arg0.getY(), 2);
+        float arg1X = Utils.round(arg1.getX(), 2);
+        float arg1Y = Utils.round(arg1.getY(), 2);

-
-            if (arg0Y > arg1Y) {
-                rv = 1;
-            } else if (arg0Y < arg1Y) {
-                rv = -1;
-            } else if (arg0X > arg1X) {
-                rv = 1;
-            } else if (arg0X < arg1X) {
-                rv = -1;
-            }
-            return rv;
+        if (arg0Y > arg1Y) {
+            rv = 1;
+        } else if (arg0Y < arg1Y) {
+            rv = -1;
+        } else if (arg0X > arg1X) {
+            rv = 1;
+        } else if (arg0X < arg1X) {
+            rv = -1;
        }
+        return rv;
    };

-
    private enum Direction {
-        HORIZONTAL,
-        VERTICAL
+        HORIZONTAL, VERTICAL
    }

    static class PolygonVertex {
+
        Point2D point;
        Direction direction;

-        public PolygonVertex(Point2D point, Direction direction) {
+
+        PolygonVertex(Point2D point, Direction direction) {
+
            this.direction = direction;
            this.point = point;
        }

+
        @Override
        public boolean equals(Object other) {
+
            if (this == other) {
                return true;
            }
@@ -316,15 +303,21 @@ public class TableExtractionService {
            return this.point.equals(((PolygonVertex) other).point);
        }

+
        @Override
        public int hashCode() {
+
            return this.point.hashCode();
        }

+
        @Override
        public String toString() {
-            return String.format("%s[point=%s,direction=%s]", this.getClass().getName(), this.point.toString(), this.direction.toString());
+
+            return String.format("%s[point=%s,direction=%s]", this.getClass()
+                    .getName(), this.point.toString(), this.direction.toString());
        }
+
    }

 }
@@ -0,0 +1,111 @@
+package com.iqser.red.service.redaction.v1.server.tableextraction.utils;
+
+import java.util.ArrayDeque;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.List;
+
+/**
+ * Copied and minimal modified from PDFBox.
+ */
+public final class QuickSort {
+
+    private QuickSort() {
+
+    }
+
+
+    private static final Comparator<? extends Comparable> OBJCOMP = new Comparator<Comparable>() {
+        @Override
+        public int compare(Comparable object1, Comparable object2) {
+
+            return object1.compareTo(object2);
+        }
+    };
+
+
+    /**
+     * Sorts the given list using the given comparator.
+     *
+     * @param <T>  type of the objects to be sorted.
+     * @param list list to be sorted
+     * @param cmp  comparator used to compare the objects within the list
+     */
+    public static <T> void sort(List<T> list, Comparator<? super T> cmp) {
+
+        int size = list.size();
+        if (size < 2) {
+            return;
+        }
+        quicksort(list, cmp);
+    }
+
+
+    /**
+     * Sorts the given list using compareTo as comparator.
+     *
+     * @param <T>  type of the objects to be sorted.
+     * @param list list to be sorted
+     */
+    public static <T extends Comparable> void sort(List<T> list) {
+
+        sort(list, (Comparator<T>) OBJCOMP);
+    }
+
+
+    private static <T> void quicksort(List<T> list, Comparator<? super T> cmp) {
+
+        Deque<Integer> stack = new ArrayDeque<Integer>();
+        stack.push(0);
+        stack.push(list.size());
+        while (!stack.isEmpty()) {
+            int right = stack.pop();
+            int left = stack.pop();
+            if (right - left < 2) {
+                continue;
+            }
+            int p = left + ((right - left) / 2);
+            p = partition(list, cmp, p, left, right);
+
+            stack.push(p + 1);
+            stack.push(right);
+
+            stack.push(left);
+            stack.push(p);
+        }
+    }
+
+
+    private static <T> int partition(List<T> list, Comparator<? super T> cmp, int p, int start, int end) {
+
+        int l = start;
+        int h = end - 2;
+        T piv = list.get(p);
+        swap(list, p, end - 1);
+
+        while (l < h) {
+            if (cmp.compare(list.get(l), piv) <= 0) {
+                l++;
+            } else if (cmp.compare(piv, list.get(h)) <= 0) {
+                h--;
+            } else {
+                swap(list, l, h);
+            }
+        }
+        int idx = h;
+        if (cmp.compare(list.get(h), piv) < 0) {
+            idx++;
+        }
+        swap(list, end - 1, idx);
+        return idx;
+    }
+
+
+    private static <T> void swap(List<T> list, int i, int j) {
+
+        T tmp = list.get(i);
+        list.set(i, list.get(j));
+        list.set(j, tmp);
+    }
+
+}
@@ -1,7 +1,6 @@
 package com.iqser.red.service.redaction.v1.server.tableextraction.utils;

 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;

@@ -13,23 +12,29 @@ public class Utils {

    private final static float EPSILON = 0.1f;

+
    public static boolean feq(double f1, double f2) {
+
        return (Math.abs(f1 - f2) < EPSILON);
    }

+
    public static float round(double d, int decimalPlace) {
+
        BigDecimal bd = BigDecimal.valueOf(d);
        bd = bd.setScale(decimalPlace, BigDecimal.ROUND_HALF_UP);
        return bd.floatValue();
    }

-	public static <T> void sort(List<T> list, Comparator<? super T> comparator) {
+
+    public static <T> void sort(List<T> list, Comparator<? super T> comparator) {
+
        try {
-            Collections.sort(list, comparator);
-        } catch (IllegalArgumentException e){
-            //TODO Figure out why this happens.
+            QuickSort.sort(list, comparator);
+        } catch (IllegalArgumentException e) {
+            // This should not happen since we use QuickSort from PDFBox
            log.warn(e.getMessage());
        }
-	}
+    }

 }
@@ -1,279 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.visualization.service;
-
-import java.awt.Color;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
-import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationTextMarkup;
-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.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.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.service.DictionaryService;
-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 lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AnnotationHighlightService {
-
-    private final DictionaryService dictionaryService;
-
-
-    public void highlight(PDDocument document, Document classifiedDoc, boolean flatRedaction) throws IOException {
-
-        for (int page = 1; page <= document.getNumberOfPages(); page++) {
-
-            PDPage pdPage = document.getPage(page - 1);
-
-            if (!flatRedaction) {
-                PDPageContentStream contentStream = new PDPageContentStream(document, pdPage, PDPageContentStream.AppendMode.APPEND, true);
-
-                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) {
-                            textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
-                            visualizeTextBlock((TextBlock) textBlock, contentStream);
-                        } else if (textBlock instanceof Table) {
-                            textBlock.setClassification((i + 1) + "/" + paragraph.getPageBlocks().size());
-                            visualizeTable((Table) textBlock, contentStream);
-                        }
-
-                    }
-                }
-
-                contentStream.close();
-            }
-
-            if (classifiedDoc.getEntities().get(page) == null) {
-                continue;
-            }
-
-            for (Entity entity : classifiedDoc.getEntities().get(page)) {
-
-                RedactionLogEntry redactionLogEntry = new RedactionLogEntry();
-
-                for (EntityPositionSequence entityPositionSequence : entity.getPositionSequences()) {
-
-                    if (flatRedaction && !isRedactionType(entity)) {
-                        continue;
-                    }
-
-                    for (TextPositionSequence textPositions : entityPositionSequence.getSequences()) {
-
-                        float height = textPositions.getTextPositions().get(0).getHeightDir() + 2;
-
-                        float posXInit;
-                        float posXEnd;
-                        float posYInit;
-                        float posYEnd;
-
-                        if (textPositions.getTextPositions().get(0).getRotation() == 90) {
-
-                            posXEnd = textPositions.getTextPositions().get(0).getYDirAdj() + 2;
-                            posXInit = textPositions.getTextPositions().get(0).getYDirAdj() - height;
-                            posYInit = textPositions.getTextPositions().get(0).getXDirAdj();
-                            posYEnd = textPositions.getTextPositions()
-                                    .get(textPositions.getTextPositions().size() - 1)
-                                    .getXDirAdj() - height + 4;
-                        } else {
-
-                            posXInit = textPositions.getTextPositions().get(0).getXDirAdj();
-                            posXEnd = textPositions.getTextPositions()
-                                    .get(textPositions.getTextPositions().size() - 1)
-                                    .getXDirAdj() + textPositions.getTextPositions()
-                                    .get(textPositions.getTextPositions().size() - 1)
-                                    .getWidth() + 1;
-                            posYInit = textPositions.getTextPositions()
-                                    .get(0)
-                                    .getPageHeight() - textPositions.getTextPositions().get(0).getYDirAdj() - 2;
-                            posYEnd = textPositions.getTextPositions()
-                                    .get(0)
-                                    .getPageHeight() - textPositions.getTextPositions()
-                                    .get(textPositions.getTextPositions().size() - 1)
-                                    .getYDirAdj() + 2;
-                        }
-
-                        Rectangle textHighlightRectangle = new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
-
-                        List<PDAnnotation> annotations = pdPage.getAnnotations();
-                        PDAnnotationTextMarkup highlight = new PDAnnotationTextMarkup(PDAnnotationTextMarkup.SUB_TYPE_HIGHLIGHT);
-                        highlight.constructAppearances();
-
-                        PDRectangle annotationPosition = new PDRectangle();
-                        annotationPosition.setLowerLeftX(posXInit);
-                        annotationPosition.setLowerLeftY(posYEnd);
-                        annotationPosition.setUpperRightX(posXEnd);
-                        annotationPosition.setUpperRightY(posYEnd + height);
-
-                        highlight.setRectangle(annotationPosition);
-                        if (!flatRedaction && !isHint(entity)) {
-                            highlight.setAnnotationName(entityPositionSequence.getId().toString());
-                            highlight.setTitlePopup(entityPositionSequence.getId().toString());
-                            highlight.setContents("\nRule " + entity.getMatchedRule() + " matched\n\n" + entity.getRedactionReason() + "\n\n" + "In Section : \"" + entity
-                                    .getHeadline() + "\"");
-                        }
-
-                        highlight.setQuadPoints(toQuadPoints(textHighlightRectangle));
-
-                        PDColor color;
-                        if (flatRedaction) {
-                            color = new PDColor(new float[]{0, 0, 0}, PDDeviceRGB.INSTANCE);
-                        } else {
-                            color = new PDColor(getColor(entity), PDDeviceRGB.INSTANCE);
-                        }
-
-                        highlight.setColor(color);
-                        annotations.add(highlight);
-
-                        redactionLogEntry.getPositions().add(textHighlightRectangle);
-
-                    }
-                    redactionLogEntry.setId(entityPositionSequence.getId().toString());
-                }
-                redactionLogEntry.setColor(getColor(entity));
-                redactionLogEntry.setReason(entity.getRedactionReason());
-                redactionLogEntry.setValue(entity.getWord());
-                redactionLogEntry.setType(entity.getType());
-                redactionLogEntry.setRedacted(entity.isRedaction());
-                redactionLogEntry.setSection(entity.getHeadline());
-                redactionLogEntry.setHint(isHint(entity));
-                classifiedDoc.getRedactionLogEntities().add(redactionLogEntry);
-                redactionLogEntry.setSectionNumber(entity.getSectionNumber());
-            }
-
-        }
-    }
-
-
-    private float[] toQuadPoints(Rectangle rectangle) {
-
-        // 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
-        return new float[]{rectangle.getTopLeft().getX(), rectangle.getTopLeft().getY(), rectangle.getTopLeft()
-                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY(), rectangle.getTopLeft().getX(), rectangle.getTopLeft()
-                .getY() + rectangle.getHeight(), rectangle.getTopLeft()
-                .getX() + rectangle.getWidth(), rectangle.getTopLeft().getY() + rectangle.getHeight()};
-    }
-
-
-    private boolean isRedactionType(Entity entity) {
-
-        if (!entity.isRedaction()) {
-            return false;
-        }
-        if (isHint(entity)) {
-            return false;
-        }
-        return true;
-    }
-
-
-    private float[] getColor(Entity entity) {
-
-        if (!entity.isRedaction() && !isHint(entity)) {
-            return new float[]{0.627f, 0.627f, 0.627f};
-        }
-
-        if (!dictionaryService.getEntryColors().containsKey(entity.getType())) {
-            return dictionaryService.getDefaultColor();
-        }
-
-        return dictionaryService.getEntryColors().get(entity.getType());
-    }
-
-    private boolean isHint(Entity entity) {
-        List<String> hintTypes = dictionaryService.getHintTypes();
-        if (CollectionUtils.isNotEmpty(hintTypes) && hintTypes.contains(entity.getType())) {
-            return true;
-        }
-        return false;
-    }
-
-    private void visualizeTextBlock(TextBlock textBlock, PDPageContentStream contentStream) throws IOException {
-
-        contentStream.setStrokingColor(Color.LIGHT_GRAY);
-        contentStream.setLineWidth(0.5f);
-
-        contentStream.addRect(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(), textBlock.getHeight());
-        contentStream.stroke();
-
-        if (textBlock.getClassification() != null) {
-            contentStream.beginText();
-
-            contentStream.setNonStrokingColor(Color.DARK_GRAY);
-            contentStream.setFont(PDType1Font.TIMES_ROMAN, 8f);
-
-            contentStream.newLineAtOffset(textBlock.getMinX(), textBlock.getMaxY());
-
-            contentStream.showText(textBlock.getClassification());
-
-            contentStream.endText();
-        }
-    }
-
-
-    private void visualizeTable(Table table, PDPageContentStream contentStream) throws IOException {
-
-        for (List<Cell> row : table.getRows()) {
-            for (Cell cell : row) {
-
-                if (cell != null) {
-                    contentStream.setLineWidth(0.5f);
-                    contentStream.setStrokingColor(Color.CYAN);
-                    contentStream.addRect((float) cell.getX(), (float) cell.getY(), (float) cell.getWidth(), (float) cell
-                            .getHeight());
-                    contentStream.stroke();
-
-//                    contentStream.setStrokingColor(Color.GREEN);
-//                    for (TextBlock textBlock : cell.getTextBlocks()) {
-//                        contentStream.addRect(textBlock.getMinX(), textBlock.getMinY(), textBlock.getWidth(), textBlock.getHeight());
-//                        contentStream.stroke();
-//                    }
-                }
-            }
-        }
-
-        if (table.getClassification() != null) {
-            contentStream.beginText();
-
-            contentStream.setNonStrokingColor(Color.DARK_GRAY);
-            contentStream.setFont(PDType1Font.TIMES_ROMAN, 8f);
-
-            contentStream.newLineAtOffset(table.getMinX(), table.getMinY());
-
-            contentStream.showText(table.getClassification());
-
-            contentStream.endText();
-        }
-    }
-
-}
@@ -1,68 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.visualization.service;
-
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.apache.pdfbox.rendering.ImageType;
-import org.apache.pdfbox.rendering.PDFRenderer;
-import org.springframework.stereotype.Service;
-
-import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class PdfFlattenService {
-
-    private final RedactionServiceSettings settings;
-
-    public PDDocument flattenPDF(PDDocument sourceDoc) throws IOException {
-
-        PDDocument destDoc = new PDDocument();
-
-        PDFRenderer pdfRenderer = new PDFRenderer(sourceDoc);
-
-        final int pageCount = sourceDoc.getDocumentCatalog().getPages().getCount();
-
-        log.info(pageCount + " page" + (pageCount == 1 ? "" : "s") + " to flatten.");
-
-        for (int i = 0; i < pageCount; i += 1) {
-
-            log.info("Flattening page " + (i + 1) + " of " + pageCount + "...");
-
-            BufferedImage img = pdfRenderer.renderImageWithDPI(i, settings.getFlattenImageDpi(), ImageType.RGB);
-
-            log.info("Image rendered in memory (" + img.getWidth() + "x" + img.getHeight() + " " + settings.getFlattenImageDpi() + "DPI).  Adding to PDF...");
-
-            PDPage imagePage = new PDPage(new PDRectangle(img.getWidth(), img.getHeight()));
-            destDoc.addPage(imagePage);
-
-            PDImageXObject imgObj = LosslessFactory.createFromImage(destDoc, img);
-
-            PDPageContentStream imagePageContentStream = new PDPageContentStream(destDoc, imagePage);
-            imagePageContentStream.drawImage(imgObj, 0, 0);
-
-            log.info("Image added successfully.");
-
-            imagePageContentStream.close();
-
-            img.flush();
-        }
-
-        log.info("New flattened PDF created in memory.");
-
-        sourceDoc.close();
-
-        return destDoc;
-    }
-
-}
@@ -0,0 +1,4 @@
+server:
+  port: 8083
+
+configuration-service.url: "http://localhost:8081"
@@ -1,6 +1,9 @@
 info:
  description: Redaction Service Server V1

+configuration-service.url: "http://configuration-service-v1:8080"
+image-service.url: "http://image-service-v1:8080"
+
 server:
  port: 8080

@@ -8,15 +11,10 @@ spring:
  profiles:
    active: kubernetes

-platform.multi-tenancy:
-  enabled: ${multitenancy.enabled:false}
-  tenantFilter:
-    urlPatterns: /redact
-    urlPatternsToIgnore:
-
 management:
  endpoint:
    metrics.enabled: ${monitoring.enabled:false}
    prometheus.enabled: ${monitoring.enabled:false}
+    health.enabled: true
  endpoints.web.exposure.include: prometheus, health
  metrics.export.prometheus.enabled: ${monitoring.enabled:false}
@@ -2,10 +2,6 @@ spring:
  application:
    name: redaction-service-v1

-
-management:
-  endpoints:
-    web:
-      base-path: /
-      path-mapping:
-        health: "health"
+management.endpoints:
+  web.base-path: /
+  enabled-by-default: false
@@ -1,7 +1,8 @@
 package com.iqser.red.service.redaction.v1.server;

+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -13,10 +14,13 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;

 import org.apache.commons.io.IOUtils;
@@ -36,45 +40,92 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;

-import com.iqser.red.service.configuration.v1.api.model.DefaultColor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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.DictionaryResponse;
 import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
 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.redaction.v1.model.AnalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
+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.Comment;
+import com.iqser.red.service.redaction.v1.model.IdRemoval;
+import com.iqser.red.service.redaction.v1.model.ManualForceRedact;
+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.ReanalyzeResult;
+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.model.RedactionRequest;
 import com.iqser.red.service.redaction.v1.model.RedactionResult;
+import com.iqser.red.service.redaction.v1.model.RenalyzeRequest;
+import com.iqser.red.service.redaction.v1.model.SectionText;
+import com.iqser.red.service.redaction.v1.model.Status;
 import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.ImageClassificationClient;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
 import com.iqser.red.service.redaction.v1.server.controller.RedactionController;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
 import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizationUtilities;

@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = DEFINED_PORT)
+@SpringBootTest(webEnvironment = RANDOM_PORT)
 public class RedactionIntegrationTest {

    private static final String RULES = loadFromClassPath("drools/rules.drl");
-    private static final String VERTEBRATES_CODE = "vertebrate";
-    private static final String ADDRESS_CODE = "address";
-    private static final String NAME_CODE = "name";
+    private static final String VERTEBRATE = "vertebrate";
+    private static final String ADDRESS = "CBI_address";
+    private static final String AUTHOR = "CBI_author";
+    private static final String SPONSOR = "CBI_sponsor";
    private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
    private static final String REDACTION_INDICATOR = "redaction_indicator";
    private static final String HINT_ONLY = "hint_only";
    private static final String MUST_REDACT = "must_redact";
+    private static final String PUBLISHED_INFORMATION = "published_information";
+    private static final String TEST_METHOD = "test_method";
+    private static final String PURITY = "purity";
+    private static final String IMAGE = "image";
+    private static final String LOGO = "logo";
+    private static final String SIGNATURE = "signature";
+    private static final String FORMULA = "formula";
+    private static final String OCR = "ocr";
+
+    private static final String RECOMMENDATION_AUTHOR = "recommendation_CBI_author";
+    private static final String RECOMMENDATION_ADDRESS = "recommendation_CBI_address";
+
+    private static final String FALSE_POSITIVE = "false_positive";
+
+    private static final String PII = "PII";

    @Autowired
    private RedactionController redactionController;

+    @Autowired
+    private ObjectMapper objectMapper;
+
    @MockBean
    private RulesClient rulesClient;

    @MockBean
    private DictionaryClient dictionaryClient;

+    @MockBean
+    private ImageClassificationClient imageClassificationClient;
+
    private final Map<String, List<String>> dictionary = new HashMap<>();
-    private final Map<String, float[]> typeColorMap = new HashMap<>();
+    private final Map<String, String> typeColorMap = new HashMap<>();
    private final Map<String, Boolean> hintTypeMap = new HashMap<>();
    private final Map<String, Boolean> caseInSensitiveMap = new HashMap<>();
+    private final Map<String, Boolean> recommendationTypeMap = new HashMap<>();
+    private final Map<String, Integer> rankTypeMap = new HashMap<>();
+    private final Colors colors = new Colors();
+    private final Map<String, Long> reanlysisVersions = new HashMap<>();
+
+    private final static String TEST_RULESET_ID = "123";

    @TestConfiguration
    public static class RedactionIntegrationTestConfiguration {
@@ -101,38 +152,58 @@ public class RedactionIntegrationTest {
    @Before
    public void stubClients() {

-        when(rulesClient.getVersion()).thenReturn(0L);
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(RULES));
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(0L);
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(RULES));

        loadDictionaryForTest();
        loadTypeForTest();
-        when(dictionaryClient.getVersion()).thenReturn(0L);
-        when(dictionaryClient.getAllTypes()).thenReturn(TypeResponse.builder().types(getTypeResponse()).build());
-        when(dictionaryClient.getDictionaryForType(VERTEBRATES_CODE)).thenReturn(getDictionaryResponse(VERTEBRATES_CODE));
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(getDictionaryResponse(ADDRESS_CODE));
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(getDictionaryResponse(NAME_CODE));
-        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR));
-        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
-        when(dictionaryClient.getDictionaryForType(HINT_ONLY)).thenReturn(getDictionaryResponse(HINT_ONLY));
-        when(dictionaryClient.getDictionaryForType(MUST_REDACT)).thenReturn(getDictionaryResponse(MUST_REDACT));
-        when(dictionaryClient.getDefaultColor()).thenReturn(new DefaultColor(new float[]{1f, 0.502f, 0f}));
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(0L);
+        when(dictionaryClient.getAllTypes(TEST_RULESET_ID)).thenReturn(TypeResponse.builder()
+                .types(getTypeResponse())
+                .build());
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(VERTEBRATE));
+        when(dictionaryClient.getDictionaryForType(ADDRESS, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(ADDRESS));
+        when(dictionaryClient.getDictionaryForType(AUTHOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(AUTHOR));
+        when(dictionaryClient.getDictionaryForType(SPONSOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(SPONSOR));
+        when(dictionaryClient.getDictionaryForType(NO_REDACTION_INDICATOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(NO_REDACTION_INDICATOR));
+        when(dictionaryClient.getDictionaryForType(REDACTION_INDICATOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(REDACTION_INDICATOR));
+        when(dictionaryClient.getDictionaryForType(HINT_ONLY, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(HINT_ONLY));
+        when(dictionaryClient.getDictionaryForType(MUST_REDACT, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(MUST_REDACT));
+        when(dictionaryClient.getDictionaryForType(PUBLISHED_INFORMATION, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(PUBLISHED_INFORMATION));
+        when(dictionaryClient.getDictionaryForType(TEST_METHOD, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(TEST_METHOD));
+        when(dictionaryClient.getDictionaryForType(PII, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(PII));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_AUTHOR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_AUTHOR));
+        when(dictionaryClient.getDictionaryForType(RECOMMENDATION_ADDRESS, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(RECOMMENDATION_ADDRESS));
+        when(dictionaryClient.getDictionaryForType(FALSE_POSITIVE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(FALSE_POSITIVE));
+        when(dictionaryClient.getDictionaryForType(PURITY, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(PURITY));
+        when(dictionaryClient.getDictionaryForType(IMAGE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(IMAGE));
+        when(dictionaryClient.getDictionaryForType(OCR, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(OCR));
+        when(dictionaryClient.getDictionaryForType(LOGO, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(LOGO));
+        when(dictionaryClient.getDictionaryForType(SIGNATURE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(SIGNATURE));
+        when(dictionaryClient.getDictionaryForType(FORMULA, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(FORMULA));
+        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
    }


    private void loadDictionaryForTest() {

-        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/names.txt")
+        dictionary.computeIfAbsent(AUTHOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/CBI_author.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/vertebrates.txt")
+        dictionary.computeIfAbsent(SPONSOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/CBI_sponsor.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
-        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>())
-                .addAll(ResourceLoader.load("dictionaries/addresses.txt")
+        dictionary.computeIfAbsent(VERTEBRATE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/vertebrate.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(ADDRESS, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/CBI_address.txt")
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
@@ -156,6 +227,66 @@ public class RedactionIntegrationTest {
                        .stream()
                        .map(this::cleanDictionaryEntry)
                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(PUBLISHED_INFORMATION, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/published_information.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(TEST_METHOD, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/test_method.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(PII, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/PII.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(RECOMMENDATION_AUTHOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_author.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(RECOMMENDATION_ADDRESS, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/recommendation_CBI_address.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(FALSE_POSITIVE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/false_positive.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(PURITY, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/purity.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(IMAGE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/empty.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(OCR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/empty.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(LOGO, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/empty.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(SIGNATURE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/empty.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(FORMULA, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/empty.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
    }


@@ -167,29 +298,115 @@ public class RedactionIntegrationTest {

    private void loadTypeForTest() {

-        typeColorMap.put(VERTEBRATES_CODE, new float[]{0, 1, 0});
-        typeColorMap.put(ADDRESS_CODE, new float[]{0, 1, 1});
-        typeColorMap.put(NAME_CODE, new float[]{1, 1, 0});
-        typeColorMap.put(NO_REDACTION_INDICATOR, new float[]{0.8f, 0, 0.8f});
-        typeColorMap.put(REDACTION_INDICATOR, new float[]{1, 0.502f, 0.1f});
-        typeColorMap.put(HINT_ONLY, new float[]{0.8f, 1, 0.8f});
-        typeColorMap.put(MUST_REDACT, new float[]{1, 0, 0});
+        typeColorMap.put(VERTEBRATE, "#ff85f7");
+        typeColorMap.put(ADDRESS, "#ffe187");
+        typeColorMap.put(AUTHOR, "#ffe187");
+        typeColorMap.put(SPONSOR, "#85ebff");
+        typeColorMap.put(NO_REDACTION_INDICATOR, "#be85ff");
+        typeColorMap.put(REDACTION_INDICATOR, "#caff85");
+        typeColorMap.put(HINT_ONLY, "#abc0c4");
+        typeColorMap.put(MUST_REDACT, "#fab4c0");
+        typeColorMap.put(PUBLISHED_INFORMATION, "#85ebff");
+        typeColorMap.put(TEST_METHOD, "#91fae8");
+        typeColorMap.put(PII, "#66ccff");
+        typeColorMap.put(RECOMMENDATION_AUTHOR, "#8df06c");
+        typeColorMap.put(RECOMMENDATION_ADDRESS, "#8df06c");
+        typeColorMap.put(FALSE_POSITIVE, "#ffffff");
+        typeColorMap.put(PURITY, "#ffe187");
+        typeColorMap.put(IMAGE, "#fcc5fb");
+        typeColorMap.put(OCR, "#fcc5fb");
+        typeColorMap.put(LOGO, "#ffe187");
+        typeColorMap.put(FORMULA, "#ffe187");
+        typeColorMap.put(SIGNATURE, "#ffe187");

-        hintTypeMap.put(VERTEBRATES_CODE, true);
-        hintTypeMap.put(ADDRESS_CODE, false);
-        hintTypeMap.put(NAME_CODE, false);
+        hintTypeMap.put(VERTEBRATE, true);
+        hintTypeMap.put(ADDRESS, false);
+        hintTypeMap.put(AUTHOR, false);
+        hintTypeMap.put(SPONSOR, false);
        hintTypeMap.put(NO_REDACTION_INDICATOR, true);
        hintTypeMap.put(REDACTION_INDICATOR, true);
        hintTypeMap.put(HINT_ONLY, true);
        hintTypeMap.put(MUST_REDACT, true);
+        hintTypeMap.put(PUBLISHED_INFORMATION, true);
+        hintTypeMap.put(TEST_METHOD, true);
+        hintTypeMap.put(PII, false);
+        hintTypeMap.put(RECOMMENDATION_AUTHOR, false);
+        hintTypeMap.put(RECOMMENDATION_ADDRESS, false);
+        hintTypeMap.put(FALSE_POSITIVE, true);
+        hintTypeMap.put(PURITY, false);
+        hintTypeMap.put(IMAGE, true);
+        hintTypeMap.put(OCR, true);
+        hintTypeMap.put(FORMULA, false);
+        hintTypeMap.put(LOGO, false);
+        hintTypeMap.put(SIGNATURE, false);

-        caseInSensitiveMap.put(VERTEBRATES_CODE, true);
-        caseInSensitiveMap.put(ADDRESS_CODE, false);
-        caseInSensitiveMap.put(NAME_CODE, false);
+        caseInSensitiveMap.put(VERTEBRATE, true);
+        caseInSensitiveMap.put(ADDRESS, false);
+        caseInSensitiveMap.put(AUTHOR, false);
+        caseInSensitiveMap.put(SPONSOR, false);
        caseInSensitiveMap.put(NO_REDACTION_INDICATOR, true);
        caseInSensitiveMap.put(REDACTION_INDICATOR, true);
        caseInSensitiveMap.put(HINT_ONLY, true);
        caseInSensitiveMap.put(MUST_REDACT, true);
+        caseInSensitiveMap.put(PUBLISHED_INFORMATION, true);
+        caseInSensitiveMap.put(TEST_METHOD, false);
+        caseInSensitiveMap.put(PII, false);
+        caseInSensitiveMap.put(RECOMMENDATION_AUTHOR, false);
+        caseInSensitiveMap.put(RECOMMENDATION_ADDRESS, false);
+        caseInSensitiveMap.put(FALSE_POSITIVE, false);
+        caseInSensitiveMap.put(PURITY, false);
+        caseInSensitiveMap.put(IMAGE, true);
+        caseInSensitiveMap.put(OCR, true);
+        caseInSensitiveMap.put(SIGNATURE, true);
+        caseInSensitiveMap.put(LOGO, true);
+        caseInSensitiveMap.put(FORMULA, true);
+
+        recommendationTypeMap.put(VERTEBRATE, false);
+        recommendationTypeMap.put(ADDRESS, false);
+        recommendationTypeMap.put(AUTHOR, false);
+        recommendationTypeMap.put(SPONSOR, false);
+        recommendationTypeMap.put(NO_REDACTION_INDICATOR, false);
+        recommendationTypeMap.put(REDACTION_INDICATOR, false);
+        recommendationTypeMap.put(HINT_ONLY, false);
+        recommendationTypeMap.put(MUST_REDACT, false);
+        recommendationTypeMap.put(PUBLISHED_INFORMATION, false);
+        recommendationTypeMap.put(TEST_METHOD, false);
+        recommendationTypeMap.put(PII, false);
+        recommendationTypeMap.put(RECOMMENDATION_AUTHOR, true);
+        recommendationTypeMap.put(RECOMMENDATION_ADDRESS, true);
+        recommendationTypeMap.put(FALSE_POSITIVE, false);
+        recommendationTypeMap.put(PURITY, false);
+        recommendationTypeMap.put(IMAGE, false);
+        recommendationTypeMap.put(OCR, false);
+        recommendationTypeMap.put(FORMULA, false);
+        recommendationTypeMap.put(SIGNATURE, false);
+        recommendationTypeMap.put(LOGO, false);
+
+        rankTypeMap.put(FALSE_POSITIVE, 160);
+        rankTypeMap.put(PURITY, 155);
+        rankTypeMap.put(PII, 150);
+        rankTypeMap.put(ADDRESS, 140);
+        rankTypeMap.put(AUTHOR, 130);
+        rankTypeMap.put(SPONSOR, 120);
+        rankTypeMap.put(VERTEBRATE, 110);
+        rankTypeMap.put(MUST_REDACT, 100);
+        rankTypeMap.put(REDACTION_INDICATOR, 90);
+        rankTypeMap.put(NO_REDACTION_INDICATOR, 80);
+        rankTypeMap.put(PUBLISHED_INFORMATION, 70);
+        rankTypeMap.put(TEST_METHOD, 60);
+        rankTypeMap.put(HINT_ONLY, 50);
+        rankTypeMap.put(RECOMMENDATION_AUTHOR, 40);
+        rankTypeMap.put(RECOMMENDATION_ADDRESS, 30);
+        rankTypeMap.put(IMAGE, 30);
+        rankTypeMap.put(OCR, 29);
+        rankTypeMap.put(LOGO, 28);
+        rankTypeMap.put(SIGNATURE, 27);
+        rankTypeMap.put(FORMULA, 26);
+
+        colors.setDefaultColor("#acfc00");
+        colors.setNotRedacted("#cccccc");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
    }


@@ -199,9 +416,12 @@ public class RedactionIntegrationTest {
                .stream()
                .map(typeColor -> TypeResult.builder()
                        .type(typeColor.getKey())
-                        .color(typeColor.getValue())
+                        .ruleSetId(TEST_RULESET_ID)
+                        .hexColor(typeColor.getValue())
                        .isHint(hintTypeMap.get(typeColor.getKey()))
                        .isCaseInsensitive(caseInSensitiveMap.get(typeColor.getKey()))
+                        .isRecommendation(recommendationTypeMap.get(typeColor.getKey()))
+                        .rank(rankTypeMap.get(typeColor.getKey()))
                        .build())

                .collect(Collectors.toList());
@@ -211,17 +431,31 @@ public class RedactionIntegrationTest {
    private DictionaryResponse getDictionaryResponse(String type) {

        return DictionaryResponse.builder()
-                .color(typeColorMap.get(type))
-                .entries(dictionary.get(type))
+                .hexColor(typeColorMap.get(type))
+                .entries(toDictionaryEntry(dictionary.get(type)))
                .isHint(hintTypeMap.get(type))
                .isCaseInsensitive(caseInSensitiveMap.get(type))
+                .isRecommendation(recommendationTypeMap.get(type))
+                .rank(rankTypeMap.get(type))
                .build();
    }


+    private List<DictionaryEntry> toDictionaryEntry(List<String> entries) {
+
+        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
+        entries.forEach(entry -> {
+            dictionaryEntries.add(new DictionaryEntry(entry, reanlysisVersions.containsKey(entry) ? reanlysisVersions.get(entry) : 0L, false));
+        });
+        return dictionaryEntries;
+    }
+
+
    @Test
    public void noExceptionShouldBeThrownForAnyFiles() throws IOException {

+        long start = System.currentTimeMillis();
+        System.out.println("noExceptionShouldBeThrownForAnyFiles");
        ClassLoader loader = getClass().getClassLoader();
        URL url = loader.getResource("files");
        File[] files = new File(url.getPath()).listFiles();
@@ -230,13 +464,43 @@ public class RedactionIntegrationTest {
            input.addAll(getPathsRecursively(file));
        }
        for (File path : input) {
-            RedactionRequest request = RedactionRequest.builder()
+            AnalyzeRequest request = AnalyzeRequest.builder()
+                    .ruleSetId(TEST_RULESET_ID)
                    .document(IOUtils.toByteArray(new FileInputStream(path)))
                    .build();
            System.out.println("Redacting file : " + path.getName());
-            redactionController.redact(request);
+            AnalyzeResult result = redactionController.analyze(request);
+
+            Map<String, List<RedactionLogEntry>> duplicates = new HashMap<>();
+            result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+                duplicates.computeIfAbsent(entry.getId(), v -> new ArrayList<>()).add(entry);
+            });
+
+            duplicates.entrySet().forEach(entry -> {
+                assertThat(entry.getValue().size()).isEqualTo(1);
+            });
+
+            dictionary.get(AUTHOR).add("Drinking water");
+            when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(1L);
+
+            long rstart = System.currentTimeMillis();
+            ReanalyzeResult reanalyzeResult = redactionController.reanalyze(RenalyzeRequest.builder()
+                    .redactionLog(result.getRedactionLog())
+                    .document(IOUtils.toByteArray(new FileInputStream(path)))
+                    .manualRedactions(null)
+                    .text(result.getText())
+                    .ruleSetId(TEST_RULESET_ID)
+                    .build());
+
+            long rend = System.currentTimeMillis();
+            System.out.println("reanalysis analysis duration: " + (rend - rstart));
+
        }

+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+
    }


@@ -261,18 +525,111 @@ public class RedactionIntegrationTest {
    @Test
    public void redactionTest() throws IOException {

+        System.out.println("redactionTest");
        long start = System.currentTimeMillis();
-        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/96 Trinexapac-ethyl_RAR_09_Volume_3CA_B-7_2018-02-23.pdf");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");

-        RedactionRequest request = RedactionRequest.builder()
+        AnalyzeRequest request = AnalyzeRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                .build();
-        request.setFlatRedaction(false);

-        RedactionResult result = redactionController.redact(request);
+        AnalyzeResult result = redactionController.analyze(request);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
-            fileOutputStream.write(result.getDocument());
+        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+            if (entry.isImage()) {
+                System.out.println("---->" + entry.getType());
+            }
+        });
+
+        long end = System.currentTimeMillis();
+
+        System.out.println("first analysis duration: " + (end - start));
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Test.json")) {
+            fileOutputStream.write(objectMapper.writeValueAsBytes(result.getText()));
+        }
+
+        int correctFound = 0;
+        loop:
+        for (RedactionLogEntry redactionLogEntry : result.getRedactionLog().getRedactionLogEntry()) {
+            for (SectionText sectionText : result.getText().getSectionTexts()) {
+                if (redactionLogEntry.isImage()) {
+                    correctFound++;
+                    continue loop;
+                }
+                if (redactionLogEntry.getSectionNumber() == sectionText.getSectionNumber()) {
+                    String value = sectionText.getText()
+                            .substring(redactionLogEntry.getStartOffset(), redactionLogEntry.getEndOffset());
+                    if (redactionLogEntry.getValue().equalsIgnoreCase(value)) {
+                        correctFound++;
+                    } else {
+                        throw new RuntimeException("WTF");
+                    }
+                }
+            }
+        }
+        assertThat(correctFound).isEqualTo(result.getRedactionLog().getRedactionLogEntry().size());
+
+        dictionary.get(AUTHOR).add("properties");
+        reanlysisVersions.put("properties", 1L);
+
+        dictionary.get(AUTHOR).add("physical");
+        reanlysisVersions.put("physical", 2L);
+
+        dictionary.get(VERTEBRATE).add("s-metolachlor");
+        reanlysisVersions.put("s-metolachlor", 3L);
+
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(3L);
+
+        when(dictionaryClient.getDictionaryForType(VERTEBRATE, TEST_RULESET_ID)).thenReturn(getDictionaryResponse(VERTEBRATE));
+
+        start = System.currentTimeMillis();
+        ReanalyzeResult reanalyzeResult = redactionController.reanalyze(RenalyzeRequest.builder()
+                .redactionLog(result.getRedactionLog())
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .text(result.getText())
+                .ruleSetId(TEST_RULESET_ID)
+                .build());
+
+        end = System.currentTimeMillis();
+        System.out.println("reanalysis analysis duration: " + (end - start));
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .redactionLog(reanalyzeResult.getRedactionLog())
+                .sectionGrid(result.getSectionGrid())
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+
+    }
+
+
+    @Test
+    public void testTableRedaction() throws IOException {
+
+        System.out.println("testTableRedaction");
+        long start = System.currentTimeMillis();
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+
+        AnalyzeRequest request = AnalyzeRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        AnalyzeResult result = redactionController.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .redactionLog(result.getRedactionLog())
+                .sectionGrid(result.getSectionGrid())
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();

@@ -282,19 +639,77 @@ public class RedactionIntegrationTest {


    @Test
-    public void testTableRedaction() throws IOException {
+    public void testManualRedaction() throws IOException {

+//        675eba69b0c2917de55462c817adaa05
+
+        System.out.println("testManualRedaction");
        long start = System.currentTimeMillis();
        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Single Table.pdf");

-        RedactionRequest request = RedactionRequest.builder()
+        ManualRedactions manualRedactions = new ManualRedactions();
+
+        String manualAddId = UUID.randomUUID().toString();
+
+        Comment comment = Comment.builder()
+                .date(OffsetDateTime.now())
+                .user("TEST_USER")
+                .text("This is a comment test")
+                .build();
+        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
+                .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
+                .status(Status.DECLINED)
+                .build()));
+        manualRedactions.setForceRedacts(Set.of(ManualForceRedact.builder()
+                .id("675eba69b0c2917de55462c817adaa05")
+                .legalBasis("Something")
+                .status(Status.APPROVED)
+                .build()));
+
+        manualRedactions.getComments().put("e5be0f1d941bbb92a068e198648d06c4", List.of(comment));
+        manualRedactions.getComments().put("0836727c3508a0b2ea271da69c04cc2f", List.of(comment));
+        manualRedactions.getComments().put(manualAddId, List.of(comment));
+
+        ManualRedactionEntry manualRedactionEntry = new ManualRedactionEntry();
+        manualRedactionEntry.setId(manualAddId);
+        manualRedactionEntry.setStatus(Status.REQUESTED);
+        manualRedactionEntry.setType("name");
+        manualRedactionEntry.setValue("O'Loughlin C.K.");
+        manualRedactionEntry.setReason("Manual Redaction");
+        manualRedactionEntry.setPositions(List.of(new Rectangle(new Point(375.61096f, 241.282f), 7.648041f, 43.72262f, 1), new Rectangle(new Point(384.83517f, 241.282f), 7.648041f, 17.043358f, 1)));
+
+//        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
+
+        AnalyzeRequest request = AnalyzeRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .manualRedactions(manualRedactions)
                .build();

-        RedactionResult result = redactionController.redact(request);
+        AnalyzeResult result = redactionController.analyze(request);

-        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Redacted.pdf")) {
-            fileOutputStream.write(result.getDocument());
+        manualRedactions.getEntriesToAdd().add(manualRedactionEntry);
+        manualRedactions.setIdsToRemove(Set.of(IdRemoval.builder()
+                .id("5b940b2cb401ed9f5be6fc24f6e77bcf")
+                .status(Status.APPROVED)
+                .build()));
+
+        ReanalyzeResult reanalyzeResult = redactionController.reanalyze(RenalyzeRequest.builder()
+                .redactionLog(result.getRedactionLog())
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .manualRedactions(manualRedactions)
+                .text(result.getText())
+                .ruleSetId(TEST_RULESET_ID)
+                .build());
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .redactionLog(reanalyzeResult.getRedactionLog())
+                .sectionGrid(result.getSectionGrid())
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
        }
        long end = System.currentTimeMillis();

@@ -306,8 +721,8 @@ public class RedactionIntegrationTest {
    @Test
    public void classificationTest() throws IOException {

-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        System.out.println("classificationTest");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Trinexapac/93 Trinexapac-ethyl_RAR_03_Volume_3CA_B-1_2017-03-31.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -324,8 +739,8 @@ public class RedactionIntegrationTest {
    @Test
    public void sectionsTest() throws IOException {

-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        System.out.println("sectionsTest");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " + "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -342,8 +757,8 @@ public class RedactionIntegrationTest {
    @Test
    public void htmlTablesTest() throws IOException {

-        ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 " +
-                "Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
+        System.out.println("htmlTablesTest");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -360,8 +775,8 @@ public class RedactionIntegrationTest {
    @Test
    public void htmlTableRotationTest() throws IOException {

-        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S" +
-                "-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
+        System.out.println("htmlTableRotationTest");
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");

        RedactionRequest request = RedactionRequest.builder()
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
@@ -375,14 +790,62 @@ public class RedactionIntegrationTest {
    }


+    @Test
+    public void phantomCellsDocumentTest() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Phantom Cells.pdf");
+
+        AnalyzeRequest request = AnalyzeRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        AnalyzeResult result = redactionController.analyze(request);
+
+        result.getRedactionLog().getRedactionLogEntry().forEach(entry -> {
+            if (!entry.isHint()) {
+                assertThat(entry.getReason()).isEqualTo("Not redacted because row is not a vertebrate study");
+            }
+        });
+    }
+
+
+    @Test
+    public void sponsorCompanyTest() throws IOException {
+
+        long start = System.currentTimeMillis();
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/sponsor_companies.pdf");
+
+        AnalyzeRequest request = AnalyzeRequest.builder()
+                .ruleSetId(TEST_RULESET_ID)
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        AnalyzeResult result = redactionController.analyze(request);
+
+        AnnotateResponse annotateResponse = redactionController.annotate(AnnotateRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .redactionLog(result.getRedactionLog())
+                .sectionGrid(result.getSectionGrid())
+                .build());
+
+        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Annotated.pdf")) {
+            fileOutputStream.write(annotateResponse.getDocument());
+        }
+        long end = System.currentTimeMillis();
+
+        System.out.println("duration: " + (end - start));
+        System.out.println("numberOfPages: " + result.getNumberOfPages());
+    }
+
+
    private static String loadFromClassPath(String path) {

        URL resource = ResourceLoader.class.getClassLoader().getResource(path);
        if (resource == null) {
            throw new IllegalArgumentException("could not load classpath resource: drools/rules.drl");
        }
-        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(),
-                StandardCharsets.UTF_8))) {
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) {
            StringBuilder sb = new StringBuilder();
            String str;
            while ((str = br.readLine()) != null) {
@@ -1,22 +1,23 @@
 package com.iqser.red.service.redaction.v1.server.redaction.service;

-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
+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.DictionaryResponse;
+import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
+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.redaction.v1.model.RedactionRequest;
+import com.iqser.red.service.redaction.v1.server.classification.model.Document;
+import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
+import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.EntitySearchUtils;
+import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
+import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.kie.api.KieServices;
@@ -32,26 +33,37 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.test.context.junit4.SpringRunner;

-import com.iqser.red.service.configuration.v1.api.model.DefaultColor;
-import com.iqser.red.service.configuration.v1.api.model.DictionaryResponse;
-import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
-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.redaction.v1.model.RedactionRequest;
-import com.iqser.red.service.redaction.v1.server.classification.model.Document;
-import com.iqser.red.service.redaction.v1.server.client.DictionaryClient;
-import com.iqser.red.service.redaction.v1.server.client.RulesClient;
-import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
-import com.iqser.red.service.redaction.v1.server.redaction.utils.ResourceLoader;
-import com.iqser.red.service.redaction.v1.server.segmentation.PdfSegmentationService;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;

-@RunWith(SpringRunner.class)
@SpringBootTest
+@RunWith(SpringRunner.class)
 public class EntityRedactionServiceTest {

    private static final String DEFAULT_RULES = loadFromClassPath("drools/rules.drl");
-    private static final String NAME_CODE = "name";
+    private static final String AUTHOR_CODE = "author";
    private static final String ADDRESS_CODE = "address";
+    private static final String SPONSOR_CODE = "sponsor";
+
+    private static final AtomicLong DICTIONARY_VERSION = new AtomicLong();
+    private static final AtomicLong RULES_VERSION = new AtomicLong();

    @MockBean
    private DictionaryClient dictionaryClient;
@@ -65,6 +77,11 @@ public class EntityRedactionServiceTest {
    @Autowired
    private PdfSegmentationService pdfSegmentationService;

+    @Autowired
+    private DroolsExecutionService droolsExecutionService;
+
+    private final static String TEST_RULESET_ID = "123";
+
    @TestConfiguration
    public static class RedactionIntegrationTestConfiguration {

@@ -91,11 +108,11 @@ public class EntityRedactionServiceTest {
    public void testNestedEntitiesRemoval() {

        Set<Entity> entities = new HashSet<>();
-        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0);
-        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0);
+        Entity nested = new Entity("nested", "fake type", 10, 16, "fake headline", 0, false);
+        Entity nesting = new Entity("nesting nested", "fake type", 2, 16, "fake headline", 0, false);
        entities.add(nested);
        entities.add(nesting);
-        entityRedactionService.removeEntitiesContainedInLarger(entities);
+        EntitySearchUtils.removeEntitiesContainedInLarger(entities);

        assertThat(entities.size()).isEqualTo(1);
        assertThat(entities).contains(nesting);
@@ -112,45 +129,374 @@ public class EntityRedactionServiceTest {
                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
                .build();

+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
+                .build();
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
+        }
+    }
+
+
+    @Test
+    public void testNestedRedaction() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/nested_redaction.pdf");
+
+        RedactionRequest redactionRequest = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H.")))
+                .build();
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+
+        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1)).hasSize(7);// 3 author cells, 1 address, 1 Y and 2 N entities
+        }
+    }
+
+
+    @Test
+    public void testTrueNegativesInTable() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Cyprodinil/40 Cyprodinil - EU AIR3 - LCA Section 1" +
+                " Supplement - Identity of the active substance - Reference list.pdf");
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()
+                    .entrySet()
+                    .stream()
+                    .noneMatch(entry -> entry.getValue().stream().anyMatch(e -> e.getMatchedRule() == 9))).isTrue();
+        }
+        pdfFileResource = new ClassPathResource("files/Compounds/27 A8637C - EU AIR3 - MCP Section 1 - Identity of " +
+                "the plant protection product.pdf");
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()
+                    .entrySet()
+                    .stream()
+                    .noneMatch(entry -> entry.getValue().stream().anyMatch(e -> e.getMatchedRule() == 9))).isTrue();
+        }
+    }
+
+    @Test
+    public void testFalsePositiveInWrongCell() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Row With Ambiguous Redaction.pdf");
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream()
+                    .filter(entity -> entity.getMatchedRule() == 9)
+                    .count()).isEqualTo(10);
+        }
+
+    }
+
+
+    @Test
+    public void testApplicantInTableRedaction() throws IOException {
+
        String tableRules = "package drools\n" +
                "\n" +
                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
                "\n" +
                "global Section section\n" +
+                "rule \"6: Redact contact information if applicant is found\"\n" +
+                "   when\n" +
+                "       eval(section.headlineContainsWord(\"applicant\") || section.getText().contains(\"Applicant\"));\n" +
+                "   then\n" +
+                "       section.redactLineAfter(\"Name:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
+                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Address:\", \"Contact\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact point:\",  \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Phone:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg" +
+                " (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Tel:\", \"address\", 6,true, \"Applicant information was found\", \"Reg " +
+                "(EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"E-mail:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Email:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Contact:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Telephone number:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Fax number:\", \"address\", 6,true, \"Applicant information was found\"," +
+                " \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactLineAfter(\"Telephone:\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"No:\", \"Fax\", \"address\", 6,true, \"Applicant information was found\", " +
+                "\"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "       section.redactBetween(\"Contact:\", \"Tel.:\", \"address\", 6,true, \"Applicant information was found\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "   end";
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_RULESET_ID);
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Applicant Producer Table.pdf");
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_author.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_address.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream()
+                    .filter(entity -> entity.getMatchedRule() == 6)
+                    .count()).isEqualTo(13);
+        }
+
+    }
+
+
+    @Test
+    public void testSponsorInCell() throws IOException {
+
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" + "rule \"11: Redact sponsor company\"\n" + "    when\n" + "        " +
+                "Section(searchText.toLowerCase().contains(\"batches produced at\"))\n" + "    then\n" + "        section" +
+                ".redactIfPrecededBy(\"batches produced at\", \"sponsor\", 11, \"Redacted because it represents a " +
+                "sponsor company\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" + "    end";
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
+        droolsExecutionService.updateRules(TEST_RULESET_ID);
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/batches_new_line.pdf");
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse authorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(authorResponse);
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(new ArrayList<>(ResourceLoader.load("dictionaries/CBI_sponsor.txt"))))
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream()
+                    .filter(entity -> entity.getMatchedRule() == 11)
+                    .count()).isEqualTo(1);
+        }
+
+    }
+
+
+    @Test
+    public void headerPropagation() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation.pdf");
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Bissig R.", "Thanei P.")))
+                .build();
+
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(2); // two pages
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(8);
+            assertThat(classifiedDoc.getEntities().get(2).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(5); // 2 names, 1 address, 2 Y
+        }
+
+        pdfFileResource = new ClassPathResource("files/Minimal Examples/Header Propagation2.pdf");
+
+        dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Arrays.asList("Tribolet, R.", "Muir, G.", "Kühne-Thu, H.", "Close, C.")))
+                .build();
+
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 9).count()).isEqualTo(3);
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(9);
+        }
+    }
+
+
+    @Test
+    @Ignore
+    public void testNGuideline() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Empty Tabular Data.pdf");
+
+        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Aldershof S.")))
+                .build();
+
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
+        DictionaryResponse addressResponse = DictionaryResponse.builder()
+                .entries(toDictionaryEntry(Collections.singletonList("Novartis Crop Protection AG, Basel, Switzerland")))
+                .build();
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .entries(Collections.emptyList())
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
+            entityRedactionService.processDocument(classifiedDoc, TEST_RULESET_ID, null);
+            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
+            assertThat(classifiedDoc.getEntities().get(1).stream().filter(entity -> entity.getMatchedRule() == 8).count()).isEqualTo(6);
+        }
+    }
+
+
+    @Before
+    public void stubRedaction() {
+        String tableRules = "package drools\n" +
+                "\n" +
+                "import com.iqser.red.service.redaction.v1.server.redaction.model.Section\n" +
+                "\n" +
+                "global Section section\n" +
+                "rule \"8: Not redacted because Vertebrate Study = N\"\n" +
+                "    when\n" +
+                "        Section(rowEquals(\"Vertebrate study Y/N\", \"N\") || rowEquals(\"Vertebrate study Y/N\", \"No\"))\n" +
+                "    then\n" +
+                "        section.redactNotCell(\"Author(s)\", 8,  \"name\", false, \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.redactNot(\"address\", 8, \"Not redacted because row is not a vertebrate study\");\n" +
+                "        section.highlightCell(\"Vertebrate study Y/N\", 8, \"hint_only\");\n" +
+                "    end\n" +
                "rule \"9: Redact Authors and Addresses in Reference Table, if it is a Vertebrate study\"\n" +
                "    when\n" +
-                "        Section(tabularData != null && tabularData.size() > 0\n" +
-                "            && tabularData.containsKey(\"Vertebrate study Y/N\")\n" +
-                "            && tabularData.get(\"Vertebrate study Y/N\").equals(\"Y\")\n" +
-                "        )\n" +
+                "        Section(rowEquals(\"Vertebrate study Y/N\", \"Y\") || rowEquals(\"Vertebrate study Y/N\", " +
+                "\"Yes\"))\n" +
                "    then\n" +
-                "        section.redact(\"name\", 9, \"Redacted because row is a vertebrate study\");\n" +
-                "        section.redact(\"address\", 9, \"Redacted because rows is a vertebrate study\");\n" +
-                "        section.highlightCell(\"Vertebrate study Y/N\", 9);\n" +
+                "        section.redactCell(\"Author(s)\", 9,  \"name\", false, \"Redacted because row is a vertebrate study\", \"Reg (EC) No 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.redact(\"address\", 9, \"Redacted because row is a vertebrate study\", \"Reg (EC) No" +
+                " 1107/2009 Art. 63 (2g)\");\n" +
+                "        section.highlightCell(\"Vertebrate study Y/N\", 9, \"must_redact\");\n" +
                "    end";
-        when(rulesClient.getVersion()).thenReturn(1L);
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(tableRules));
+        when(rulesClient.getVersion(TEST_RULESET_ID)).thenReturn(RULES_VERSION.incrementAndGet());
+        when(rulesClient.getRules(TEST_RULESET_ID)).thenReturn(new RulesResponse(tableRules));
        TypeResponse typeResponse = TypeResponse.builder()
                .types(Arrays.asList(
-                        TypeResult.builder().type(NAME_CODE).color(new float[]{1, 1, 0}).build(),
-                        TypeResult.builder().type(ADDRESS_CODE).color(new float[]{0, 1, 1}).build()))
+                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(AUTHOR_CODE).hexColor("#ffff00").build(),
+                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(ADDRESS_CODE).hexColor("#ff00ff").build(),
+                        TypeResult.builder().ruleSetId(TEST_RULESET_ID).type(SPONSOR_CODE).hexColor("#00ffff").build()))
                .build();
-        when(dictionaryClient.getAllTypes()).thenReturn(typeResponse);
+        when(dictionaryClient.getVersion(TEST_RULESET_ID)).thenReturn(DICTIONARY_VERSION.incrementAndGet());
+        when(dictionaryClient.getAllTypes(TEST_RULESET_ID)).thenReturn(typeResponse);
+
+        // Default empty return to prevent NPEs
        DictionaryResponse dictionaryResponse = DictionaryResponse.builder()
-                .entries(Arrays.asList("Casey, H.W.", "O’Loughlin,  C.K.", "Salamon, C.M.", "Smith, S.H."))
                .build();
-        when(dictionaryClient.getDictionaryForType(NAME_CODE)).thenReturn(dictionaryResponse);
+        when(dictionaryClient.getDictionaryForType(AUTHOR_CODE, TEST_RULESET_ID)).thenReturn(dictionaryResponse);
        DictionaryResponse addressResponse = DictionaryResponse.builder()
-                .entries(Collections.singletonList("Toxigenics, Inc., Decatur, IL 62526, USA"))
                .build();
-        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE)).thenReturn(addressResponse);
-        when(dictionaryClient.getDefaultColor()).thenReturn(new DefaultColor());
-        try (PDDocument pdDocument = PDDocument.load(new ByteArrayInputStream(redactionRequest.getDocument()))) {
-            Document classifiedDoc = pdfSegmentationService.parseDocument(pdDocument);
-            entityRedactionService.processDocument(classifiedDoc);
-            assertThat(classifiedDoc.getEntities()).hasSize(1); // one page
-            assertThat(classifiedDoc.getEntities().get(1)).hasSize(5); // 4 out of 5 entities recognized on page 1
-        }
+        when(dictionaryClient.getDictionaryForType(ADDRESS_CODE, TEST_RULESET_ID)).thenReturn(addressResponse);
+        DictionaryResponse sponsorResponse = DictionaryResponse.builder()
+                .build();
+        when(dictionaryClient.getDictionaryForType(SPONSOR_CODE, TEST_RULESET_ID)).thenReturn(sponsorResponse);
+
+        Colors colors = new Colors();
+        colors.setDefaultColor("#acfc00");
+        colors.setNotRedacted("#cccccc");
+        colors.setRequestAdd("#04b093");
+        colors.setRequestRemove("#04b093");
+
+        when(dictionaryClient.getColors(TEST_RULESET_ID)).thenReturn(colors);
    }


@@ -172,4 +518,12 @@ public class EntityRedactionServiceTest {
        }
    }

+    private List<DictionaryEntry> toDictionaryEntry(List<String> entries){
+        List<DictionaryEntry> dictionaryEntries = new ArrayList<>();
+        entries.forEach(entry -> {
+            dictionaryEntries.add(new DictionaryEntry(entry, 1L, false));
+        });
+        return dictionaryEntries;
+    }
+
 }
@@ -0,0 +1,116 @@
+package com.iqser.red.service.redaction.v1.server.redaction.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.iqser.red.service.redaction.v1.server.redaction.model.Entity;
+
+public class RegExPatternTest {
+
+
+    @Test
+    public void testExpand(){
+        String pattern = "(,? [A-Z]\\.?( ?[A-Z]\\.?)?( ?[A-Z]\\.?)?\\b\\.?)";
+        String text = ", G.R., Simoneaux,";
+        Pattern compiledPattern = Pattern.compile(pattern, 0);
+        Matcher matcher = compiledPattern.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(1);
+            if (StringUtils.isNotBlank(match)) {
+                System.out.println(match);
+            }
+        }
+    }
+
+
+
+    @Test
+    public void testEmailRegEx(){
+        String text = "Address: Schwarzwaldalle " +
+                "P.O.Box\n" +
+                "CH-4002 Basel\n" +
+                "Switzerland\n" +
+                "Contact: Christian Warmers\n" +
+                "Tel: +41 (61) 323 8044\n" +
+                "christian.warmers@syngenta.com";
+
+
+        Pattern p = Pattern.compile("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b", Pattern.CASE_INSENSITIVE);
+
+        Matcher matcher = p.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(0);
+            System.out.println(match);
+        }
+    }
+
+
+    @Test
+    public void testEtAlRegEx() {
+        String text = "To assess the potential of S-metolachlor to cause endocrine disruption (ED) a review (Charlton 2014,\n" +
+                "ASB2016-762) was submitted that summarises results from regulatory and open scientific literature\n" +
+                "studies covering in vitro and in vivo studies (level 2-5 of the OECD Conceptual Framework). According to this information metolachlor increased (1.5-fold) aromatase activity in JEG-3 cells (Laville et al.\n" +
+                "2006, ASB2010-14391) and induced weak anti-androgenic activity in the MDA-kb2 reporter cell line\n" +
+                "with a IC50 of 9.92 µM (IC50 of positive control flutamide: 0.51 µM) (Aït-Aïssa et al. 2010, ASB2015-\n" +
+                "9562). Data from the Tox21 high throughput screening revealed just few postive findings in assays to\n" +
+                "identify antagonists of the androgen receptor. An isolated result of this screening showed agonistic\n" +
+                "activity on the thyroid stimulating hormone receptor, while Dalton et al. (2003, ASB2018-2832)\n" +
+                "demonstrated that metolachlor induced CYP2B1/2 and CYP3A1/2 but did not affect T4, T3 or TSH.\n" +
+                "After prepubertal exposure of male Wistar rats to metolachlor (Mathias et al. 2012, ASB2016-9890) a\n" +
+                "statistically significant increase of serum hormone concentration was observed for testosterone (at the\n" +
+                "dose 50 mg/kg) as well as a statistically significant decrease in the age of preputial separation at a dose\n" +
+                "of 5 and 50 mg/kg. Furthermore a statistically significant increase for estradiol at a dose of 50 mg/kg\n" +
+                "and for FSH at a dose of 5 and 50 mg/kg and morphological alterations of the seminiferous epithelium\n" +
+                "were observed. Relative testicular weight was not altered. A statistically significant increase of relative\n" +
+                "weights was observed in long-term studies with rats (Tisdel et al. 1983, TOX9800328 ). This finding\n" +
+                "was attributed to lower terminal body weight. In mice a statistically significant decrease of the weight\n" +
+                "seminal vesicle (Tisdel et al. 1982, TOX9800327) was shown after 24 month treatment with\n" +
+                "metolachlor. In a mouse preimplantation embryo assay from open literature metolachlor increased the\n" +
+                "percentage of apoptosis significantly and reduced the mean number of cells per embryo significantly\n" +
+                "while the percentage of developing blastocytes was unaltered (Grennlee et al. 2004, ASB2016-9889).\n" +
+                "In reproduvtive toxicity studies a retarded body weight development of the pups was observed, while\n" +
+                "survival and normal morphological and functional development were not altered. No adverse effects\n" +
+                "on male fertility were seen, however important parameters to assess effects on female fertility like\n" +
+                "cyclicity, ovarian follicles as well as developmental landmarks in the offspring have not been investigated.";
+
+        Pattern p = Pattern.compile("([^\\s(]*?( \\w\\.?)?) et al\\.?");
+
+        Matcher matcher = p.matcher(text);
+
+        while (matcher.find()) {
+            String match = matcher.group(1);
+            System.out.println(match);
+        }
+    }
+
+
+    @Test
+    public void testAuthorSplitting(){
+
+        String word = "Porch JR, " + "Kendall TZ, " + "Krueger HO";
+
+        word.replaceAll(",", " ").replaceAll("  ", " ");
+
+        Pattern pattern = Pattern.compile("[A-ZÄÖÜ][\\wäöüéèê]{2,}( [A-ZÄÖÜ]{1,2}\\.)+");
+        Matcher matcher = pattern.matcher(word);
+
+        List<String> allMatches = new ArrayList<>();
+        while (matcher.find()) {
+            allMatches.add(matcher.group());
+        }
+
+        for(String name: allMatches) {
+            if(name.length() >= 3) {
+                System.out.println(name);
+            }
+        }
+    }
+}
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.v1.server.redaction.utils;
-
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
-public class TextNormalizationUtilities {
-
-    /**
-     * Revert hyphenation due to line breaks.
-     * @param text Text to be processed.
-     * @return Text without line-break hyphenation.
-     */
-    public static String removeHyphenLineBreaks(String text) {
-        return text.replaceAll("\\s(\\S+)[\\-\\u00AD]\\R|\n\r(.+ )", "\n$1$2");
-    }
-
-}
@@ -10,11 +10,11 @@ public class TextNormalizationUtilitiesTest {

        String test = "Without these peo-\nple, this conference would not happen";
        Assertions.assertThat(TextNormalizationUtilities.removeHyphenLineBreaks(test))
-                .contains("\npeople");
+                .contains("people");

        test = "Die\t\nFreiwillige\t Versicherung\t endet\t zudem\t für\t den\t ein\u00AD\nzelnen\tVersicherten\tmit\tder\tAufhebung\tdes\tVertra-\nges,\t seiner\t Unterstellung\t unter\t die\t obligatorische\t\nVersicherung\t oder\t seinem\t Ausschluss.";
        Assertions.assertThat(TextNormalizationUtilities.removeHyphenLineBreaks(test))
-                .contains("\neinzelnen", "\nVertrages");
+                .contains("einzelnen", "Vertrages");

    }

@@ -0,0 +1,198 @@
+package com.iqser.red.service.redaction.v1.server.segmentation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.runtime.KieContainer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+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.classification.service.BlockificationService;
+import com.iqser.red.service.redaction.v1.server.redaction.model.Image;
+import com.iqser.red.service.redaction.v1.server.redaction.model.PdfImage;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Cell;
+import com.iqser.red.service.redaction.v1.server.tableextraction.model.Table;
+import com.iqser.red.service.redaction.v1.server.tableextraction.service.RulingCleaningService;
+import com.iqser.red.service.redaction.v1.server.tableextraction.service.TableExtractionService;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class PdfSegmentationServiceTest {
+
+    @Autowired
+    private PdfSegmentationService pdfSegmentationService;
+
+    @Autowired
+    private RulingCleaningService rulingCleaningService;
+
+    @Autowired
+    private TableExtractionService tableExtractionService;
+
+    @Autowired
+    private BlockificationService blockificationService;
+
+    @MockBean
+    private KieContainer kieContainer;
+
+
+    @Test
+    @Ignore
+    public void testExtractImages() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/new/Single Study - Oral (Gavage) Mouse.pdf");
+
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document document = pdfSegmentationService.parseDocument(pdDocument);
+            int i = 0;
+            for (Page page : document.getPages()) {
+                for (PdfImage image : page.getImages()) {
+                    try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                        ImageIO.write(image.getImage(), "png", baos);
+                        try (FileOutputStream fileOutputStream = new FileOutputStream("/tmp/Image " + i + ".png")) {
+                            fileOutputStream.write(baos.toByteArray());
+                        }
+                    }
+                    i++;
+                }
+            }
+        }
+    }
+
+
+    @Test
+    public void testTableExtraction() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Table.pdf");
+
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document document = pdfSegmentationService.parseDocument(pdDocument);
+            assertThat(document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())).isNotEmpty();
+            Table firstTable = document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())
+                    .get(0);
+            assertThat(firstTable.getColCount()).isEqualTo(8);
+            assertThat(firstTable.getRowCount()).isEqualTo(1);
+            Table secondTable = document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())
+                    .get(1);
+            assertThat(secondTable.getColCount()).isEqualTo(8);
+            assertThat(secondTable.getRowCount()).isEqualTo(2);
+            List<List<Cell>> firstTableHeaderCells = firstTable.getRows()
+                    .get(0)
+                    .stream()
+                    .map(Collections::singletonList)
+                    .collect(Collectors.toList());
+            assertThat(secondTable.getRows()
+                    .stream()
+                    .allMatch(row -> row.stream()
+                            .map(Cell::getHeaderCells)
+                            .collect(Collectors.toList())
+                            .equals(firstTableHeaderCells))).isTrue();
+        }
+    }
+
+
+    @Test
+    public void testMultiPageMetadataPropagation() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Merge Multi Page Table.pdf");
+
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document document = pdfSegmentationService.parseDocument(pdDocument);
+            assertThat(document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())).isNotEmpty();
+            Table firstTable = document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())
+                    .get(0);
+            assertThat(firstTable.getColCount()).isEqualTo(9);
+            assertThat(firstTable.getRowCount()).isEqualTo(5);
+            Table secondTable = document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())
+                    .get(1);
+            assertThat(secondTable.getColCount()).isEqualTo(9);
+            assertThat(secondTable.getRowCount()).isEqualTo(6);
+            List<List<Cell>> firstTableHeaderCells = firstTable.getRows()
+                    .get(firstTable.getRowCount() - 1)
+                    .stream()
+                    .map(Cell::getHeaderCells)
+                    .collect(Collectors.toList());
+            assertThat(secondTable.getRows()
+                    .stream()
+                    .allMatch(row -> row.stream()
+                            .map(Cell::getHeaderCells)
+                            .collect(Collectors.toList())
+                            .equals(firstTableHeaderCells))).isTrue();
+        }
+    }
+
+
+    @Test
+    public void testHeaderCellsForRotatedTable() throws IOException {
+
+        ClassPathResource pdfFileResource = new ClassPathResource("files/Minimal Examples/Rotated Table Headers.pdf");
+
+        try (PDDocument pdDocument = PDDocument.load(pdfFileResource.getInputStream())) {
+            Document document = pdfSegmentationService.parseDocument(pdDocument);
+            assertThat(document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())).isNotEmpty();
+            Table firstTable = document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())
+                    .get(0);
+            assertThat(firstTable.getColCount()).isEqualTo(8);
+            assertThat(firstTable.getRowCount()).isEqualTo(1);
+            Table secondTable = document.getParagraphs()
+                    .stream()
+                    .flatMap(paragraph -> paragraph.getTables().stream())
+                    .collect(Collectors.toList())
+                    .get(1);
+            assertThat(secondTable.getColCount()).isEqualTo(8);
+            assertThat(secondTable.getRowCount()).isEqualTo(6);
+            List<List<Cell>> firstTableHeaderCells = firstTable.getRows()
+                    .get(0)
+                    .stream()
+                    .map(Collections::singletonList)
+                    .collect(Collectors.toList());
+            assertThat(secondTable.getRows()
+                    .stream()
+                    .allMatch(row -> row.stream()
+                            .map(Cell::getHeaderCells)
+                            .collect(Collectors.toList())
+                            .equals(firstTableHeaderCells))).isTrue();
+        }
+    }
+
+}
@@ -1,9 +1,10 @@
+configuration-service.url: "http://configuration-service-v1:8080"
+image-service.url: "http://image-service-v1:8080"

 ribbon:
  ConnectTimeout: 600000
  ReadTimeout: 600000

-
 spring:
  main:
    allow-bean-definition-overriding: true
@@ -12,3 +13,6 @@ processing.kafkastreams: false

 platform.multi-tenancy:
  enabled: false
+
+redaction-service:
+  enable-image-classification: false
--- a/Show More
+++ b/Show More