diff --git a/pom.xml b/pom.xml
index 8725746..b15779e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,8 @@
 		<!--<tdrules.version>4.3.1</tdrules.version>-->
 		<!--<tdrules.version>4.3.2-SNAPSHOT</tdrules.version>-->
 		<tdrules.version>4.3.2-next-release-SNAPSHOT</tdrules.version>
-		<qagrow.version>1.4.275</qagrow.version>
+		<!--<qagrow.version>1.4.275</qagrow.version>-->
+		<qagrow.version>1.4.0-next-tdrules-release-SNAPSHOT</qagrow.version>
 	</properties>
 
 	<modules>
diff --git a/st-tdg-eval/src/test/java/test4giis/tdrules/tdg/st/eval/petstore/Base.java b/st-tdg-eval/src/test/java/test4giis/tdrules/tdg/st/eval/petstore/Base.java
index fedfcd9..405a220 100644
--- a/st-tdg-eval/src/test/java/test4giis/tdrules/tdg/st/eval/petstore/Base.java
+++ b/st-tdg-eval/src/test/java/test4giis/tdrules/tdg/st/eval/petstore/Base.java
@@ -9,8 +9,8 @@
 import giis.tdrules.client.oa.OaSchemaIdResolver;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IAttrGen;
 import giis.tdrules.store.loader.gen.DictionaryAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 import giis.tdrules.store.loader.oa.ApiWriter;
 import giis.tdrules.store.loader.oa.OaLiveAdapter;
 import giis.visualassert.Framework;
diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/BaseAll.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/BaseAll.java
index 84473d3..332388e 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/BaseAll.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/BaseAll.java
@@ -20,7 +20,7 @@
 import giis.tdrules.openapi.model.TdRules;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 import giis.tdrules.store.loader.oa.ApiWriter;
 import giis.tdrules.store.loader.oa.OaLiveAdapter;
 import giis.tdrules.store.loader.oa.OaLocalAdapter;
@@ -226,7 +226,7 @@ protected void assertLiveData(String fileName, DataLoader dg) {
 		// a more compact presentation for easier comparison (one object per line)
 		String payload=getAllLiveData();
 		payload=reserializeStoredData(payload);
-		log.info("Actual data stored in the backend\n{}", reserializeStoredData(payload));
+		log.info("Actual data stored in the backend:\n{}", payload);
 		// Rename the file to separate the locally generated from the live loaded
 		assertModel(fileName.replace("-local-", "-live-"), payload); 
 	}
diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/gestaohospital/BaseGestaoHospital.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/gestaohospital/BaseGestaoHospital.java
index e8db16c..8f5cd3f 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/gestaohospital/BaseGestaoHospital.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/gestaohospital/BaseGestaoHospital.java
@@ -3,8 +3,8 @@
 import giis.tdrules.client.oa.OaSchemaApi;
 import giis.tdrules.client.oa.OaSchemaIdResolver;
 import giis.tdrules.openapi.model.TdSchema;
-import giis.tdrules.store.loader.IAttrGen;
 import giis.tdrules.store.loader.gen.DictionaryAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 import test4giis.tdrules.tdg.st.test.BaseAll;
 
 public class BaseGestaoHospital extends BaseAll{
diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/BaseMarket.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/BaseMarket.java
index dd9cebb..75eea5e 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/BaseMarket.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/BaseMarket.java
@@ -11,8 +11,8 @@
 import giis.tdrules.client.oa.OaSchemaFilter;
 import giis.tdrules.openapi.model.TdSchema;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IAttrGen;
 import giis.tdrules.store.loader.gen.DictionaryAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 import giis.tdrules.store.loader.oa.OaBasicAuthStore;
 import giis.tdrules.store.loader.oa.OaLiveAdapter;
 import giis.tdrules.store.loader.oa.OaLiveUidGen;
diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncCarts.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncCarts.java
index 95781e8..39d744c 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncCarts.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncCarts.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 
 /**
  * Carts Functionality Tests.
diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncProducts.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncProducts.java
index 9671e4f..16d75ef 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncProducts.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/market/TestMarketFuncProducts.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 
 /**
  * Products Functionality Tests
diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java
index 40d337b..381d406 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java
@@ -3,8 +3,8 @@
 import giis.tdrules.client.oa.OaSchemaApi;
 import giis.tdrules.client.oa.OaSchemaIdResolver;
 import giis.tdrules.openapi.model.TdSchema;
-import giis.tdrules.store.loader.IAttrGen;
 import giis.tdrules.store.loader.gen.DictionaryAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 import test4giis.tdrules.tdg.st.test.BaseAll;
 
 /**
diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/TestPetstoreQagrowLocal.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/TestPetstoreQagrowLocal.java
index 334376e..25ac893 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/TestPetstoreQagrowLocal.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/TestPetstoreQagrowLocal.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 
 import giis.tdrules.store.loader.DataLoader;
-import giis.tdrules.store.loader.IAttrGen;
+import giis.tdrules.store.loader.gen.IAttrGen;
 
 /** 
  * Test Data generation for APIs (TDG) for the Swagger Petstore as SUT: