diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Comment.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Comment.java
index f5ea9711..f90d04d3 100644
--- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Comment.java
+++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/Comment.java
@@ -13,6 +13,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class Comment {
 
+    private String id;
     private OffsetDateTime date;
     private String text;
     private String user;
diff --git a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java
index 82e0a3ca..0d18ff6f 100644
--- a/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java
+++ b/redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/ManualRedactionEntry.java
@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class ManualRedactionEntry {
 
+    private String id;
     private String type;
     private String value;
     private String reason;
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java
index d40f7074..6f6ba35c 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/utils/IdBuilder.java
@@ -5,7 +5,6 @@ import java.util.List;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
-import com.iqser.red.service.redaction.v1.model.ManualRedactionEntry;
 import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSequence;
 
 import lombok.experimental.UtilityClass;
@@ -24,9 +23,4 @@ public class IdBuilder {
 
         return hashFunction.hashString(sb.toString(), StandardCharsets.UTF_8).toString();
     }
-
-
-    public String buildId(ManualRedactionEntry manualRedactionEntry) {
-        return hashFunction.hashString(manualRedactionEntry.toString(), StandardCharsets.UTF_8).toString();
-    }
 }
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
index e5741ee3..bac9e6cf 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/visualization/service/AnnotationHighlightService.java
@@ -7,7 +7,6 @@ import java.util.GregorianCalendar;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -37,7 +36,6 @@ import com.iqser.red.service.redaction.v1.server.parsing.model.TextPositionSeque
 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.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;
@@ -208,7 +206,7 @@ public class AnnotationHighlightService {
 
         for (ManualRedactionEntry manualRedactionEntry : manualRedactions.getEntriesToAdd()) {
 
-            String id = IdBuilder.buildId(manualRedactionEntry);
+            String id = manualRedactionEntry.getId();
 
             RedactionLogEntry redactionLogEntry = createRedactionLogEntry(manualRedactionEntry, id);
 
@@ -295,7 +293,7 @@ public class AnnotationHighlightService {
         if (comments != null) {
             for (Comment comment : comments) {
                 PDAnnotationText txtAnnot = new PDAnnotationText();
-                txtAnnot.setAnnotationName(UUID.randomUUID().toString());
+                txtAnnot.setAnnotationName(comment.getId());
                 txtAnnot.setInReplyTo(annotation); // Reference to highlight annotation
                 txtAnnot.setName(PDAnnotationText.NAME_COMMENT);
                 txtAnnot.setCreationDate(GregorianCalendar.from(comment.getDate().toZonedDateTime()));