diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/plugin/ResourceRegistryRegistryPlugin.java b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/plugin/ResourceRegistryRegistryPlugin.java
index 9b25f4e..a242399 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/plugin/ResourceRegistryRegistryPlugin.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/plugin/ResourceRegistryRegistryPlugin.java
@@ -3,7 +3,8 @@
  */
 package org.gcube.informationsystem.resourceregistry.publisher.plugin;
 
-import org.gcube.common.clients.GCubeEndpoint;
+import javax.xml.ws.EndpointReference;
+
 import org.gcube.common.clients.config.ProxyConfig;
 import org.gcube.common.clients.delegates.ProxyDelegate;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
@@ -13,7 +14,7 @@ import org.gcube.informationsystem.resourceregistry.publisher.proxy.ResourceRegi
  * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/
  *
  */
-public class ResourceRegistryRegistryPlugin extends AbstractPlugin<GCubeEndpoint, ResourceRegistryPublisher>{
+public class ResourceRegistryRegistryPlugin extends AbstractPlugin<EndpointReference, ResourceRegistryPublisher>{
 
 	public ResourceRegistryRegistryPlugin(){
 		super(ResourceRegistryRegistryPlugin.class.getSimpleName());
@@ -39,17 +40,26 @@ public class ResourceRegistryRegistryPlugin extends AbstractPlugin<GCubeEndpoint
 
 	}
 
+	/* (non-Javadoc)
+	 * @see org.gcube.common.clients.delegates.ProxyPlugin#resolve(java.lang.Object, org.gcube.common.clients.config.ProxyConfig)
+	 */
 	@Override
-	public GCubeEndpoint resolve(GCubeEndpoint address, ProxyConfig<?, ?> config)
-			throws Exception {
+	public EndpointReference resolve(EndpointReference address,
+			ProxyConfig<?, ?> config) throws Exception {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.gcube.common.clients.delegates.ProxyPlugin#newProxy(org.gcube.common.clients.delegates.ProxyDelegate)
+	 */
 	@Override
 	public ResourceRegistryPublisher newProxy(
-			ProxyDelegate<GCubeEndpoint> delegate) {
-		return new ResourceRegistryPublisher(delegate);
+			ProxyDelegate<EndpointReference> delegate) {
+		// TODO Auto-generated method stub
+		return null;
 	}
 
+	
+
 }
diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/proxy/ResourceRegistryPublisher.java b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/proxy/ResourceRegistryPublisher.java
index f1721d3..8e60a08 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/proxy/ResourceRegistryPublisher.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/publisher/proxy/ResourceRegistryPublisher.java
@@ -3,8 +3,9 @@
  */
 package org.gcube.informationsystem.resourceregistry.publisher.proxy;
 
+import javax.xml.ws.EndpointReference;
+
 import org.gcube.common.clients.Call;
-import org.gcube.common.clients.GCubeEndpoint;
 import org.gcube.common.clients.delegates.AsyncProxyDelegate;
 import org.gcube.common.clients.delegates.ProxyDelegate;
 import org.gcube.common.clients.exceptions.ServiceException;
@@ -25,18 +26,18 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.Schema
  */
 public class ResourceRegistryPublisher implements ContextManagement, SchemaManagement, EntityManagement {
 	
-	private final AsyncProxyDelegate<GCubeEndpoint> delegate;
+	private final AsyncProxyDelegate<EndpointReference> delegate;
 
-	public ResourceRegistryPublisher(ProxyDelegate<GCubeEndpoint> config) {
-		this.delegate = new AsyncProxyDelegate<GCubeEndpoint>(config);
+	public ResourceRegistryPublisher(ProxyDelegate<EndpointReference> config) {
+		this.delegate = new AsyncProxyDelegate<EndpointReference>(config);
 	}
 
 	@Override
 	public String createFacet(String facetType, String jsonRepresentation)
 			throws ResourceRegistryException {
-		Call<GCubeEndpoint, String> call = new Call<GCubeEndpoint, String>() {
+		Call<EndpointReference, String> call = new Call<EndpointReference, String>() {
 			
-			public String call(GCubeEndpoint endpoint) throws Exception {
+			public String call(EndpointReference endpoint) throws Exception {
 				// TODO 
 				return null;
 			};