diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
index 11a6246..75467d3 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
@@ -11,10 +11,16 @@ public class Datasource extends OafEntity implements Serializable {
 	 */
 	private static final long serialVersionUID = 1019089598408414496L;
 
+	@Deprecated
 	private Qualifier datasourcetype;
 
+	@Deprecated
 	private Qualifier datasourcetypeui;
 
+	private Qualifier eosctype; // Data Source | Service
+
+	private Qualifier eoscdatasourcetype;
+
 	private Qualifier openairecompatibility;
 
 	private Field<String> officialname;
@@ -55,7 +61,6 @@ public class Datasource extends OafEntity implements Serializable {
 	private List<String> languages;
 
 	@Deprecated
-	// TO REMOVE ?
 	private List<Field<String>> odcontenttypes;
 
 	private List<Field<String>> accessinfopackage;
@@ -67,8 +72,10 @@ public class Datasource extends OafEntity implements Serializable {
 
 	private Field<String> missionstatementurl;
 
+	@Deprecated
 	private Field<Boolean> dataprovider;
 
+	@Deprecated
 	private Field<Boolean> serviceprovider;
 
 	// {open, restricted or closed}
@@ -83,23 +90,24 @@ public class Datasource extends OafEntity implements Serializable {
 	// {feeRequired, registration, other}
 	private Field<String> datauploadrestriction;
 
+	@Deprecated
 	private Field<Boolean> versioning;
 
-	private Field<String> citationguidelineurl;
+	private Boolean versioncontrol;
 
-	// {yes, no, uknown}
-	private Field<String> qualitymanagementkind;
+	private Field<String> citationguidelineurl;
 
 	private Field<String> pidsystems;
 
 	private Field<String> certificates;
 
+	@Deprecated
 	private List<KeyValue> policies;
 
 	private Journal journal;
 
 	// New field for EOSC
-	private List<String> providedentitytypes;
+	private List<String> researchentitytypes;
 
 	// New field for EOSC
 	private List<String> providedproducttypes;
@@ -116,53 +124,21 @@ public class Datasource extends OafEntity implements Serializable {
 	// New field for EOSC
 	private List<Qualifier> contentpolicies;
 
+	private String submissionpolicyurl;
+
+	private String preservationpolicyurl;
+
+	private List<String> researchproductaccesspolicies;
+
+	private List<String> researchproductmetadataaccesspolicies;
+
 	private Boolean consenttermsofuse;
 
 	private Boolean fulltextdownload;
 
 	private String consenttermsofusedate;
 
-	// Campi da togliere:
-
-	// _typology_to_remove_
-	// od*
-	// versioning (replaced by version_control)
-
-	// Campi da aggiungere:
-
-	// dedup_main_service
-	// lastconsenttermsofusedate
-	// status
-	// eosc_type
-	// eosc_datasource_type
-	// version_control
-	// research_entity_types (potrebbe essere providedentitytypes ???)
-	// submission_policy_url
-	// preservation_policy_url
-	// research_product_access_policies
-	// research_product_metadata_access_policies
-
-	// Campi ignorati:
-
-	// timezone
-	// platform
-	// provenanceaction
-	// activationid
-	// dateofcollection
-	// aggregator
-	// managed
-	// registeredby
-	// registrationdate
-
-	// Journal fields (???)
-
-	// issn
-	// eissn
-	// lissn
-
-	// Generated by Haddop Jobs (???)
-	providedentitytypes
-	providedproducttypes
+	private String lastconsenttermsofusedate;
 
 	public Qualifier getDatasourcetype() {
 		return datasourcetype;
@@ -180,6 +156,22 @@ public class Datasource extends OafEntity implements Serializable {
 		this.datasourcetypeui = datasourcetypeui;
 	}
 
+	public Qualifier getEosctype() {
+		return eosctype;
+	}
+
+	public void setEosctype(Qualifier eosctype) {
+		this.eosctype = eosctype;
+	}
+
+	public Qualifier getEoscdatasourcetype() {
+		return eoscdatasourcetype;
+	}
+
+	public void setEoscdatasourcetype(Qualifier eoscdatasourcetype) {
+		this.eoscdatasourcetype = eoscdatasourcetype;
+	}
+
 	public Qualifier getOpenairecompatibility() {
 		return openairecompatibility;
 	}
@@ -412,6 +404,14 @@ public class Datasource extends OafEntity implements Serializable {
 		this.versioning = versioning;
 	}
 
+	public Boolean getVersioncontrol() {
+		return versioncontrol;
+	}
+
+	public void setVersioncontrol(Boolean versioncontrol) {
+		this.versioncontrol = versioncontrol;
+	}
+
 	public Field<String> getCitationguidelineurl() {
 		return citationguidelineurl;
 	}
@@ -420,14 +420,6 @@ public class Datasource extends OafEntity implements Serializable {
 		this.citationguidelineurl = citationguidelineurl;
 	}
 
-	public Field<String> getQualitymanagementkind() {
-		return qualitymanagementkind;
-	}
-
-	public void setQualitymanagementkind(final Field<String> qualitymanagementkind) {
-		this.qualitymanagementkind = qualitymanagementkind;
-	}
-
 	public Field<String> getPidsystems() {
 		return pidsystems;
 	}
@@ -460,12 +452,12 @@ public class Datasource extends OafEntity implements Serializable {
 		this.journal = journal;
 	}
 
-	public List<String> getProvidedentitytypes() {
-		return providedentitytypes;
+	public List<String> getResearchentitytypes() {
+		return researchentitytypes;
 	}
 
-	public void setProvidedentitytypes(final List<String> providedentitytypes) {
-		this.providedentitytypes = providedentitytypes;
+	public void setResearchentitytypes(final List<String> researchentitytypes) {
+		this.researchentitytypes = researchentitytypes;
 	}
 
 	public List<String> getProvidedproducttypes() {
@@ -508,6 +500,38 @@ public class Datasource extends OafEntity implements Serializable {
 		this.contentpolicies = contentpolicies;
 	}
 
+	public String getSubmissionpolicyurl() {
+		return submissionpolicyurl;
+	}
+
+	public void setSubmissionpolicyurl(String submissionpolicyurl) {
+		this.submissionpolicyurl = submissionpolicyurl;
+	}
+
+	public String getPreservationpolicyurl() {
+		return preservationpolicyurl;
+	}
+
+	public void setPreservationpolicyurl(String preservationpolicyurl) {
+		this.preservationpolicyurl = preservationpolicyurl;
+	}
+
+	public List<String> getResearchproductaccesspolicies() {
+		return researchproductaccesspolicies;
+	}
+
+	public void setResearchproductaccesspolicies(List<String> researchproductaccesspolicies) {
+		this.researchproductaccesspolicies = researchproductaccesspolicies;
+	}
+
+	public List<String> getResearchproductmetadataaccesspolicies() {
+		return researchproductmetadataaccesspolicies;
+	}
+
+	public void setResearchproductmetadataaccesspolicies(List<String> researchproductmetadataaccesspolicies) {
+		this.researchproductmetadataaccesspolicies = researchproductmetadataaccesspolicies;
+	}
+
 	public Boolean getConsenttermsofuse() {
 		return consenttermsofuse;
 	}
@@ -516,6 +540,14 @@ public class Datasource extends OafEntity implements Serializable {
 		this.consenttermsofuse = consenttermsofuse;
 	}
 
+	public String getLastconsenttermsofusedate() {
+		return lastconsenttermsofusedate;
+	}
+
+	public void setLastconsenttermsofusedate(String lastconsenttermsofusedate) {
+		this.lastconsenttermsofusedate = lastconsenttermsofusedate;
+	}
+
 	public Boolean getFulltextdownload() {
 		return fulltextdownload;
 	}
@@ -637,7 +669,7 @@ public class Datasource extends OafEntity implements Serializable {
 
 		journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal;
 
-		providedentitytypes = mergeLists(providedentitytypes, d.getProvidedentitytypes());;
+		researchentitytypes = mergeLists(researchentitytypes, d.getResearchentitytypes());;
 
 		providedproducttypes = mergeLists(providedproducttypes, d.getProvidedproducttypes());;