diff --git a/pdb-api/src/main/java/org/lucares/pdb/api/TagsBuilder.java b/pdb-api/src/main/java/org/lucares/pdb/api/TagsBuilder.java
index 6f0c789..a467107 100644
--- a/pdb-api/src/main/java/org/lucares/pdb/api/TagsBuilder.java
+++ b/pdb-api/src/main/java/org/lucares/pdb/api/TagsBuilder.java
@@ -25,10 +25,9 @@ public class TagsBuilder {
         return this;
     }
 
-    public TagsBuilder add(final String key, final String value) {
-        final int keyAsInt = Tags.STRING_COMPRESSOR.getIfPresent(key);
-        final int valueAsInt = Tags.STRING_COMPRESSOR.getIfPresent(value);
-        return add(keyAsInt, valueAsInt);
+    public TagsBuilder add(final Tag tag) {
+        tags.add(tag);
+        return this;
     }
 
     public TagsBuilder addAndAddToDictionary(final String key, final String value) {
diff --git a/pdb-api/src/test/java/org/lucares/memory/MemoryScale.java b/pdb-api/src/test/java/org/lucares/memory/MemoryScale.java
index 6c4e41f..0399980 100644
--- a/pdb-api/src/test/java/org/lucares/memory/MemoryScale.java
+++ b/pdb-api/src/test/java/org/lucares/memory/MemoryScale.java
@@ -89,13 +89,14 @@ public class MemoryScale {
     }
 
     private static Object createTags6() {
-        TagsBuilder result = TagsBuilder.create();
-        result = result.add("k1", "v1");
-        result = result.add("k2", "v2");
-        result = result.add("k3", "v3");
-        result = result.add("k4", "v4");
-        result = result.add("k5", "v5");
-        result = result.add("k6", "v6");
+        final TagsBuilder result = TagsBuilder.create();
+
+        result.add(Tags.STRING_COMPRESSOR.createTag("k1", "v1"));
+        result.add(Tags.STRING_COMPRESSOR.createTag("k2", "v2"));
+        result.add(Tags.STRING_COMPRESSOR.createTag("k3", "v3"));
+        result.add(Tags.STRING_COMPRESSOR.createTag("k4", "v4"));
+        result.add(Tags.STRING_COMPRESSOR.createTag("k5", "v5"));
+        result.add(Tags.STRING_COMPRESSOR.createTag("k6", "v6"));
         return result.build();
     }