diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7351ede..63e8bc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - quarkus-version 3.11.0
 - fj-version 8.6.2
+- fj-daogen-version 1.8.3
 
 ## [1.5.0] - 2024-05-05
 
diff --git a/pom.xml b/pom.xml
index 5a0c35e..dabec9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.2.5</surefire-plugin.version>
     <fj-version>8.6.5</fj-version>
-    <fj-daogen-version>1.8.2</fj-daogen-version>
+    <fj-daogen-version>1.8.3</fj-daogen-version>
     <build-helper-maven-plugin-version>3.4.0</build-helper-maven-plugin-version>
     <gen.base.dir>${project.basedir}</gen.base.dir>
     <generated.source.daogen>target/generated-sources/daogen</generated.source.daogen>
diff --git a/src/main/daogen/daogen-config.xml b/src/main/daogen/daogen-config.xml
index e5f70ab..6e94fa0 100644
--- a/src/main/daogen/daogen-config.xml
+++ b/src/main/daogen/daogen-config.xml
@@ -43,7 +43,8 @@ reference : https://marsdocs.fugerit.org/src/docs/config/config.html
 	default-sequence="quickstart_id"
 	openapi_host="http://localhost:8080"
 	openapi_path=""
-	check-empty-interface="1" 
+	check-empty-interface="1"
+	disable-singleton="enabled"
 	jdk-target-version="17"
 	jee-target-mode="jakarta">
 	
diff --git a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/DocumentRSE.java b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/DocumentRSE.java
index 4cc9701..4c21605 100644
--- a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/DocumentRSE.java
+++ b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/DocumentRSE.java
@@ -25,8 +25,6 @@ public class DocumentRSE extends BasicRSExtractor<ModelDocument> {
 
 	private static final long serialVersionUID = 872607081519L;
 
-	public static final DocumentRSE DEFAULT = new DocumentRSE();
-
 	@Override
 	public ModelDocument extractNext( ResultSet rs ) throws SQLException { 
 		HelperDocument current = new HelperDocument();
diff --git a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/Example01RSE.java b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/Example01RSE.java
index ac0ee81..8a09a72 100644
--- a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/Example01RSE.java
+++ b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/Example01RSE.java
@@ -25,8 +25,6 @@ public class Example01RSE extends BasicRSExtractor<ModelExample01> {
 
 	private static final long serialVersionUID = 387383893717L;
 
-	public static final Example01RSE DEFAULT = new Example01RSE();
-
 	@Override
 	public ModelExample01 extractNext( ResultSet rs ) throws SQLException { 
 		HelperExample01 current = new HelperExample01();
diff --git a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/MappedTableRSE.java b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/MappedTableRSE.java
index 6683b59..bb2d06b 100644
--- a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/MappedTableRSE.java
+++ b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/MappedTableRSE.java
@@ -25,8 +25,6 @@ public class MappedTableRSE extends BasicRSExtractor<ModelMappedTable> {
 
 	private static final long serialVersionUID = 324511825120L;
 
-	public static final MappedTableRSE DEFAULT = new MappedTableRSE();
-
 	@Override
 	public ModelMappedTable extractNext( ResultSet rs ) throws SQLException { 
 		HelperMappedTable current = new HelperMappedTable();
diff --git a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/PersonRSE.java b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/PersonRSE.java
index b9099a7..2c5ca90 100644
--- a/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/PersonRSE.java
+++ b/src/main/java/org/fugerit/java/daogen/quickstart/impl/rse/PersonRSE.java
@@ -25,8 +25,6 @@ public class PersonRSE extends BasicRSExtractor<ModelPerson> {
 
 	private static final long serialVersionUID = 102069616197L;
 
-	public static final PersonRSE DEFAULT = new PersonRSE();
-
 	@Override
 	public ModelPerson extractNext( ResultSet rs ) throws SQLException { 
 		HelperPerson current = new HelperPerson();
diff --git a/src/main/resources/daogen-reflect-config.json b/src/main/resources/daogen-reflect-config.json
index 180fd86..6820f0d 100644
--- a/src/main/resources/daogen-reflect-config.json
+++ b/src/main/resources/daogen-reflect-config.json
@@ -1,23 +1,22 @@
 [ {
   "name" : "org.fugerit.java.daogen.quickstart.def.model.ModelDocument",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getCreationDate",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdOwner",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
     "name" : "getIdCreator",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getCreationDate",
+    "name" : "getIdOwner",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getUpdateDate",
+    "name" : "getInfo",
     "parameterTypes" : [ ]
   }, {
     "name" : "getPath",
@@ -26,7 +25,7 @@
     "name" : "getState",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getInfo",
+    "name" : "getUpdateDate",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -34,24 +33,23 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.HelperDocument",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getCreationDate",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdOwner",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
     "name" : "getIdCreator",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getCreationDate",
+    "name" : "getIdOwner",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getUpdateDate",
+    "name" : "getInfo",
     "parameterTypes" : [ ]
   }, {
     "name" : "getPath",
@@ -60,7 +58,7 @@
     "name" : "getState",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getInfo",
+    "name" : "getUpdateDate",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -68,24 +66,23 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.WrapperDocument",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getCreationDate",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdOwner",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
     "name" : "getIdCreator",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getCreationDate",
+    "name" : "getIdOwner",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getUpdateDate",
+    "name" : "getInfo",
     "parameterTypes" : [ ]
   }, {
     "name" : "getPath",
@@ -94,7 +91,7 @@
     "name" : "getState",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getInfo",
+    "name" : "getUpdateDate",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -102,7 +99,6 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.def.model.ModelExample01",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
@@ -121,7 +117,6 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.HelperExample01",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
@@ -140,7 +135,6 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.WrapperExample01",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
@@ -159,15 +153,14 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.def.model.ModelMappedTable",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getContent",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getContent",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -175,15 +168,14 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.HelperMappedTable",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getContent",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getContent",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -191,15 +183,14 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.WrapperMappedTable",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getContent",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getContent",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -207,42 +198,41 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.def.model.ModelPerson",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getBirthDate",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getSurname",
+    "name" : "getFather",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getName",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getBirthDate",
+    "name" : "getIdFather",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getNote",
+    "name" : "getIdMother",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdMother",
+    "name" : "getMother",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdFather",
+    "name" : "getName",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getVirtualNote",
+    "name" : "getNote",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getMother",
+    "name" : "getOwnedDocuments",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getFather",
+    "name" : "getSurname",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getOwnedDocuments",
+    "name" : "getVirtualNote",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -250,42 +240,41 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.HelperPerson",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getBirthDate",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getSurname",
+    "name" : "getFather",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getName",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getBirthDate",
+    "name" : "getIdFather",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getNote",
+    "name" : "getIdMother",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdMother",
+    "name" : "getMother",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdFather",
+    "name" : "getName",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getVirtualNote",
+    "name" : "getNote",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getMother",
+    "name" : "getOwnedDocuments",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getFather",
+    "name" : "getSurname",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getOwnedDocuments",
+    "name" : "getVirtualNote",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",
@@ -293,42 +282,41 @@
   } ]
 }, {
   "name" : "org.fugerit.java.daogen.quickstart.impl.helper.WrapperPerson",
-  "fields" : [ ],
   "methods" : [ {
     "name" : "<init>",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getId",
+    "name" : "getBirthDate",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getSurname",
+    "name" : "getFather",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getName",
+    "name" : "getId",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getBirthDate",
+    "name" : "getIdFather",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getNote",
+    "name" : "getIdMother",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdMother",
+    "name" : "getMother",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getIdFather",
+    "name" : "getName",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getVirtualNote",
+    "name" : "getNote",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getMother",
+    "name" : "getOwnedDocuments",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getFather",
+    "name" : "getSurname",
     "parameterTypes" : [ ]
   }, {
-    "name" : "getOwnedDocuments",
+    "name" : "getVirtualNote",
     "parameterTypes" : [ ]
   }, {
     "name" : "isEmpty",