diff --git a/distro/changelog.xml b/distro/changelog.xml
index 8c392a0..a2f865b 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE xml>
 <ReleaseNotes>
 	<Changeset component="org.gcube.information-system.is-exporter-se-plugin.1-3-0" date="${buildDate}">
-		<Change></Change>
+		<Change>Using resource-regsitry v2 apis #11949</Change>
 	</Changeset>
 	<Changeset component="org.gcube.information-system.is-exporter-se-plugin.1-2-0" date="2017-12-20">
 		<Change>Creating uber-jar instead of jar-with-dependencies and using new make-servicearchive directive #10159</Change>
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 d94df10..bc326b0 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GCoreResourceMapper.java
@@ -137,7 +137,7 @@ public abstract class GCoreResourceMapper<GR extends org.gcube.common.resources.
 		} catch (ResourceAvailableInAnotherContextException e) {
 			// This code should never be reached because this should be fixed in
 			// map function
-			resourceRegistryPublisher.addResourceToContext(uuid);
+			resourceRegistryPublisher.addResourceToCurrentContext(r);
 			try {
 				Thread.sleep(100);
 			} catch (Exception ee) {
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 f4e0b96..9ad755e 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/GenericResourceExporter.java
@@ -49,7 +49,7 @@ public class GenericResourceExporter extends GCoreResourceMapper<GenericResource
 		}catch (ResourceNotFoundException e) {
 			readFromIS = false;
 		} catch (ResourceAvailableInAnotherContextException e) {
-			resourceRegistryPublisher.addResourceToContext(uuid);
+			resourceRegistryPublisher.addResourceToCurrentContext(Configuration.NAME, uuid);
 			Thread.sleep(100);
 			readFromIS = true;
 		}
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 f0b015a..9a470da 100644
--- a/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
+++ b/src/main/java/org/gcube/informationsystem/exporter/mapper/ServiceEndpointExporter.java
@@ -92,7 +92,7 @@ public class ServiceEndpointExporter extends GCoreResourceMapper<ServiceEndpoint
 		}catch (ResourceNotFoundException e) {
 			readFromIS = false;
 		}catch (ResourceAvailableInAnotherContextException e) {
-			resourceRegistryPublisher.addResourceToContext(uuid);
+			resourceRegistryPublisher.addResourceToCurrentContext(EService.NAME, uuid);
 			Thread.sleep(100);
 			readFromIS = true;
 		}