diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaAddress.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaAddress.java
new file mode 100644
index 0000000..d3cb08d
--- /dev/null
+++ b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaAddress.java
@@ -0,0 +1,113 @@
+package org.fugerit.java.daogen.sample.impl.helper;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.fugerit.java.core.db.daogen.BasicWrapperNG;
+import org.fugerit.java.daogen.sample.def.model.ModelAddress;
+import org.fugerit.java.daogen.sample.def.model.ModelUser;
+
+// custom import start ( code above here will be overwritten )
+// custom import end ( code below here will be overwritten )
+
+/**
+ * MPSchemaAddress, version : 1.0.0
+ *
+ * author: fugerit
+ *
+ * warning!: auto generated object, insert custom code only between comments :
+ * // custom code start ( code above here will be overwritten )
+ * // custom code end ( code below here will be overwritten )
+ */
+@Schema( description = "Contains addresses data")
+public class MPSchemaAddress extends BasicWrapperNG<ModelAddress> implements ModelAddress {
+
+	// custom code start ( code above here will be overwritten )
+	// custom code end ( code below here will be overwritten )
+
+	public MPSchemaAddress( ModelAddress wrapped ) {
+		super( wrapped );
+	}
+
+	public ModelAddress unwrap( MPSchemaAddress wrapper ) {
+		ModelAddress res = wrapper;
+		while ( res instanceof MPSchemaAddress ) { 
+			res = ((MPSchemaAddress)res).unwrapModel();
+		}
+		return res;
+	}
+
+	/*
+	 * fields generated for relations 
+	 */
+
+	@Override
+	public void setUser( ModelUser value ) {
+		this.unwrapModel().setUser( value );
+	}
+
+	@Override
+	public ModelUser getUser() {
+		return this.unwrapModel().getUser();
+	}
+
+	/*
+	 * fields generated for entity attributes 
+	 */
+	@Override
+	public void setId( java.math.BigDecimal value ) {
+		this.unwrapModel().setId( value );
+	}
+
+	@Schema( description = "Address system id" )
+	@Override
+	public java.math.BigDecimal getId() {
+		return this.unwrapModel().getId();
+	}
+
+	@Override
+	public void setIdUser( java.math.BigDecimal value ) {
+		this.unwrapModel().setIdUser( value );
+	}
+
+	@Schema( description = "User linked to to address" )
+	@Override
+	public java.math.BigDecimal getIdUser() {
+		return this.unwrapModel().getIdUser();
+	}
+
+	@Override
+	public void setDateInsert( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateInsert( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateInsert() {
+		return this.unwrapModel().getDateInsert();
+	}
+
+	@Override
+	public void setDateUpdate( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateUpdate( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateUpdate() {
+		return this.unwrapModel().getDateUpdate();
+	}
+
+	@Override
+	public void setInfo( java.lang.String value ) {
+		this.unwrapModel().setInfo( value );
+	}
+
+	@Schema( description = "Address info" )
+	@Override
+	public java.lang.String getInfo() {
+		return this.unwrapModel().getInfo();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return this.unwrapModel().isEmpty();
+	}
+
+}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaLogData.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaLogData.java
new file mode 100644
index 0000000..720763a
--- /dev/null
+++ b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaLogData.java
@@ -0,0 +1,74 @@
+package org.fugerit.java.daogen.sample.impl.helper;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.fugerit.java.core.db.daogen.BasicWrapperNG;
+import org.fugerit.java.daogen.sample.def.model.ModelLogData;
+
+// custom import start ( code above here will be overwritten )
+// custom import end ( code below here will be overwritten )
+
+/**
+ * MPSchemaLogData, version : 1.0.0
+ *
+ * author: fugerit
+ *
+ * warning!: auto generated object, insert custom code only between comments :
+ * // custom code start ( code above here will be overwritten )
+ * // custom code end ( code below here will be overwritten )
+ */
+public class MPSchemaLogData extends BasicWrapperNG<ModelLogData> implements ModelLogData {
+
+	// custom code start ( code above here will be overwritten )
+	// custom code end ( code below here will be overwritten )
+
+	public MPSchemaLogData( ModelLogData wrapped ) {
+		super( wrapped );
+	}
+
+	public ModelLogData unwrap( MPSchemaLogData wrapper ) {
+		ModelLogData res = wrapper;
+		while ( res instanceof MPSchemaLogData ) { 
+			res = ((MPSchemaLogData)res).unwrapModel();
+		}
+		return res;
+	}
+
+	/*
+	 * fields generated for entity attributes 
+	 */
+	@Override
+	public void setId( java.math.BigDecimal value ) {
+		this.unwrapModel().setId( value );
+	}
+
+	@Override
+	public java.math.BigDecimal getId() {
+		return this.unwrapModel().getId();
+	}
+
+	@Override
+	public void setLogTime( java.time.LocalDateTime value ) {
+		this.unwrapModel().setLogTime( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getLogTime() {
+		return this.unwrapModel().getLogTime();
+	}
+
+	@Override
+	public void setInfo( java.lang.String value ) {
+		this.unwrapModel().setInfo( value );
+	}
+
+	@Override
+	public java.lang.String getInfo() {
+		return this.unwrapModel().getInfo();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return this.unwrapModel().isEmpty();
+	}
+
+}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaTestTwoFieldKey.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaTestTwoFieldKey.java
new file mode 100644
index 0000000..f557624
--- /dev/null
+++ b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaTestTwoFieldKey.java
@@ -0,0 +1,74 @@
+package org.fugerit.java.daogen.sample.impl.helper;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.fugerit.java.core.db.daogen.BasicWrapperNG;
+import org.fugerit.java.daogen.sample.def.model.ModelTestTwoFieldKey;
+
+// custom import start ( code above here will be overwritten )
+// custom import end ( code below here will be overwritten )
+
+/**
+ * MPSchemaTestTwoFieldKey, version : 1.0.0
+ *
+ * author: fugerit
+ *
+ * warning!: auto generated object, insert custom code only between comments :
+ * // custom code start ( code above here will be overwritten )
+ * // custom code end ( code below here will be overwritten )
+ */
+public class MPSchemaTestTwoFieldKey extends BasicWrapperNG<ModelTestTwoFieldKey> implements ModelTestTwoFieldKey {
+
+	// custom code start ( code above here will be overwritten )
+	// custom code end ( code below here will be overwritten )
+
+	public MPSchemaTestTwoFieldKey( ModelTestTwoFieldKey wrapped ) {
+		super( wrapped );
+	}
+
+	public ModelTestTwoFieldKey unwrap( MPSchemaTestTwoFieldKey wrapper ) {
+		ModelTestTwoFieldKey res = wrapper;
+		while ( res instanceof MPSchemaTestTwoFieldKey ) { 
+			res = ((MPSchemaTestTwoFieldKey)res).unwrapModel();
+		}
+		return res;
+	}
+
+	/*
+	 * fields generated for entity attributes 
+	 */
+	@Override
+	public void setIdOne( java.math.BigDecimal value ) {
+		this.unwrapModel().setIdOne( value );
+	}
+
+	@Override
+	public java.math.BigDecimal getIdOne() {
+		return this.unwrapModel().getIdOne();
+	}
+
+	@Override
+	public void setIdTwo( java.math.BigDecimal value ) {
+		this.unwrapModel().setIdTwo( value );
+	}
+
+	@Override
+	public java.math.BigDecimal getIdTwo() {
+		return this.unwrapModel().getIdTwo();
+	}
+
+	@Override
+	public void setInfo( java.lang.String value ) {
+		this.unwrapModel().setInfo( value );
+	}
+
+	@Override
+	public java.lang.String getInfo() {
+		return this.unwrapModel().getInfo();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return this.unwrapModel().isEmpty();
+	}
+
+}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUpload.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUpload.java
new file mode 100644
index 0000000..63af409
--- /dev/null
+++ b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUpload.java
@@ -0,0 +1,85 @@
+package org.fugerit.java.daogen.sample.impl.helper;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.fugerit.java.core.db.daogen.BasicWrapperNG;
+import org.fugerit.java.daogen.sample.def.model.ModelUpload;
+
+// custom import start ( code above here will be overwritten )
+// custom import end ( code below here will be overwritten )
+
+/**
+ * MPSchemaUpload, version : 1.0.0
+ *
+ * author: fugerit
+ *
+ * warning!: auto generated object, insert custom code only between comments :
+ * // custom code start ( code above here will be overwritten )
+ * // custom code end ( code below here will be overwritten )
+ */
+@Schema( description = "Contains upload blob")
+public class MPSchemaUpload extends BasicWrapperNG<ModelUpload> implements ModelUpload {
+
+	// custom code start ( code above here will be overwritten )
+	// custom code end ( code below here will be overwritten )
+
+	public MPSchemaUpload( ModelUpload wrapped ) {
+		super( wrapped );
+	}
+
+	public ModelUpload unwrap( MPSchemaUpload wrapper ) {
+		ModelUpload res = wrapper;
+		while ( res instanceof MPSchemaUpload ) { 
+			res = ((MPSchemaUpload)res).unwrapModel();
+		}
+		return res;
+	}
+
+	/*
+	 * fields generated for entity attributes 
+	 */
+	@Override
+	public void setId( java.math.BigDecimal value ) {
+		this.unwrapModel().setId( value );
+	}
+
+	@Override
+	public java.math.BigDecimal getId() {
+		return this.unwrapModel().getId();
+	}
+
+	@Override
+	public void setDateInsert( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateInsert( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateInsert() {
+		return this.unwrapModel().getDateInsert();
+	}
+
+	@Override
+	public void setDateUpdate( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateUpdate( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateUpdate() {
+		return this.unwrapModel().getDateUpdate();
+	}
+
+	@Override
+	public void setContent( org.fugerit.java.core.db.daogen.ByteArrayDataHandler value ) {
+		this.unwrapModel().setContent( value );
+	}
+
+	@Override
+	public org.fugerit.java.core.db.daogen.ByteArrayDataHandler getContent() {
+		return this.unwrapModel().getContent();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return this.unwrapModel().isEmpty();
+	}
+
+}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUser.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUser.java
new file mode 100644
index 0000000..7bec9fe
--- /dev/null
+++ b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUser.java
@@ -0,0 +1,146 @@
+package org.fugerit.java.daogen.sample.impl.helper;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.fugerit.java.core.db.daogen.BasicWrapperNG;
+import org.fugerit.java.daogen.sample.def.model.ModelAddress;
+import org.fugerit.java.daogen.sample.def.model.ModelUser;
+
+// custom import start ( code above here will be overwritten )
+// custom import end ( code below here will be overwritten )
+
+/**
+ * MPSchemaUser, version : 1.0.0
+ *
+ * author: fugerit
+ *
+ * warning!: auto generated object, insert custom code only between comments :
+ * // custom code start ( code above here will be overwritten )
+ * // custom code end ( code below here will be overwritten )
+ */
+@Schema( description = "Contains users data")
+public class MPSchemaUser extends BasicWrapperNG<ModelUser> implements ModelUser {
+
+	// custom code start ( code above here will be overwritten )
+	// custom code end ( code below here will be overwritten )
+
+	public MPSchemaUser( ModelUser wrapped ) {
+		super( wrapped );
+	}
+
+	public ModelUser unwrap( MPSchemaUser wrapper ) {
+		ModelUser res = wrapper;
+		while ( res instanceof MPSchemaUser ) { 
+			res = ((MPSchemaUser)res).unwrapModel();
+		}
+		return res;
+	}
+
+	/*
+	 * fields generated for relations 
+	 */
+
+	@Override
+	public void setUserAddresses( java.util.List<ModelAddress> value ) {
+		this.unwrapModel().setUserAddresses( value );
+	}
+
+	@Override
+	public java.util.List<ModelAddress> getUserAddresses() {
+		return this.unwrapModel().getUserAddresses();
+	}
+
+	/*
+	 * fields generated for entity attributes 
+	 */
+	@Override
+	public void setId( java.math.BigDecimal value ) {
+		this.unwrapModel().setId( value );
+	}
+
+	@Schema( description = "User system id" , example ="123")
+	@Override
+	public java.math.BigDecimal getId() {
+		return this.unwrapModel().getId();
+	}
+
+	@Override
+	public void setUsername( java.lang.String value ) {
+		this.unwrapModel().setUsername( value );
+	}
+
+	@Schema( description = "User chosen id" , example ="user1")
+	@Override
+	public java.lang.String getUsername() {
+		return this.unwrapModel().getUsername();
+	}
+
+	@Override
+	public void setPassword( java.lang.String value ) {
+		this.unwrapModel().setPassword( value );
+	}
+
+	@Schema( description = "Password hash" )
+	@Override
+	public java.lang.String getPassword() {
+		return this.unwrapModel().getPassword();
+	}
+
+	@Override
+	public void setLastLogin( java.time.LocalDateTime value ) {
+		this.unwrapModel().setLastLogin( value );
+	}
+
+	@Schema( description = "Time of last user login" )
+	@Override
+	public java.time.LocalDateTime getLastLogin() {
+		return this.unwrapModel().getLastLogin();
+	}
+
+	@Override
+	public void setDateInsert( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateInsert( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateInsert() {
+		return this.unwrapModel().getDateInsert();
+	}
+
+	@Override
+	public void setDateUpdate( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateUpdate( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateUpdate() {
+		return this.unwrapModel().getDateUpdate();
+	}
+
+	@Override
+	public void setState( java.math.BigDecimal value ) {
+		this.unwrapModel().setState( value );
+	}
+
+	@Schema( description = "1 active, 0 not active" )
+	@Override
+	public java.math.BigDecimal getState() {
+		return this.unwrapModel().getState();
+	}
+
+	@Override
+	public void setStateVirtual( java.math.BigDecimal value ) {
+		this.unwrapModel().setStateVirtual( value );
+	}
+
+	@Schema( description = "1 active, 0 not active" )
+	@Override
+	public java.math.BigDecimal getStateVirtual() {
+		return this.unwrapModel().getStateVirtual();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return this.unwrapModel().isEmpty();
+	}
+
+}
diff --git a/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUserData.java b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUserData.java
new file mode 100644
index 0000000..d5a2b19
--- /dev/null
+++ b/fj-daogen-sample/src/main/java/org/fugerit/java/daogen/sample/impl/helper/MPSchemaUserData.java
@@ -0,0 +1,120 @@
+package org.fugerit.java.daogen.sample.impl.helper;
+
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.fugerit.java.core.db.daogen.BasicWrapperNG;
+import org.fugerit.java.daogen.sample.def.model.ModelUserData;
+
+// custom import start ( code above here will be overwritten )
+// custom import end ( code below here will be overwritten )
+
+/**
+ * MPSchemaUserData, version : 1.0.0
+ *
+ * author: fugerit
+ *
+ * warning!: auto generated object, insert custom code only between comments :
+ * // custom code start ( code above here will be overwritten )
+ * // custom code end ( code below here will be overwritten )
+ */
+@Schema( description = "Contains users data")
+public class MPSchemaUserData extends BasicWrapperNG<ModelUserData> implements ModelUserData {
+
+	// custom code start ( code above here will be overwritten )
+	// custom code end ( code below here will be overwritten )
+
+	public MPSchemaUserData( ModelUserData wrapped ) {
+		super( wrapped );
+	}
+
+	public ModelUserData unwrap( MPSchemaUserData wrapper ) {
+		ModelUserData res = wrapper;
+		while ( res instanceof MPSchemaUserData ) { 
+			res = ((MPSchemaUserData)res).unwrapModel();
+		}
+		return res;
+	}
+
+	/*
+	 * fields generated for entity attributes 
+	 */
+	@Override
+	public void setId( java.math.BigDecimal value ) {
+		this.unwrapModel().setId( value );
+	}
+
+	@Schema( description = "User system id" )
+	@Override
+	public java.math.BigDecimal getId() {
+		return this.unwrapModel().getId();
+	}
+
+	@Override
+	public void setUsername( java.lang.String value ) {
+		this.unwrapModel().setUsername( value );
+	}
+
+	@Schema( description = "User chosen id" )
+	@Override
+	public java.lang.String getUsername() {
+		return this.unwrapModel().getUsername();
+	}
+
+	@Override
+	public void setPassword( java.lang.String value ) {
+		this.unwrapModel().setPassword( value );
+	}
+
+	@Schema( description = "Password hash" )
+	@Override
+	public java.lang.String getPassword() {
+		return this.unwrapModel().getPassword();
+	}
+
+	@Override
+	public void setLastLogin( java.time.LocalDateTime value ) {
+		this.unwrapModel().setLastLogin( value );
+	}
+
+	@Schema( description = "Time of last user login" )
+	@Override
+	public java.time.LocalDateTime getLastLogin() {
+		return this.unwrapModel().getLastLogin();
+	}
+
+	@Override
+	public void setDateInsert( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateInsert( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateInsert() {
+		return this.unwrapModel().getDateInsert();
+	}
+
+	@Override
+	public void setDateUpdate( java.time.LocalDateTime value ) {
+		this.unwrapModel().setDateUpdate( value );
+	}
+
+	@Override
+	public java.time.LocalDateTime getDateUpdate() {
+		return this.unwrapModel().getDateUpdate();
+	}
+
+	@Override
+	public void setState( java.math.BigDecimal value ) {
+		this.unwrapModel().setState( value );
+	}
+
+	@Schema( description = "1 active, 0 not active" )
+	@Override
+	public java.math.BigDecimal getState() {
+		return this.unwrapModel().getState();
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return this.unwrapModel().isEmpty();
+	}
+
+}