diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java
index b795fd1006..83c2302964 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java
@@ -9,38 +9,38 @@ import java.io.Serializable;
  * (e.c. Akademy of Finland) - fundingStream of type String to store the funding stream - jurisdiction of type String to
  * store the jurisdiction of the funder
  */
-public class Funder implements Serializable {
-	private String shortName;
-
-	private String name;
+public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder {
+//	private String shortName;
+//
+//	private String name;
 
 	private String fundingStream;
 
-	private String jurisdiction;
+//	private String jurisdiction;
 
-	public String getJurisdiction() {
-		return jurisdiction;
-	}
-
-	public void setJurisdiction(String jurisdiction) {
-		this.jurisdiction = jurisdiction;
-	}
-
-	public String getShortName() {
-		return shortName;
-	}
-
-	public void setShortName(String shortName) {
-		this.shortName = shortName;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
+//	public String getJurisdiction() {
+//		return jurisdiction;
+//	}
+//
+//	public void setJurisdiction(String jurisdiction) {
+//		this.jurisdiction = jurisdiction;
+//	}
+//
+//	public String getShortName() {
+//		return shortName;
+//	}
+//
+//	public void setShortName(String shortName) {
+//		this.shortName = shortName;
+//	}
+//
+//	public String getName() {
+//		return name;
+//	}
+//
+//	public void setName(String name) {
+//		this.name = name;
+//	}
 
 	public String getFundingStream() {
 		return fundingStream;
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
index 7e23a13114..0530bbb3b8 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
@@ -8,21 +8,14 @@ import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
 /**
  * To store information about the project related to the result. This information is not directly mapped from the result
  * represented in the internal model because it is not there. The mapped result will be enriched with project
- * information derived by relation between results and projects. Project class has the following parameters: - id of
- * type String to store the OpenAIRE id for the Project - code of type String to store the grant agreement - acronym of
- * type String to store the acronym for the project - title of type String to store the title of the project - funder of
+ * information derived by relation between results and projects.
+ * Project extends eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters:
+ * - funder of
  * type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information about the funder funding the project -
  * provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store information about the. provenance of the
  * association between the result and the project
  */
-public class Project implements Serializable {
-
-	private String id;// OpenAIRE id
-	private String code;
-
-	private String acronym;
-
-	private String title;
+public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project {
 
 	private Funder funder;
 
@@ -36,37 +29,7 @@ public class Project implements Serializable {
 		this.provenance = provenance;
 	}
 
-	public String getId() {
-		return id;
-	}
 
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getAcronym() {
-		return acronym;
-	}
-
-	public void setAcronym(String acronym) {
-		this.acronym = acronym;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
 
 	public Funder getFunder() {
 		return funder;
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
index 57d94f481b..ef054234b6 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
@@ -4,46 +4,15 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
 import java.io.Serializable;
 
 /**
- * To store information about the funder funding the project related to the result. It has the following parameters:
- * - private String shortName to store the short name of the funder (e.g. AKA)
- * - private String name to store information about the name of the funder (e.g. Akademy of Finland)
- * - private Fundings funding_stream to store the fundingstream
- * - private String jurisdiction to store information about the jurisdiction of the funder
+ * To store information about the funder funding the project related to the result. It extends eu.dnetlib.dhp.schema.dump.oaf.Funder
+ * with the following parameter: -
+ *
+ * - private eu.dnetdlib.dhp.schema.dump.oaf.graph.Fundings funding_stream to store the fundingstream
  */
-public class Funder implements Serializable {
-
-	private String shortName;
-
-	private String name;
+public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder {
 
 	private Fundings funding_stream;
 
-	private String jurisdiction;
-
-	public String getShortName() {
-		return shortName;
-	}
-
-	public void setShortName(String shortName) {
-		this.shortName = shortName;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getJurisdiction() {
-		return jurisdiction;
-	}
-
-	public void setJurisdiction(String jurisdiction) {
-		this.jurisdiction = jurisdiction;
-	}
-
 	public Fundings getFunding_stream() {
 		return funding_stream;
 	}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java
index 25f106da52..166e3e8127 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java
@@ -9,40 +9,27 @@ import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
 /**
  * This is the class representing the Project in the model used for the dumps of the whole graph. At the moment the dump
  * of the Projects differs from the other dumps because we do not create relations between Funders (Organization) and
- * Projects but we put the information about the Funder within the Project representation. We also removed the
- * collected from element from the Project. No relation between the Project and the Datasource entity from which it is
- * collected will be created. We will never create relations between Project and Datasource. In case some relation will
- * be extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project,
- * project -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to
- * 0. It has the following parameters:
- * - private String id to store the id of the project (OpenAIRE id)
- * - private String websiteurl to store the websiteurl of the project
- * - private String code to store the grant agreement of the project
- * - private String acronym to store the acronym of the project
- * - private String title to store the tile of the project
- * - private String startdate to store the start date
- * - private String enddate to store the end date
- * - private String callidentifier to store the call indentifier
- * - private String keywords to store the keywords
- * - private boolean openaccessmandateforpublications to store if the project must accomplish to the open access mandate
- *   for publications. This value will be set to true if one of the field in the project represented in the internal model
- *   is set to true
- * - private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for
- * 	 dataset. It is set to the value in the corresponding filed of the project represented in the internal model
- * - private List<String> subject to store the list of subjects of the project
- * - private List<Funder> funding to store the list of funder of the project
- * - private String summary to store the summary of the project
- * - private Granted granted to store the granted amount
- * - private List<Programme> programme to store the list of programmes the project is related to
+ * Projects but we put the information about the Funder within the Project representation. We also removed the collected
+ * from element from the Project. No relation between the Project and the Datasource entity from which it is collected
+ * will be created. We will never create relations between Project and Datasource. In case some relation will be
+ * extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project, project
+ * -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to 0. It extends
+ * eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters:  - private String
+ * websiteurl to store the websiteurl of the project  -
+ * private String startdate to store the start date - private String enddate to store the end date - private String
+ * callidentifier to store the call indentifier - private String keywords to store the keywords - private boolean
+ * openaccessmandateforpublications to store if the project must accomplish to the open access mandate for publications.
+ * This value will be set to true if one of the field in the project represented in the internal model is set to true -
+ * private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for
+ * dataset. It is set to the value in the corresponding filed of the project represented in the internal model - private
+ * List<String> subject to store the list of subjects of the project - private List<Funder> funding to store the list of
+ * funder of the project - private String summary to store the summary of the project - private Granted granted to store
+ * the granted amount - private List<Programme> programme to store the list of programmes the project is related to
  */
 
-public class Project implements Serializable {
-	private String id;
+public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project {
 
 	private String websiteurl;
-	private String code;
-	private String acronym;
-	private String title;
 	private String startdate;
 
 	private String enddate;
@@ -64,14 +51,6 @@ public class Project implements Serializable {
 
 	private List<Programme> programme;
 
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
 	public String getWebsiteurl() {
 		return websiteurl;
 	}
@@ -80,30 +59,6 @@ public class Project implements Serializable {
 		this.websiteurl = websiteurl;
 	}
 
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getAcronym() {
-		return acronym;
-	}
-
-	public void setAcronym(String acronym) {
-		this.acronym = acronym;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
 	public String getStartdate() {
 		return startdate;
 	}