diff --git a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java
index a61ec6d..ee99e8d 100644
--- a/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java
+++ b/src/main/java/org/gcube/accounting/persistence/AccountingPersistenceConfiguration.java
@@ -23,8 +23,8 @@ import org.gcube.resources.discovery.icclient.ICFactory;
  */
 public class AccountingPersistenceConfiguration {
 	
-	protected final String SERVICE_ENDPOINT_CATEGORY = "Accounting";
-	protected final String SERVICE_ENDPOINT_NAME = "Persistence";
+	public final String SERVICE_ENDPOINT_CATEGORY = "Accounting";
+	public final String SERVICE_ENDPOINT_NAME = "Persistence";
 
 	protected static final String PERSISTENCE_CLASS_NAME = "persistenceClassName";
 	
@@ -51,7 +51,7 @@ public class AccountingPersistenceConfiguration {
 	
 	public AccountingPersistenceConfiguration(String persistenceClassName) throws Exception {
 		init();
-		ServiceEndpoint serviceEndpoint = getServiceEndpoint(persistenceClassName);
+		ServiceEndpoint serviceEndpoint = getServiceEndpoint(SERVICE_ENDPOINT_CATEGORY, SERVICE_ENDPOINT_NAME, persistenceClassName);
 		setValues(serviceEndpoint);
 	}
 	
@@ -110,10 +110,10 @@ public class AccountingPersistenceConfiguration {
 		return value;
 	}
 	
-	protected ServiceEndpoint getServiceEndpoint(String persistenceClassName){
+	protected ServiceEndpoint getServiceEndpoint(String serviceEndpointCategory, String serviceEndpointName, String persistenceClassName){
 		SimpleQuery query = ICFactory.queryFor(ServiceEndpoint.class);
-		query.addCondition(String.format("$resource/Profile/Category/text() eq '%s'", SERVICE_ENDPOINT_CATEGORY));
-		query.addCondition(String.format("$resource/Profile/Name/text() eq '%s'", SERVICE_ENDPOINT_NAME));
+		query.addCondition(String.format("$resource/Profile/Category/text() eq '%s'", serviceEndpointCategory));
+		query.addCondition(String.format("$resource/Profile/Name/text() eq '%s'", serviceEndpointName));
 		query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Name/text() eq '%s'", PERSISTENCE_CLASS_NAME));
 		query.addCondition(String.format("$resource/Profile/AccessPoint/Properties/Property/Value/text() eq '%s'", persistenceClassName));
 		query.setResult("$resource");