diff --git a/pom.xml b/pom.xml
index 7756982..2eabbb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-gcore-clients</artifactId>
 
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.1-SNAPSHOT</version>
 	<name>GCore Clients</name>
 
 	<description>A framework for client APIs that invoke GCore services</description>
diff --git a/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java b/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java
index 376d1df..ad8ddca 100644
--- a/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java
+++ b/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java
@@ -7,7 +7,8 @@ import org.apache.axis.message.addressing.EndpointReferenceType;
 import org.gcube.common.clients.config.ProxyConfig;
 import org.gcube.common.clients.delegates.ProxyDelegate;
 import org.gcube.common.core.contexts.GCUBERemotePortTypeContext;
-import org.gcube.common.core.scope.GCUBEScopeManager;
+import org.gcube.common.core.scope.GCUBEScope;
+import org.gcube.common.scope.api.ScopeProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,7 +73,7 @@ public final class PluginAdapter<S,P> implements Plugin<S,P> {
 		//add scope
 		if (stub instanceof Remote) {
 			try {
-				remote = GCUBERemotePortTypeContext.getProxy((Remote) stub,GCUBEScopeManager.DEFAULT);
+				remote = GCUBERemotePortTypeContext.getProxy((Remote) stub,GCUBEScope.getScope(ScopeProvider.instance.get()));
 				
 			}
 			catch(Exception e) {
diff --git a/src/main/java/org/gcube/common/clients/gcore/queries/DefaultISFacade.java b/src/main/java/org/gcube/common/clients/gcore/queries/DefaultISFacade.java
index 8228bc9..ac7473d 100644
--- a/src/main/java/org/gcube/common/clients/gcore/queries/DefaultISFacade.java
+++ b/src/main/java/org/gcube/common/clients/gcore/queries/DefaultISFacade.java
@@ -8,7 +8,8 @@ import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.informationsystem.client.AtomicCondition;
 import org.gcube.common.core.informationsystem.client.ISClient;
 import org.gcube.common.core.informationsystem.client.ISTemplateQuery;
-import org.gcube.common.core.scope.GCUBEScopeManager;
+import org.gcube.common.core.scope.GCUBEScope;
+import org.gcube.common.scope.api.ScopeProvider;
 
 /**
  * Default {@link ISFacade} implementation.
@@ -44,7 +45,7 @@ public class DefaultISFacade implements ISFacade {
 		
 		//execte query
 		try {
-			return client.execute(isquery, GCUBEScopeManager.DEFAULT.getScope());
+			return client.execute(isquery,GCUBEScope.getScope(ScopeProvider.instance.get()));
 		}
 		catch(RuntimeException e) {
 			throw e;