diff --git a/src/main/java/org/gcube/common/scope/impl/ScopedServiceMap.java b/src/main/java/org/gcube/common/scope/impl/ScopedServiceMap.java
index 9ddaf88..c013080 100644
--- a/src/main/java/org/gcube/common/scope/impl/ScopedServiceMap.java
+++ b/src/main/java/org/gcube/common/scope/impl/ScopedServiceMap.java
@@ -47,7 +47,7 @@ public class ScopedServiceMap implements ServiceMap {
 	//helper
 	public ServiceMap currentMap() {
 		
-		String currentScope = SecretManagerProvider.instance.get().getContext();
+		String currentScope = SecretManagerProvider.get().getContext();
 		
 		if (currentScope==null)
 			throw new IllegalStateException("current scope is undefined");
diff --git a/src/main/java/org/gcube/common/scope/impl/ServiceMapScanner.java b/src/main/java/org/gcube/common/scope/impl/ServiceMapScanner.java
index b0ff7c4..1ed2405 100644
--- a/src/main/java/org/gcube/common/scope/impl/ServiceMapScanner.java
+++ b/src/main/java/org/gcube/common/scope/impl/ServiceMapScanner.java
@@ -45,11 +45,9 @@ class ServiceMapScanner {
 
 		try {
 
-			Collection<URL> urls =  ClasspathHelper.forClassLoader();
-			urls.removeIf(url ->  url.toString().endsWith(".so") || url.toString().endsWith(".zip")  );
+			Collection<URL> urls =  ClasspathHelper.forJavaClassPath();
 			
-			
-			ConfigurationBuilder reflectionConf =  new ConfigurationBuilder().addUrls(urls).setScanners(new ResourcesScanner());
+			ConfigurationBuilder reflectionConf =  new ConfigurationBuilder().addUrls(ClasspathHelper.forJavaClassPath()).addUrls(ClasspathHelper.forClassLoader()).setScanners(new ResourcesScanner());
 			
 			Reflections reflection = new Reflections(reflectionConf); 
 			
diff --git a/src/test/java/org/gcube/common/scope/BindingTest.java b/src/test/java/org/gcube/common/scope/BindingTest.java
index 526a387..6c6ffd6 100644
--- a/src/test/java/org/gcube/common/scope/BindingTest.java
+++ b/src/test/java/org/gcube/common/scope/BindingTest.java
@@ -21,12 +21,12 @@ public class BindingTest {
 		
 		final String callScope = "somescope";
 		
-		SecretManagerProvider.instance.set(new TestSecret(callScope));
+		SecretManagerProvider.set(new TestSecret(callScope));
 		
 		Callable<Void> unbound = new Callable<Void>() {
 			@Override
 			public Void call() throws Exception {
-				assertEquals("task thread is not bound to call scope, but to "+SecretManagerProvider.instance.get().getContext(),callScope,SecretManagerProvider.instance.get().getContext());
+				assertEquals("task thread is not bound to call scope, but to "+SecretManagerProvider.get().getContext(),callScope,SecretManagerProvider.get().getContext());
 				return null;
 			}
 		};
@@ -36,21 +36,21 @@ public class BindingTest {
 		String newScope = "newscope";
 		
 		//scope in current thread changes
-		SecretManagerProvider.instance.set(new TestSecret(newScope));
+		SecretManagerProvider.set(new TestSecret(newScope));
 		
 		//task is submittted
 		executor.submit(bound).get();
 		
 		//resetting task
-		assertEquals("call thread does not retain its latest scope",newScope,SecretManagerProvider.instance.get().getContext());
+		assertEquals("call thread does not retain its latest scope",newScope,SecretManagerProvider.get().getContext());
 
 		//reset call scope
-		SecretManagerProvider.instance.reset();
+		SecretManagerProvider.reset();
 		
 		Callable<Void> cleanupTest = new Callable<Void>() {
 			@Override
 			public Void call() throws Exception {
-				assertNull(SecretManagerProvider.instance.get());
+				assertNull(SecretManagerProvider.get());
 				return null;
 			}
 		};
diff --git a/src/test/java/org/gcube/common/scope/ServiceMapTest.java b/src/test/java/org/gcube/common/scope/ServiceMapTest.java
index 34adaef..7f58b4a 100644
--- a/src/test/java/org/gcube/common/scope/ServiceMapTest.java
+++ b/src/test/java/org/gcube/common/scope/ServiceMapTest.java
@@ -54,7 +54,7 @@ public class ServiceMapTest {
 	@Test
 	public void serviceMapsDiscoveredCorrectly() throws Exception {
 		
-		SecretManagerProvider.instance.set(new TestSecret("/infra/vo"));
+		SecretManagerProvider.set(new TestSecret("/infra/vo"));
 
 		assertNotNull(ServiceMap.instance.endpoint("service1"));
 		
@@ -65,7 +65,7 @@ public class ServiceMapTest {
 	@Test
 	public void serviceMapsCanBeLookedupInVREScope() throws Exception {
 		
-		SecretManagerProvider.instance.set(new TestSecret("/infra/vo/vre"));
+		SecretManagerProvider.set(new TestSecret("/infra/vo/vre"));
 
 		assertNotNull(ServiceMap.instance.endpoint("service1"));
 		
@@ -73,7 +73,7 @@ public class ServiceMapTest {
 	
 	@After
 	public void cleanup() {
-		SecretManagerProvider.instance.reset();
+		SecretManagerProvider.reset();
 	}
 	
 }