diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java
index 448f62f..4cecb4f 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java
@@ -22,7 +22,6 @@ import org.gcube.informationsystem.exporter.mapper.exception.UpdateException;
 import org.gcube.informationsystem.model.reference.ISConstants;
 import org.gcube.informationsystem.model.reference.entities.Facet;
 import org.gcube.informationsystem.model.reference.entities.Resource;
-import org.gcube.informationsystem.model.utils.ISMapper;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException;
@@ -30,6 +29,7 @@ import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClien
 import org.gcube.informationsystem.resourceregistry.client.ResourceRegistryClientFactory;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisher;
 import org.gcube.informationsystem.resourceregistry.publisher.ResourceRegistryPublisherFactory;
+import org.gcube.informationsystem.utils.ISMapper;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
 import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
 import org.gcube.resources.discovery.icclient.ICFactory;
diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
index 23a366e..5a41d80 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
@@ -21,9 +21,9 @@ import org.gcube.informationsystem.model.reference.properties.Encrypted;
 import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
 import org.gcube.informationsystem.model.reference.relations.IsIdentifiedBy;
-import org.gcube.informationsystem.model.utils.ISMapper;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException;
+import org.gcube.informationsystem.utils.ISMapper;
 import org.gcube.resourcemanagement.model.impl.entity.facet.AccessPointFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entity.facet.NetworkingFacetImpl;
 import org.gcube.resourcemanagement.model.impl.entity.facet.ServiceStateFacetImpl;