diff --git a/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPlugin.java b/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPlugin.java
index 6b27ab9..fd0232a 100644
--- a/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPlugin.java
+++ b/src/main/java/org/gcube/informationsystem/sweeper/ISSweeperPlugin.java
@@ -3,9 +3,13 @@ package org.gcube.informationsystem.sweeper;
 import java.util.Calendar;
 import java.util.Map;
 
+
+import org.gcube.common.scope.api.ScopeProvider;
+/*
 import org.gcube.common.authorization.client.Constants;
 import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+*/
 import org.gcube.vremanagement.executor.plugin.Plugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,10 +45,12 @@ public class ISSweeperPlugin extends Plugin<ISSweeperPluginDeclaration> {
 	@Override
 	public void launch(Map<String, Object> inputs) throws Exception {
 		// No inputs needed
-		
+		/*
 		String token = SecurityTokenProvider.instance.get();
 		AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
 		String scope = authorizationEntry.getContext();
+		*/
+		String scope = ScopeProvider.instance.get();
 		logger.debug("Launching {} execution on scope {}", 
 				ISSweeperPluginDeclaration.NAME, scope);