diff --git a/.classpath b/.classpath
index e43402f..f619a53 100644
--- a/.classpath
+++ b/.classpath
@@ -6,22 +6,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/pom.xml b/pom.xml
index 83da09c..f2c222f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,11 @@
 			<artifactId>accounting-lib</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 		</dependency>
+		<dependency>
+         <groupId>org.reflections</groupId>
+         <artifactId>reflections</artifactId>
+         <version>LATEST</version>
+     </dependency>
 		
 		<dependency>
 			<groupId>junit</groupId>
diff --git a/src/main/java/org/gcube/accounting/analytics/Info.java b/src/main/java/org/gcube/accounting/analytics/Info.java
index be362d3..877fca9 100644
--- a/src/main/java/org/gcube/accounting/analytics/Info.java
+++ b/src/main/java/org/gcube/accounting/analytics/Info.java
@@ -3,18 +3,21 @@
  */
 package org.gcube.accounting.analytics;
 
+
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  *
  */
 public interface Info {
 
-	public long getData();
+	public long getDate();
 	
 	public Number getInfo();
 	
+	/*
 	public String getUnity(); // Number of Occurrences, Kb, 
 	
 	public String getUnityDescription(); // Total Kb accumulated, Single Operation Kb
+	*/
 	
 }
diff --git a/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java b/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java
index 5288a91..a4d6f28 100644
--- a/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/ResourceRecordQuery.java
@@ -3,25 +3,58 @@
  */
 package org.gcube.accounting.analytics;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.gcube.accounting.analytics.persistence.AccountingPersistenceQuery;
-import org.gcube.accounting.datamodel.UsageRecord;
+import org.gcube.accounting.datamodel.SingleUsageRecord;
+import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
+import org.reflections.Reflections;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  */
 public class ResourceRecordQuery {
-
+	
+	private static Logger logger = LoggerFactory.getLogger(ResourceRecordQuery.class);
+	
+	protected static Map<Class<? extends SingleUsageRecord>, Set<String>> resourceRecords = null;
+	
+	public static Map<Class<? extends SingleUsageRecord>, Set<String>> getResourceRecordsTypes() {
+		if(resourceRecords==null){
+			resourceRecords = new HashMap<Class<? extends SingleUsageRecord>, Set<String>>();
+			Package usageRecordPackage = ServiceUsageRecord.class.getPackage();
+			Reflections reflections = new Reflections(usageRecordPackage.getName());
+			Set<Class<? extends SingleUsageRecord>> resourceRecordsTypes = reflections.getSubTypesOf(SingleUsageRecord.class);
+			for(Class<? extends SingleUsageRecord> resourceRecordsType : resourceRecordsTypes){
+				try {
+					SingleUsageRecord singleUsageRecord = resourceRecordsType.newInstance();
+					resourceRecords.put(resourceRecordsType, singleUsageRecord.getRequiredFields());
+				} catch (InstantiationException | IllegalAccessException e) {
+					logger.error(String.format("Unable to correctly istantiate %s", resourceRecordsType.getSimpleName()), e.getCause());
+				}
+			}
+			
+		}
+		return resourceRecords;
+	}
+	
+	
 	protected AccountingPersistenceQuery accountingPersistenceQuery;
 	
 	protected ResourceRecordQuery(AccountingPersistenceQuery accountingPersistenceQuery){
 		this.accountingPersistenceQuery = accountingPersistenceQuery;
 	}
 	
-	public List<Info> getInfo(Class<? extends UsageRecord> usageRecordType, 
+	public List<Info> getInfo(Class<? extends SingleUsageRecord> usageRecordType, 
 			TemporalConstraint temporalConstraint, List<Filter> filters) throws Exception{
 		return accountingPersistenceQuery.query(usageRecordType, temporalConstraint, filters);
 	}
 	
+	
+	
 }
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
index 32962f9..544a000 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/AccountingPersistenceQuery.java
@@ -8,7 +8,7 @@ import java.util.List;
 import org.gcube.accounting.analytics.Filter;
 import org.gcube.accounting.analytics.Info;
 import org.gcube.accounting.analytics.TemporalConstraint;
-import org.gcube.accounting.datamodel.UsageRecord;
+import org.gcube.accounting.datamodel.SingleUsageRecord;
 
 /**
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
@@ -18,10 +18,10 @@ public abstract class AccountingPersistenceQuery {
 	
 	protected abstract void prepareConnection(AccountingPersistenceQueryConfiguration configuration) throws Exception;
 	
-	protected abstract List<Info> reallyQuery(Class<? extends UsageRecord> usageRecordType, 
+	protected abstract List<Info> reallyQuery(Class<? extends SingleUsageRecord> usageRecordType, 
 			TemporalConstraint temporalConstraint, List<Filter> filters) throws Exception;
 	
-	public List<Info> query(Class<? extends UsageRecord> usageRecordType, 
+	public List<Info> query(Class<? extends SingleUsageRecord> usageRecordType, 
 			TemporalConstraint temporalConstraint, List<Filter> filters) throws Exception{
 		return reallyQuery(usageRecordType, temporalConstraint, filters);
 	}
diff --git a/src/test/java/org/gcube/accounting/analytics/ResourceRecordQueryTest.java b/src/test/java/org/gcube/accounting/analytics/ResourceRecordQueryTest.java
new file mode 100644
index 0000000..58af9bd
--- /dev/null
+++ b/src/test/java/org/gcube/accounting/analytics/ResourceRecordQueryTest.java
@@ -0,0 +1,64 @@
+/**
+ * 
+ */
+package org.gcube.accounting.analytics;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.gcube.accounting.datamodel.BasicUsageRecord;
+import org.gcube.accounting.datamodel.SingleUsageRecord;
+import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord;
+import org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord;
+import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
+import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord;
+import org.gcube.accounting.datamodel.usagerecords.TaskUsageRecord;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
+ */
+public class ResourceRecordQueryTest {
+
+	public class TestUsageRecord extends BasicUsageRecord implements SingleUsageRecord {
+
+		/**
+		 * Generated Serial Version UID
+		 */
+		private static final long serialVersionUID = 1939161386352514727L;
+		
+	}
+	
+	public static Set<Class<? extends SingleUsageRecord>> getExpectedResourceRecordsTypes(){
+		Set<Class<? extends SingleUsageRecord>> expected = new HashSet<Class<? extends SingleUsageRecord>>();
+		expected.add(ServiceUsageRecord.class);
+		expected.add(StorageUsageRecord.class);
+		expected.add(JobUsageRecord.class);
+		expected.add(TaskUsageRecord.class);
+		expected.add(PortletUsageRecord.class);
+		return expected;
+	}
+	
+	@Test
+	public void testGetResourceRecordsTypes(){
+		Set<Class<? extends SingleUsageRecord>> expected = getExpectedResourceRecordsTypes();
+		Set<Class<? extends SingleUsageRecord>> found = ResourceRecordQuery.getResourceRecordsTypes().keySet();
+		Assert.assertTrue(expected.containsAll(found));
+		Assert.assertTrue(found.containsAll(expected));
+	}
+	
+	
+	@Test
+	public void testGetResourceRecordsTypesWithFakeClass(){
+		Set<Class<? extends SingleUsageRecord>> expected = getExpectedResourceRecordsTypes();
+		expected.add(TestUsageRecord.class);
+		Set<Class<? extends SingleUsageRecord>> found = ResourceRecordQuery.getResourceRecordsTypes().keySet();
+		Assert.assertTrue(expected.containsAll(found));
+		Assert.assertFalse(found.containsAll(expected));
+	}
+	
+	
+	
+	
+}
diff --git a/src/test/resources/devNext.gcubekey b/src/test/resources/devNext.gcubekey
new file mode 100644
index 0000000..260f269
--- /dev/null
+++ b/src/test/resources/devNext.gcubekey
@@ -0,0 +1 @@
+64Zð/Uä‰Cå±ß˜
\ No newline at end of file
diff --git a/src/test/resources/devsec.gcubekey b/src/test/resources/devsec.gcubekey
new file mode 100644
index 0000000..260f269
--- /dev/null
+++ b/src/test/resources/devsec.gcubekey
@@ -0,0 +1 @@
+64Zð/Uä‰Cå±ß˜
\ No newline at end of file
diff --git a/src/test/resources/gcube.gcubekey b/src/test/resources/gcube.gcubekey
new file mode 100644
index 0000000..260f269
--- /dev/null
+++ b/src/test/resources/gcube.gcubekey
@@ -0,0 +1 @@
+64Zð/Uä‰Cå±ß˜
\ No newline at end of file
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..4f36cc8
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+   <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <logger name="org.gcube" level="TRACE" />
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+  
+</configuration>
\ No newline at end of file