diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java
index 4d94a9f..5cd4994 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/AccountingPersistenceQueryPostgreSQL.java
@@ -74,7 +74,7 @@ public class AccountingPersistenceQueryPostgreSQL implements AccountingPersisten
 		for(String typeName : aggregatedRecords.keySet()) {
 			try {
 				Class<? extends AggregatedRecord<?,?>> clz = aggregatedRecords.get(typeName); 
-				RecordToDBMapping.getRecordToDB(clz);
+				RecordToDBMapping.addRecordToDB(clz, configuration);
 			} catch (Exception e) {
 				new RuntimeException(e);
 			}
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java
index 00aec6c..fef2b2c 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/postgresql/Query.java
@@ -23,7 +23,7 @@ public class Query extends PostgreSQLQuery {
 	public static final String DATE_OF_TIMESERIES_AS_FIELD = AggregatedRecord.START_TIME;
 	
 	private Class<? extends AggregatedRecord<?, ?>> clz;
-	private final RecordToDBFields recordToDBMapper;
+	private final RecordToDBFields recordToDBFields;
 	
 	private List<String> requestedTableField;
 	
@@ -33,7 +33,7 @@ public class Query extends PostgreSQLQuery {
 	
 	public Query(Class<? extends AggregatedRecord<?, ?>> clz) throws Exception {
 		this.clz = clz;
-		this.recordToDBMapper = RecordToDBMapping.getRecordToDB(clz);
+		this.recordToDBFields = RecordToDBMapping.getRecordToDBFields(clz);
 	}
 	
 	public List<String> getRequestedTableField() {
@@ -61,11 +61,11 @@ public class Query extends PostgreSQLQuery {
 	
 
 	public RecordToDBFields getRecordToDBMapper() {
-		return recordToDBMapper;
+		return recordToDBFields;
 	}
 
 	protected String getTableField(String fieldName) {
-		return recordToDBMapper.getTableField(fieldName);
+		return recordToDBFields.getTableField(fieldName);
 	}
 	
 	protected void appendTableField(String fieldName) {
@@ -220,7 +220,7 @@ public class Query extends PostgreSQLQuery {
 		addEmittedFields();
 		
 		stringBuffer.append(" FROM ");
-		stringBuffer.append(recordToDBMapper.getTableName());
+		stringBuffer.append(recordToDBFields.getTableName());
 		
 		addTemporalConstraintToQuery();