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 99fcd8d..11a6246 100644
--- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
+++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
@@ -40,10 +40,13 @@ public class Datasource extends OafEntity implements Serializable {
 	private List<StructuredProperty> subjects;
 
 	// opendoar specific fields (od*)
+	@Deprecated
 	private Field<String> odnumberofitems;
 
+	@Deprecated
 	private Field<String> odnumberofitemsdate;
 
+	@Deprecated
 	private Field<String> odpolicies;
 
 	@Deprecated
@@ -51,6 +54,8 @@ public class Datasource extends OafEntity implements Serializable {
 
 	private List<String> languages;
 
+	@Deprecated
+	// TO REMOVE ?
 	private List<Field<String>> odcontenttypes;
 
 	private List<Field<String>> accessinfopackage;
@@ -117,6 +122,48 @@ public class Datasource extends OafEntity implements Serializable {
 
 	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
+
 	public Qualifier getDatasourcetype() {
 		return datasourcetype;
 	}
@@ -265,7 +312,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return languages;
 	}
 
-	public void setLanguages(List<String> languages) {
+	public void setLanguages(final List<String> languages) {
 		this.languages = languages;
 	}
 
@@ -465,7 +512,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return consenttermsofuse;
 	}
 
-	public void setConsenttermsofuse(Boolean consenttermsofuse) {
+	public void setConsenttermsofuse(final Boolean consenttermsofuse) {
 		this.consenttermsofuse = consenttermsofuse;
 	}
 
@@ -473,7 +520,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return fulltextdownload;
 	}
 
-	public void setFulltextdownload(Boolean fulltextdownload) {
+	public void setFulltextdownload(final Boolean fulltextdownload) {
 		this.fulltextdownload = fulltextdownload;
 	}
 
@@ -481,7 +528,7 @@ public class Datasource extends OafEntity implements Serializable {
 		return consenttermsofusedate;
 	}
 
-	public void setConsenttermsofusedate(String consenttermsofusedate) {
+	public void setConsenttermsofusedate(final String consenttermsofusedate) {
 		this.consenttermsofusedate = consenttermsofusedate;
 	}