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 4262732a5..d32117063 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
@@ -137,8 +137,10 @@ public class GenerateEntitiesApplication {
 		final String type = StringUtils.substringAfter(id, ":");
 
 		switch (type.toLowerCase()) {
+			case "oaf-store-claim":
 			case "oaf-store-cleaned":
 				return new OafToOafMapper(vocs, false).processMdRecord(s);
+			case "odf-store-claim":
 			case "odf-store-cleaned":
 				return new OdfToOafMapper(vocs, false).processMdRecord(s);
 			case "oaf-store-intersection":