diff --git a/org.gcube.informationservice.registry.gar b/org.gcube.informationservice.registry.gar
deleted file mode 100644
index 976357a..0000000
Binary files a/org.gcube.informationservice.registry.gar and /dev/null differ
diff --git a/org.gcube.informationservice.registry.stubs.jar b/org.gcube.informationservice.registry.stubs.jar
deleted file mode 100644
index 33889d5..0000000
Binary files a/org.gcube.informationservice.registry.stubs.jar and /dev/null differ
diff --git a/org.gcube.informationsystem.registry.stubs.jar b/org.gcube.informationsystem.registry.stubs.jar
new file mode 100644
index 0000000..ce815ba
Binary files /dev/null and b/org.gcube.informationsystem.registry.stubs.jar differ
diff --git a/org/gcube/informationsystem/registry/impl/core/ProfileResource.java b/org/gcube/informationsystem/registry/impl/core/ProfileResource.java
index 43451b9..8654630 100644
--- a/org/gcube/informationsystem/registry/impl/core/ProfileResource.java
+++ b/org/gcube/informationsystem/registry/impl/core/ProfileResource.java
@@ -8,7 +8,7 @@ import javax.xml.namespace.QName;
 
 import org.gcube.common.core.is.publisher.ISPublisher;
 import org.gcube.common.core.is.publisher.ISPublisherException;
-import org.gcube.common.core.node.GHNContext;
+import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.resources.GCUBEHostingNode;
 import org.gcube.common.core.resources.GCUBEResource;
 import org.gcube.common.core.resources.GCUBERunningInstance;
diff --git a/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
index e502866..5ff5956 100644
--- a/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
+++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactory.java
@@ -16,7 +16,7 @@ import org.gcube.common.core.faults.GCUBEFault;
 import org.gcube.common.core.is.ISException;
 import org.gcube.common.core.is.client.ISClient.ISInvalidQueryException;
 import org.gcube.common.core.is.client.ISClient.ISMalformedQueryException;
-import org.gcube.common.core.node.GHNContext;
+import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.porttypes.GCUBEStartupPortType;
 import org.gcube.common.core.resources.GCUBEHostingNode;
 import org.gcube.common.core.resources.GCUBEResource;
diff --git a/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java
index 792dc7a..f8e3b30 100644
--- a/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java
+++ b/org/gcube/informationsystem/registry/impl/core/RegistryFactoryResource.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import javax.xml.namespace.QName;
 
 import org.gcube.common.core.is.publisher.ISPublisher;
-import org.gcube.common.core.node.GHNContext;
+import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.state.GCUBEWSResource;
 import org.gcube.informationsystem.registry.impl.util.RegistrationThread;
 import org.gcube.informationsystem.registry.stubs.RegistryProperty;
diff --git a/org/gcube/informationsystem/registry/impl/util/RegistrationThread.java b/org/gcube/informationsystem/registry/impl/util/RegistrationThread.java
index f169162..bae8f84 100644
--- a/org/gcube/informationsystem/registry/impl/util/RegistrationThread.java
+++ b/org/gcube/informationsystem/registry/impl/util/RegistrationThread.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import javax.xml.namespace.QName;
 
 import org.gcube.common.core.is.publisher.ISPublisher;
-import org.gcube.common.core.node.GHNContext;
+import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.utils.logging.GCUBELog;
 import org.gcube.informationsystem.registry.impl.core.FactoryContext;
 import org.gcube.informationsystem.registry.impl.core.ServiceContext;
diff --git a/org/gcube/informationsystem/registry/impl/util/RegistryUtil.java b/org/gcube/informationsystem/registry/impl/util/RegistryUtil.java
index a603f14..4e349c0 100644
--- a/org/gcube/informationsystem/registry/impl/util/RegistryUtil.java
+++ b/org/gcube/informationsystem/registry/impl/util/RegistryUtil.java
@@ -7,7 +7,7 @@ import org.gcube.common.core.is.client.ISClient;
 import org.gcube.common.core.is.client.ISClient.ISInvalidQueryException;
 import org.gcube.common.core.is.client.ISClient.ISMalformedQueryException;
 import org.gcube.common.core.is.client.queries.GCUBEResourceFromIDQuery;
-import org.gcube.common.core.node.GHNContext;
+import org.gcube.common.core.contexts.GHNContext;
 import org.gcube.common.core.resources.GCUBEResource;
 
 public class RegistryUtil {