diff --git a/pom.xml b/pom.xml
index 9b5858c..c1a0665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,12 @@
 			<version>[2.1.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-scope</artifactId>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
index 1f9b2f5..83ba138 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
@@ -21,6 +21,7 @@ import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQu
 import org.gcube.accounting.analytics.persistence.AccountingPersistenceBackendQueryConfiguration;
 import org.gcube.accounting.datamodel.BasicUsageRecord;
 import org.gcube.accounting.datamodel.UsageRecord;
+import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.documentstore.records.AggregatedRecord;
 import org.gcube.documentstore.records.Record;
 import org.gcube.documentstore.records.RecordUtility;
@@ -108,7 +109,8 @@ public class AccountingPersistenceQueryCouchBase extends AccountingPersistenceBa
 			TemporalConstraint temporalConstraint, List<Filter> filters)
 			throws Exception {
 		
-		String currentScope = BasicUsageRecord.getScopeFromToken();
+		//String currentScope = BasicUsageRecord.getScopeFromToken();
+		String currentScope = ScopeProvider.instance.get();
 		String recordType = recordClass.newInstance().getRecordType();
 		
 		Expression expression = x(BasicUsageRecord.SCOPE).eq(s(currentScope));