diff --git a/pom.xml b/pom.xml
index d83a8f9..c3a405b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.6</version>
+        <version>3.3.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
diff --git a/src/main/java/it/aboutbits/springboot/testing/testdata/base/FakerExtended.java b/src/main/java/it/aboutbits/springboot/testing/testdata/base/FakerExtended.java
index e23688f..5daa705 100644
--- a/src/main/java/it/aboutbits/springboot/testing/testdata/base/FakerExtended.java
+++ b/src/main/java/it/aboutbits/springboot/testing/testdata/base/FakerExtended.java
@@ -1,5 +1,6 @@
 package it.aboutbits.springboot.testing.testdata.base;
 
+import it.aboutbits.springboot.toolbox.type.identity.EntityId;
 import net.datafaker.Faker;
 import net.datafaker.service.FakeValuesService;
 import net.datafaker.service.FakerContext;
@@ -7,6 +8,8 @@
 
 import java.util.Locale;
 import java.util.Random;
+import java.util.function.Function;
+import java.util.function.LongFunction;
 
 public class FakerExtended extends Faker {
     public FakerExtended() {
@@ -40,4 +43,16 @@ public <T extends Enum<?>> T randomEnumValue(Class<T> enumClass) {
         }
         return values[this.random().nextInt(values.length)];
     }
+
+    public <T extends EntityId<Long>> T randomEntityId(LongFunction<T> constructor) {
+        return constructor.apply(
+                super.random().nextInt(99999)
+        );
+    }
+
+    public <T extends EntityId<String>> T randomEntityId(Function<String, T> constructor) {
+        return constructor.apply(
+                super.internet().uuid()
+        );
+    }
 }