diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java
index 5f65a56ab..bbdc735da 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/CommunityResult.java
@@ -3,7 +3,6 @@ package eu.dnetlib.dhp.schema.dump.oaf.community;
 
 import java.util.List;
 
-import eu.dnetlib.dhp.schema.dump.oaf.Context;
 import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
 import eu.dnetlib.dhp.schema.dump.oaf.Result;
 
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Context.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java
similarity index 76%
rename from dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Context.java
rename to dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java
index 2677d7fd5..1c532a486 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Context.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Context.java
@@ -1,5 +1,8 @@
 
-package eu.dnetlib.dhp.schema.dump.oaf;
+package eu.dnetlib.dhp.schema.dump.oaf.community;
+
+import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
+import eu.dnetlib.dhp.schema.dump.oaf.Qualifier;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java
index 8342b4613..13bd26a27 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java
+++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/oa/graph/dump/ResultMapper.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import eu.dnetlib.dhp.schema.dump.oaf.community.Context;
 import org.apache.commons.lang3.StringUtils;
 
 import eu.dnetlib.dhp.schema.common.ModelConstants;
@@ -178,7 +179,7 @@ public class ResultMapper implements Serializable {
 															.newInstance(
 																provenance
 																	.getProvenanceaction()
-																	.getClassid(),
+																	.getClassname(),
 																c.getDataInfo().getTrust())));
 										return country;
 									})