diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
index db014b6..63180a9 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
@@ -8,12 +8,12 @@ import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
 import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 import org.gcube.informationsystem.model.reference.entities.Context;
 import org.gcube.informationsystem.model.reference.properties.Header;
-import org.gcube.informationsystem.model.utils.ISMapper;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
 import org.gcube.informationsystem.resourceregistry.api.rest.ContextPath;
 import org.gcube.informationsystem.resourceregistry.api.rest.httputils.HTTPUtility;
+import org.gcube.informationsystem.utils.ISMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
index 36d2467..7cca3b8 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
@@ -13,11 +13,11 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.informationsystem.model.impl.entities.ContextImpl;
 import org.gcube.informationsystem.model.reference.ER;
 import org.gcube.informationsystem.model.reference.entities.Context;
-import org.gcube.informationsystem.model.utils.ISMapper;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
+import org.gcube.informationsystem.utils.ISMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;