diff --git a/src/main/java/org/gcube/accounting/utility/postgresql/PostgreSQLQuery.java b/src/main/java/org/gcube/accounting/utility/postgresql/PostgreSQLQuery.java
index f409ce7..b93c205 100644
--- a/src/main/java/org/gcube/accounting/utility/postgresql/PostgreSQLQuery.java
+++ b/src/main/java/org/gcube/accounting/utility/postgresql/PostgreSQLQuery.java
@@ -53,27 +53,13 @@ public class PostgreSQLQuery {
 		return getQuotedString(serializable.toString());
 	}
 	
-	protected void appendKey(String key) {
-		int lenght = key.length();
-		boolean lastLowerCase = true;
-        for (int i=0; i<lenght; i++) { 
-           Character ch = key.charAt(i); /*traversing String one by one*/
-            if (Character.isUpperCase(ch)) {
-            	if(lastLowerCase) {
-            		stringBuffer.append("_");
-            	}
-            	lastLowerCase = false;
-            }else {
-            	lastLowerCase = true;
-            }
-            stringBuffer.append(Character.toLowerCase(ch));
-        }
-	}
-	
-	public String getSQLInsertCommand(Record record) {
+	public String getSQLInsertCommand(Record record) throws Exception {
 		stringBuffer = new StringBuffer();
+		RecordToDBFields recordToDBFields = RecordToDBMapping.getRecordToDB(record.getClass());
+		
 		stringBuffer.append("INSERT INTO ");
-		stringBuffer.append(record.getRecordType().toLowerCase()); // tableNme == RecordType.toLowerCase()
+		stringBuffer.append(recordToDBFields.getTableName());
+		
 		boolean first = true;
 		SortedSet<String> keys = new TreeSet<>(record.getRequiredFields());
 		StringBuffer values = new StringBuffer();
@@ -86,7 +72,8 @@ public class PostgreSQLQuery {
 				stringBuffer.append(",");
 				values.append(",");
 			}
-			appendKey(key);
+			String dbField = recordToDBFields.getTableField(key);
+			stringBuffer.append(dbField);
 			switch (key) {
 				case "creationTime": case "startTime": case "endTime":
 					Calendar calendar = Calendar.getInstance();