diff --git a/.classpath b/.classpath
index eee9dc4..c7d03c1 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/accounting-manager-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/accounting-manager-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/accounting-manager-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/accounting-manager-1.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -45,5 +45,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/accounting-manager-1.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/accounting-manager-1.1.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/config/profile.xml b/config/profile.xml
index ccbb388..050d452 100644
--- a/config/profile.xml
+++ b/config/profile.xml
@@ -11,15 +11,15 @@
 			<Software>
 				<Description>accounting-manager manages accounting informations</Description>
 				<Name>accounting-manager</Name>
-				<Version>1.0.0-SNAPSHOT</Version>
+				<Version>1.1.0-SNAPSHOT</Version>
 				<MavenCoordinates>
 					<groupId>org.gcube.portlets.admin</groupId>
 					<artifactId>accounting-manager</artifactId>
-					<version>1.0.0-SNAPSHOT</version>
+					<version>1.1.0-SNAPSHOT</version>
 				</MavenCoordinates>
 				<Type>webapplication</Type>
 				<Files>
-					<File>accounting-manager-1.0.0-SNAPSHOT.war</File>	
+					<File>accounting-manager-1.1.0-SNAPSHOT.war</File>	
 				</Files>
 			</Software>
 		</Packages>
diff --git a/distro/README b/distro/README
index b0e15e7..f4a8830 100644
--- a/distro/README
+++ b/distro/README
@@ -15,7 +15,7 @@ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
 Version and Release Date
 ------------------------
 
-v. 1.0.0-SNAPSHOT (2015-10-15)
+v. 1.1.0-SNAPSHOT (2016-01-31)
 
 
 Description
diff --git a/distro/changelog.xml b/distro/changelog.xml
index d3d4217..b27df34 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,7 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.admin.accounting-manager.1-1-0" date="2016-01-31">
+		<Change>Fixed library dependencies</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.admin.accounting-manager.1-0-0" date="2015-10-15">
 		<Change>First Release</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index 61d1efd..ac52769 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>accounting-manager</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
@@ -41,7 +41,7 @@
 	<properties>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
-		<release.date>2015-10-15</release.date>
+		<release.date>2016-01-31</release.date>
 		<wikiurl>https://gcube.wiki.gcube-system.org/gcube/index.php/Accounting_Manager</wikiurl>
 		<templatesDirectory>templates</templatesDirectory>
 		<distroDirectory>distro</distroDirectory>
@@ -75,7 +75,11 @@
 					<version>1.0.1</version>
 					<scope>runtime</scope>
 				</dependency>
-
+				<dependency>
+					<groupId>org.gcube.accounting</groupId>
+					<artifactId>accounting-lib</artifactId>
+					<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>
@@ -185,7 +189,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
-		</dependency> 
+		</dependency>
 
 
 		<!-- WSLT dependencies <dependency> <groupId>org.gcube.portlets.widgets</groupId> 
@@ -200,28 +204,38 @@
 			<artifactId>session-checker</artifactId>
 			<version>[0.2.0-SNAPSHOT,1.0.0-SNAPSHOT)</version>
 		</dependency>
-	
+
 		<!-- Common Encryption -->
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-encryption</artifactId>
 			<scope>provided</scope>
 		</dependency>
-	
+
 		<!-- Accounting Lib -->
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-lib</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<!-- Accounting Analytics -->
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
 			<artifactId>accounting-analytics</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<version>[1.1.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
+		<!-- Document Store Lib -->
+		<dependency>
+			<groupId>org.gcube.data.publishing</groupId>
+			<artifactId>document-store-lib</artifactId>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<scope>provided</scope>
+		</dependency>
+
+
 		<!-- Accounting Persistence-Couchdb -->
 		<dependency>
 			<groupId>org.gcube.accounting</groupId>
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java
index 36066e8..b6d1945 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java
@@ -3,10 +3,10 @@ package org.gcube.portlets.admin.accountingmanager.server.amservice;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.accounting.aggregation.AggregatedServiceUsageRecord;
-import org.gcube.accounting.aggregation.AggregatedStorageUsageRecord;
 import org.gcube.accounting.analytics.Info;
 import org.gcube.accounting.analytics.ResourceRecordQuery;
+import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
+import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery4Job;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery4Portlet;
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java
index b6d79bd..68f13e8 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java
@@ -4,8 +4,8 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import org.gcube.accounting.aggregation.AggregatedJobUsageRecord;
 import org.gcube.accounting.analytics.TemporalConstraint;
+import org.gcube.accounting.datamodel.aggregation.AggregatedJobUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap;
 import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException;
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java
index c9107e7..ef56bcd 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java
@@ -4,8 +4,8 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import org.gcube.accounting.aggregation.AggregatedPortletUsageRecord;
 import org.gcube.accounting.analytics.TemporalConstraint;
+import org.gcube.accounting.datamodel.aggregation.AggregatedPortletUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap;
 import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException;
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java
index 69b3e16..cabcfa6 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java
@@ -5,9 +5,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import org.gcube.accounting.aggregation.AggregatedServiceUsageRecord;
 import org.gcube.accounting.analytics.Filter;
 import org.gcube.accounting.analytics.TemporalConstraint;
+import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap;
 import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingFilter;
 import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest;
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java
index e202e9b..ee9c7e0 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java
@@ -5,9 +5,9 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import org.gcube.accounting.aggregation.AggregatedStorageUsageRecord;
 import org.gcube.accounting.analytics.Filter;
 import org.gcube.accounting.analytics.TemporalConstraint;
+import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap;
 import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingFilter;
 import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest;
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java
index e7d94b1..2dc88cd 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java
@@ -4,8 +4,8 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
-import org.gcube.accounting.aggregation.AggregatedTaskUsageRecord;
 import org.gcube.accounting.analytics.TemporalConstraint;
+import org.gcube.accounting.datamodel.aggregation.AggregatedTaskUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap;
 import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException;
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Service.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Service.java
index ae1a4e5..e839e27 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Service.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Service.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.admin.accountingmanager.server.amservice.response;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.accounting.aggregation.AggregatedServiceUsageRecord;
 import org.gcube.accounting.analytics.Info;
+import org.gcube.accounting.datamodel.aggregation.AggregatedServiceUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesService;
 import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesServiceData;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException;
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Storage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Storage.java
index be51814..f0f8d5f 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Storage.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Storage.java
@@ -3,8 +3,8 @@ package org.gcube.portlets.admin.accountingmanager.server.amservice.response;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.gcube.accounting.aggregation.AggregatedStorageUsageRecord;
 import org.gcube.accounting.analytics.Info;
+import org.gcube.accounting.datamodel.aggregation.AggregatedStorageUsageRecord;
 import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesStorage;
 import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesStorageData;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException;
diff --git a/templates/changelog.xml b/templates/changelog.xml
index d3d4217..b27df34 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,4 +1,7 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.admin.accounting-manager.1-1-0" date="2016-01-31">
+		<Change>Fixed library dependencies</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.admin.accounting-manager.1-0-0" date="2015-10-15">
 		<Change>First Release</Change>
 	</Changeset>