diff --git a/src/main/java/org/gcube/contentmanager/storageclient/wrapper/Configuration.java b/src/main/java/org/gcube/contentmanager/storageclient/wrapper/Configuration.java
index 26e40aa..10b3cc3 100644
--- a/src/main/java/org/gcube/contentmanager/storageclient/wrapper/Configuration.java
+++ b/src/main/java/org/gcube/contentmanager/storageclient/wrapper/Configuration.java
@@ -51,8 +51,8 @@ public class Configuration {
 	private static final String HL_CONTEXT = "/d4science.research-infrastructures.eu";
 	private static final String HL_CONTEXT_DEV = "/gcube";
 	private static final String HL_CONTEXT_PRE = "/pred4s";
-		
-		
+	protected static final String STORAGE_SERVICEENDPOINT_NAME="StorageManager";	
+	protected static final String STORAGE_SERVICEENDPOINT_CATEGORY="Storage";	
 	/**
 	 * Loads all the configuration parameters in a java object	
 	 * @param sc: service class of the remote resource
diff --git a/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java b/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java
index 96395d2..558b24c 100644
--- a/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java
+++ b/src/main/java/org/gcube/contentmanager/storageclient/wrapper/ISClientConnector.java
@@ -63,7 +63,7 @@ public class ISClientConnector {
 				ScopeProvider.instance.set(scope);
 			}
 			SimpleQuery query = queryFor(ServiceEndpoint.class);
-			query.addCondition("$resource/Profile/Category/text() eq 'Storage' and $resource/Profile/Name eq 'StorageManager' ");
+			query.addCondition("$resource/Profile/Category/text() eq '"+Configuration.STORAGE_SERVICEENDPOINT_CATEGORY+"' and $resource/Profile/Name eq '"+Configuration.STORAGE_SERVICEENDPOINT_NAME+"' ");
 			DiscoveryClient<ServiceEndpoint> client = clientFor(ServiceEndpoint.class);
 			List<ServiceEndpoint> resources = client.submit(query);
 			if(scope!=null){