diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java
index 3519cd88d..73cb1375f 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/raw/AbstractMdRecordToOafMapper.java
@@ -12,6 +12,7 @@ import static eu.dnetlib.dhp.oa.graph.raw.common.OafMapperUtils.structuredProper
 
 import eu.dnetlib.dhp.oa.graph.raw.common.MigrationConstants;
 import eu.dnetlib.dhp.schema.oaf.Author;
+import eu.dnetlib.dhp.schema.oaf.Context;
 import eu.dnetlib.dhp.schema.oaf.DataInfo;
 import eu.dnetlib.dhp.schema.oaf.Dataset;
 import eu.dnetlib.dhp.schema.oaf.Field;
@@ -237,11 +238,25 @@ public abstract class AbstractMdRecordToOafMapper {
         r.setContributor(prepareContributors(doc, info));
         r.setResourcetype(prepareResourceType(doc, info));
         r.setCoverage(prepareCoverages(doc, info));
-        r.setContext(new ArrayList<>()); // NOT PRESENT IN MDSTORES
+        r.setContext(prepareContexts(doc, info));
         r.setExternalReference(new ArrayList<>()); // NOT PRESENT IN MDSTORES
         r.setInstance(prepareInstances(doc, info, collectedFrom, hostedBy));
     }
 
+    private List<Context> prepareContexts(final Document doc, final DataInfo info) {
+        final List<Context> list = new ArrayList<>();
+        for (final Object o : doc.selectNodes("//oaf:concept")) {
+            final String cid = ((Node) o).valueOf("@id");
+            if (StringUtils.isNotBlank(cid)) {
+                final Context c = new Context();
+                c.setId(cid);
+                c.setDataInfo(Arrays.asList(info));
+                list.add(c);
+            }
+        }
+        return list;
+    }
+
     protected abstract Qualifier prepareResourceType(Document doc, DataInfo info);
 
     protected abstract List<Instance> prepareInstances(
diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
index a21b3d9fd..5b445a1ef 100644
--- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
+++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/oa/graph/raw/MappersTest.java
@@ -98,6 +98,8 @@ public class MappersTest {
         assertTrue(d.getAuthor().size() > 0);
         assertTrue(d.getSubject().size() > 0);
         assertTrue(d.getInstance().size() > 0);
+        assertTrue(d.getContext().size() > 0);
+        assertTrue(d.getContext().get(0).getId().length() > 0);
 
         assertValidId(r1.getSource());
         assertValidId(r1.getTarget());