diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/OafNavigator.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/OafNavigator.java
new file mode 100644
index 000000000..c329a3111
--- /dev/null
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/clean/OafNavigator.java
@@ -0,0 +1,4 @@
+package eu.dnetlib.dhp.oa.graph.clean;
+
+public class OafNavigator {
+}
diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/GenerateEntitiesApplication.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/GenerateEntitiesApplication.java
index f52587d73..3568dc52a 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/GenerateEntitiesApplication.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/GenerateEntitiesApplication.java
@@ -141,8 +141,10 @@ public class GenerateEntitiesApplication {
 
 		switch (type.toLowerCase()) {
 			case "oaf-store-cleaned":
+			case "oaf-store-claim":
 				return new OafToOafMapper(vocs, false).processMdRecord(s);
 			case "odf-store-cleaned":
+			case "odf-store-claim":
 				return new OdfToOafMapper(vocs, false).processMdRecord(s);
 			case "oaf-store-intersection":
 				return new OafToOafMapper(vocs, true).processMdRecord(s);