diff --git a/CHANGES.md b/CHANGES.md
index f696c7e..01f6687 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,7 +4,8 @@
 
 | **Version** | **Changes**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | **Readiness** |
 |-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| 4.17.2      | [Graph model] </br> <ul><li>added InstaceTypeMapping field on the instance level.</li><li>new result level fields to support the activities in the Irish tender `isGreen`, `openAccessColor`, `isInDiamondJournal`, `publiclyFunded`</li><ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | production          |
+| 4.17.3      | [Graph model] </br> <ul><li>moved context at the level of the entity. </li></ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | beta          |
+| 4.17.2      | [Graph model] </br> <ul><li>added InstaceTypeMapping field on the instance level.</li><li>new result level fields to support the activities in the Irish tender `isGreen`, `openAccessColor`, `isInDiamondJournal`, `publiclyFunded`</li><ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | production    |
 | 3.17.1      | [Graph model] </br> <ul><li>added fulltext field on the instance level.</li><li>added extra organization specific PID types</li><ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | production    |
 | 3.16.0      | [Graph model] </br> <ul><li>added entity level measures.</li><ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | production    |
 | 3.15.0      | [Graph model] </br> <ul><li>added w3id as PID type, with ROHub as authority.</li>  <ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | production    |
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
index be3bf83..00c5729 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java
@@ -26,6 +26,29 @@ public abstract class OafEntity extends Oaf implements Serializable {
 	 */
 	private List<Measure> measures;
 
+	/**
+	 * The Context.
+	 */
+	private List<Context> context;
+
+	/**
+	 * Gets context.
+	 *
+	 * @return the context
+	 */
+	public List<Context> getContext() {
+		return context;
+	}
+
+	/**
+	 * Sets context.
+	 *
+	 * @param context the context
+	 */
+	public void setContext(List<Context> context) {
+		this.context = context;
+	}
+
 	/**
 	 * Gets measures.
 	 *
@@ -119,6 +142,8 @@ public abstract class OafEntity extends Oaf implements Serializable {
 			oaiprovenance = e.getOaiprovenance();
 
 		measures = mergeLists(measures, e.getMeasures());
+
+		context = mergeLists(context, e.getContext());
 	}
 
 	@SafeVarargs
diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
index 50578eb..af01531 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
@@ -130,11 +130,6 @@ public class Result extends OafEntity implements Serializable {
 	 */
 	private Qualifier bestaccessright;
 
-	/**
-	 * The Context.
-	 */
-	private List<Context> context;
-
 	/**
 	 * The External reference.
 	 */
@@ -508,24 +503,6 @@ public class Result extends OafEntity implements Serializable {
 		this.bestaccessright = bestaccessright;
 	}
 
-	/**
-	 * Gets context.
-	 *
-	 * @return the context
-	 */
-	public List<Context> getContext() {
-		return context;
-	}
-
-	/**
-	 * Sets context.
-	 *
-	 * @param context the context
-	 */
-	public void setContext(List<Context> context) {
-		this.context = context;
-	}
-
 	/**
 	 * Gets external reference.
 	 *
@@ -890,8 +867,6 @@ public class Result extends OafEntity implements Serializable {
 
 		coverage = mergeLists(coverage, r.getCoverage());
 
-		context = mergeLists(context, r.getContext());
-
 		externalReference = mergeLists(externalReference, r.getExternalReference());
 	}