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 7e70d82..d94df10 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java
@@ -113,11 +113,11 @@ public abstract class GCoreResourceMapper<GR extends org.gcube.common.resources.
 	}
 
 	protected R create(R r) throws ResourceRegistryException {
-		return resourceRegistryPublisher.createResource(rClass, r);
+		return resourceRegistryPublisher.createResource(r);
 	}
 
 	protected R update(R r) throws ResourceRegistryException {
-		return resourceRegistryPublisher.updateResource(rClass, r);
+		return resourceRegistryPublisher.updateResource(r);
 	}
 
 	protected R read(UUID uuid) throws ResourceRegistryException {
diff --git a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
index 7ea3423..f4e0b96 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
@@ -113,7 +113,7 @@ public class GenericResourceExporter extends GCoreResourceMapper<GenericResource
 			try {
 				SimpleFacet testSimpleFacet = new SimpleFacetImpl();
 				testSimpleFacet.setAdditionalProperties(map);
-				SimpleFacet created = resourceRegistryPublisher.createFacet(SimpleFacet.class, testSimpleFacet);
+				SimpleFacet created = resourceRegistryPublisher.createFacet(testSimpleFacet);
 				resourceRegistryPublisher.deleteFacet(created);
 				simpleFacet.setAdditionalProperties(map);
 			}catch (Exception e) {
diff --git a/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java b/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java
index 43d748a..eab4a7e 100644
--- a/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java
+++ b/src/test/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporterTest.java
@@ -37,8 +37,7 @@ public class GenericResourceExporterTest extends ScopedTest {
 		ResourceRegistryClient client = ResourceRegistryClientFactory.create();
 		ResourceRegistryPublisher publisher = ResourceRegistryPublisherFactory.create();
 
-		@SuppressWarnings("unchecked")
-		List<Configuration> configurations = (List<Configuration>) client.getInstances(Configuration.NAME, false);
+		List<Configuration> configurations = client.getInstances(Configuration.class, false);
 		List<Configuration> failed = new ArrayList<>();
 
 		logger.debug("Going to delete {} {}s", configurations.size(), Configuration.NAME);
diff --git a/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java b/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java
index e2378c8..a617ece 100644
--- a/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java
+++ b/src/test/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporterTest.java
@@ -37,8 +37,7 @@ public class ServiceEndpointExporterTest extends ScopedTest{
 		ResourceRegistryClient client = ResourceRegistryClientFactory.create();
 		ResourceRegistryPublisher publisher = ResourceRegistryPublisherFactory.create();
 		
-		@SuppressWarnings("unchecked")
-		List<EService> eServices = (List<EService>) client.getInstances(EService.NAME, false);
+		List<EService> eServices = client.getInstances(EService.class, false);
 		List<EService> failed = new ArrayList<>();
 		
 		logger.debug("Going to delete {} {}s",