diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java
index ab66d6824..436bc1b6e 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java
@@ -19,39 +19,44 @@ public class Author implements Serializable {
         return name;
     }
 
-    public void setName(String name) {
+    public Author setName(String name) {
         this.name = name;
+        return this;
     }
 
     public String getTypology() {
         return typology;
     }
 
-    public void setTypology(String typology) {
+    public Author setTypology(String typology) {
         this.typology = typology;
+        return this;
     }
 
     public String getProvenance() {
         return provenance;
     }
 
-    public void setProvenance(String provenance) {
+    public Author setProvenance(String provenance) {
         this.provenance = provenance;
+        return this;
     }
 
     public String getTrust() {
         return trust;
     }
 
-    public void setTrust(String trust) {
+    public Author setTrust(String trust) {
         this.trust = trust;
+        return this;
     }
 
     public String getValue() {
         return value;
     }
 
-    public void setValue(String value) {
+    public Author setValue(String value) {
         this.value = value;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java
index 64e23088e..2c3c22d04 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java
@@ -12,15 +12,17 @@ public class Context implements Serializable {
         return id;
     }
 
-    public void setId(String id) {
+    public Context setId(String id) {
         this.id = id;
+        return this;
     }
 
     public List<DataInfo> getDataInfo() {
         return dataInfo;
     }
 
-    public void setDataInfo(List<DataInfo> dataInfo) {
+    public Context setDataInfo(List<DataInfo> dataInfo) {
         this.dataInfo = dataInfo;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java
index 44d5226e9..25fd7e5d5 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java
@@ -23,55 +23,62 @@ public class Dataset extends Result implements Serializable {
         return storagedate;
     }
 
-    public void setStoragedate(Field<String> storagedate) {
+    public Dataset setStoragedate(Field<String> storagedate) {
         this.storagedate = storagedate;
+        return this;
     }
 
     public Field<String> getDevice() {
         return device;
     }
 
-    public void setDevice(Field<String> device) {
+    public Dataset setDevice(Field<String> device) {
         this.device = device;
+        return this;
     }
 
     public Field<String> getSize() {
         return size;
     }
 
-    public void setSize(Field<String> size) {
+    public Dataset setSize(Field<String> size) {
         this.size = size;
+        return this;
     }
 
     public Field<String> getVersion() {
         return version;
     }
 
-    public void setVersion(Field<String> version) {
+    public Dataset setVersion(Field<String> version) {
         this.version = version;
+        return this;
     }
 
     public Field<String> getLastmetadataupdate() {
         return lastmetadataupdate;
     }
 
-    public void setLastmetadataupdate(Field<String> lastmetadataupdate) {
+    public Dataset setLastmetadataupdate(Field<String> lastmetadataupdate) {
         this.lastmetadataupdate = lastmetadataupdate;
+        return this;
     }
 
     public Field<String> getMetadataversionnumber() {
         return metadataversionnumber;
     }
 
-    public void setMetadataversionnumber(Field<String> metadataversionnumber) {
+    public Dataset setMetadataversionnumber(Field<String> metadataversionnumber) {
         this.metadataversionnumber = metadataversionnumber;
+        return this;
     }
 
     public List<GeoLocation> getGeolocation() {
         return geolocation;
     }
 
-    public void setGeolocation(List<GeoLocation> geolocation) {
+    public Dataset setGeolocation(List<GeoLocation> geolocation) {
         this.geolocation = geolocation;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java
index 006658133..523d7c87e 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java
@@ -31,63 +31,71 @@ public class ExternalReference implements Serializable {
         return sitename;
     }
 
-    public void setSitename(String sitename) {
+    public ExternalReference setSitename(String sitename) {
         this.sitename = sitename;
+        return this;
     }
 
     public String getLabel() {
         return label;
     }
 
-    public void setLabel(String label) {
+    public ExternalReference setLabel(String label) {
         this.label = label;
+        return this;
     }
 
     public String getUrl() {
         return url;
     }
 
-    public void setUrl(String url) {
+    public ExternalReference setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public void setDescription(String description) {
+    public ExternalReference setDescription(String description) {
         this.description = description;
+        return this;
     }
 
     public Qualifier getQualifier() {
         return qualifier;
     }
 
-    public void setQualifier(Qualifier qualifier) {
+    public ExternalReference setQualifier(Qualifier qualifier) {
         this.qualifier = qualifier;
+        return this;
     }
 
     public String getRefidentifier() {
         return refidentifier;
     }
 
-    public void setRefidentifier(String refidentifier) {
+    public ExternalReference setRefidentifier(String refidentifier) {
         this.refidentifier = refidentifier;
+        return this;
     }
 
     public String getQuery() {
         return query;
     }
 
-    public void setQuery(String query) {
+    public ExternalReference setQuery(String query) {
         this.query = query;
+        return this;
     }
 
     public DataInfo getDataInfo() {
         return dataInfo;
     }
 
-    public void setDataInfo(DataInfo dataInfo) {
+    public ExternalReference setDataInfo(DataInfo dataInfo) {
         this.dataInfo = dataInfo;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java
index 567254a23..104a591f1 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java
@@ -14,23 +14,26 @@ public class GeoLocation implements Serializable {
         return point;
     }
 
-    public void setPoint(String point) {
+    public GeoLocation setPoint(String point) {
         this.point = point;
+        return this;
     }
 
     public String getBox() {
         return box;
     }
 
-    public void setBox(String box) {
+    public GeoLocation setBox(String box) {
         this.box = box;
+        return this;
     }
 
     public String getPlace() {
         return place;
     }
 
-    public void setPlace(String place) {
+    public GeoLocation setPlace(String place) {
         this.place = place;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
index f27704c5c..4fef24e46 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
@@ -25,63 +25,71 @@ public class Instance implements Serializable {
         return license;
     }
 
-    public void setLicense(Field<String> license) {
+    public Instance setLicense(Field<String> license) {
         this.license = license;
+        return this;
     }
 
     public Qualifier getAccessright() {
         return accessright;
     }
 
-    public void setAccessright(Qualifier accessright) {
+    public Instance setAccessright(Qualifier accessright) {
         this.accessright = accessright;
+        return this;
     }
 
     public Qualifier getInstancetype() {
         return instancetype;
     }
 
-    public void setInstancetype(Qualifier instancetype) {
+    public Instance setInstancetype(Qualifier instancetype) {
         this.instancetype = instancetype;
+        return this;
     }
 
     public KeyValue getHostedby() {
         return hostedby;
     }
 
-    public void setHostedby(KeyValue hostedby) {
+    public Instance setHostedby(KeyValue hostedby) {
         this.hostedby = hostedby;
+        return this;
     }
 
     public String getUrl() {
         return url;
     }
 
-    public void setUrl(String url) {
+    public Instance setUrl(String url) {
         this.url = url;
+        return this;
     }
 
     public String getDistributionlocation() {
         return distributionlocation;
     }
 
-    public void setDistributionlocation(String distributionlocation) {
+    public Instance setDistributionlocation(String distributionlocation) {
         this.distributionlocation = distributionlocation;
+        return this;
     }
 
     public KeyValue getCollectedfrom() {
         return collectedfrom;
     }
 
-    public void setCollectedfrom(KeyValue collectedfrom) {
+    public Instance setCollectedfrom(KeyValue collectedfrom) {
         this.collectedfrom = collectedfrom;
+        return this;
     }
 
     public Field<String> getDateofacceptance() {
         return dateofacceptance;
     }
 
-    public void setDateofacceptance(Field<String> dateofacceptance) {
+    public Instance setDateofacceptance(Field<String> dateofacceptance) {
         this.dateofacceptance = dateofacceptance;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java
index dd966deb5..260fc22b6 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java
@@ -37,132 +37,147 @@ public class Organization extends OafEntity implements Serializable {
 
     private Qualifier country;
 
-
     public Field<String> getLegalshortname() {
         return legalshortname;
     }
 
-    public void setLegalshortname(Field<String> legalshortname) {
+    public Organization setLegalshortname(Field<String> legalshortname) {
         this.legalshortname = legalshortname;
+        return this;
     }
 
     public Field<String> getLegalname() {
         return legalname;
     }
 
-    public void setLegalname(Field<String> legalname) {
+    public Organization setLegalname(Field<String> legalname) {
         this.legalname = legalname;
+        return this;
     }
 
     public List<Field<String>> getAlternativeNames() {
         return alternativeNames;
     }
 
-    public void setAlternativeNames(List<Field<String>> alternativeNames) {
+    public Organization setAlternativeNames(List<Field<String>> alternativeNames) {
         this.alternativeNames = alternativeNames;
+        return this;
     }
 
     public Field<String> getWebsiteurl() {
         return websiteurl;
     }
 
-    public void setWebsiteurl(Field<String> websiteurl) {
+    public Organization setWebsiteurl(Field<String> websiteurl) {
         this.websiteurl = websiteurl;
+        return this;
     }
 
     public Field<String> getLogourl() {
         return logourl;
     }
 
-    public void setLogourl(Field<String> logourl) {
+    public Organization setLogourl(Field<String> logourl) {
         this.logourl = logourl;
+        return this;
     }
 
     public Field<String> getEclegalbody() {
         return eclegalbody;
     }
 
-    public void setEclegalbody(Field<String> eclegalbody) {
+    public Organization setEclegalbody(Field<String> eclegalbody) {
         this.eclegalbody = eclegalbody;
+        return this;
     }
 
     public Field<String> getEclegalperson() {
         return eclegalperson;
     }
 
-    public void setEclegalperson(Field<String> eclegalperson) {
+    public Organization setEclegalperson(Field<String> eclegalperson) {
         this.eclegalperson = eclegalperson;
+        return this;
     }
 
     public Field<String> getEcnonprofit() {
         return ecnonprofit;
     }
 
-    public void setEcnonprofit(Field<String> ecnonprofit) {
+    public Organization setEcnonprofit(Field<String> ecnonprofit) {
         this.ecnonprofit = ecnonprofit;
+        return this;
     }
 
     public Field<String> getEcresearchorganization() {
         return ecresearchorganization;
     }
 
-    public void setEcresearchorganization(Field<String> ecresearchorganization) {
+    public Organization setEcresearchorganization(Field<String> ecresearchorganization) {
         this.ecresearchorganization = ecresearchorganization;
+        return this;
     }
 
     public Field<String> getEchighereducation() {
         return echighereducation;
     }
 
-    public void setEchighereducation(Field<String> echighereducation) {
+    public Organization setEchighereducation(Field<String> echighereducation) {
         this.echighereducation = echighereducation;
+        return this;
     }
 
     public Field<String> getEcinternationalorganizationeurinterests() {
         return ecinternationalorganizationeurinterests;
     }
 
-    public void setEcinternationalorganizationeurinterests(Field<String> ecinternationalorganizationeurinterests) {
+    public Organization setEcinternationalorganizationeurinterests(Field<String> ecinternationalorganizationeurinterests) {
         this.ecinternationalorganizationeurinterests = ecinternationalorganizationeurinterests;
+        return this;
     }
 
     public Field<String> getEcinternationalorganization() {
         return ecinternationalorganization;
     }
 
-    public void setEcinternationalorganization(Field<String> ecinternationalorganization) {
+    public Organization setEcinternationalorganization(Field<String> ecinternationalorganization) {
         this.ecinternationalorganization = ecinternationalorganization;
+        return this;
     }
 
     public Field<String> getEcenterprise() {
         return ecenterprise;
     }
 
-    public void setEcenterprise(Field<String> ecenterprise) {
+    public Organization setEcenterprise(Field<String> ecenterprise) {
         this.ecenterprise = ecenterprise;
+        return this;
     }
 
     public Field<String> getEcsmevalidated() {
         return ecsmevalidated;
     }
 
-    public void setEcsmevalidated(Field<String> ecsmevalidated) {
+    public Organization setEcsmevalidated(Field<String> ecsmevalidated) {
         this.ecsmevalidated = ecsmevalidated;
+        return this;
     }
 
     public Field<String> getEcnutscode() {
         return ecnutscode;
     }
 
-    public void setEcnutscode(Field<String> ecnutscode) {
+    public Organization setEcnutscode(Field<String> ecnutscode) {
         this.ecnutscode = ecnutscode;
+        return this;
     }
 
     public Qualifier getCountry() {
         return country;
     }
 
-    public void setCountry(Qualifier country) {
+    public Organization setCountry(Qualifier country) {
         this.country = country;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java
index cba401174..1c803a285 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java
@@ -16,8 +16,6 @@ public class OriginDescription implements Serializable {
 
     private String metadataNamespace;
 
-    //private OriginDescription originDescription;
-
     public String getHarvestDate() {
         return harvestDate;
     }
@@ -72,12 +70,4 @@ public class OriginDescription implements Serializable {
         return this;
     }
 
-//    public OriginDescription getOriginDescription() {
-//        return originDescription;
-//    }
-//
-//    public OriginDescription setOriginDescription(OriginDescription originDescription) {
-//        this.originDescription = originDescription;
-//        return this;
-//    }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java
index 12b578904..3ca231587 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java
@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.List;
 
 public class OtherResearchProducts extends Result implements Serializable {
+
     private List<Field<String>> contactperson;
 
     private List<Field<String>> contactgroup;
@@ -14,23 +15,26 @@ public class OtherResearchProducts extends Result implements Serializable {
         return contactperson;
     }
 
-    public void setContactperson(List<Field<String>> contactperson) {
+    public OtherResearchProducts setContactperson(List<Field<String>> contactperson) {
         this.contactperson = contactperson;
+        return this;
     }
 
     public List<Field<String>> getContactgroup() {
         return contactgroup;
     }
 
-    public void setContactgroup(List<Field<String>> contactgroup) {
+    public OtherResearchProducts setContactgroup(List<Field<String>> contactgroup) {
         this.contactgroup = contactgroup;
+        return this;
     }
 
     public List<Field<String>> getTool() {
         return tool;
     }
 
-    public void setTool(List<Field<String>> tool) {
+    public OtherResearchProducts setTool(List<Field<String>> tool) {
         this.tool = tool;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java
index 9ca9cd3d6..bf4eab93c 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java
@@ -11,7 +11,8 @@ public class Publication extends Result implements Serializable {
         return journal;
     }
 
-    public void setJournal(Journal journal) {
+    public Publication setJournal(Journal journal) {
         this.journal = journal;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
index 0320798f0..55d0427aa 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java
@@ -9,8 +9,6 @@ public class Qualifier implements Serializable {
     private String schemeid;
     private String schemename;
 
-//    private DataInfo dataInfo;
-
     public String getClassid() {
         return classid;
     }
@@ -47,12 +45,4 @@ public class Qualifier implements Serializable {
         return this;
     }
 
-//    public DataInfo getDataInfo() {
-//        return dataInfo;
-//    }
-//
-//    public Qualifier setDataInfo(DataInfo dataInfo) {
-//        this.dataInfo = dataInfo;
-//        return this;
-//    }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
index 1a0f74aac..b0630825a 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
@@ -49,172 +49,192 @@ public abstract class Result extends OafEntity implements Serializable {
 
     private List<Instance> instance;
 
-
     public List<Author> getAuthor() {
         return author;
     }
 
-    public void setAuthor(List<Author> author) {
+    public Result setAuthor(List<Author> author) {
         this.author = author;
+        return this;
     }
 
     public Qualifier getResulttype() {
         return resulttype;
     }
 
-    public void setResulttype(Qualifier resulttype) {
+    public Result setResulttype(Qualifier resulttype) {
         this.resulttype = resulttype;
+        return this;
     }
 
     public Qualifier getLanguage() {
         return language;
     }
 
-    public void setLanguage(Qualifier language) {
+    public Result setLanguage(Qualifier language) {
         this.language = language;
+        return this;
     }
 
     public List<Qualifier> getCountry() {
         return country;
     }
 
-    public void setCountry(List<Qualifier> country) {
+    public Result setCountry(List<Qualifier> country) {
         this.country = country;
+        return this;
     }
 
     public List<StructuredProperty> getSubject() {
         return subject;
     }
 
-    public void setSubject(List<StructuredProperty> subject) {
+    public Result setSubject(List<StructuredProperty> subject) {
         this.subject = subject;
+        return this;
     }
 
     public List<StructuredProperty> getTitle() {
         return title;
     }
 
-    public void setTitle(List<StructuredProperty> title) {
+    public Result setTitle(List<StructuredProperty> title) {
         this.title = title;
+        return this;
     }
 
     public List<StructuredProperty> getRelevantdate() {
         return relevantdate;
     }
 
-    public void setRelevantdate(List<StructuredProperty> relevantdate) {
+    public Result setRelevantdate(List<StructuredProperty> relevantdate) {
         this.relevantdate = relevantdate;
+        return this;
     }
 
     public List<Field<String>> getDescription() {
         return description;
     }
 
-    public void setDescription(List<Field<String>> description) {
+    public Result setDescription(List<Field<String>> description) {
         this.description = description;
+        return this;
     }
 
     public Field<String> getDateofacceptance() {
         return dateofacceptance;
     }
 
-    public void setDateofacceptance(Field<String> dateofacceptance) {
+    public Result setDateofacceptance(Field<String> dateofacceptance) {
         this.dateofacceptance = dateofacceptance;
+        return this;
     }
 
     public Field<String> getPublisher() {
         return publisher;
     }
 
-    public void setPublisher(Field<String> publisher) {
+    public Result setPublisher(Field<String> publisher) {
         this.publisher = publisher;
+        return this;
     }
 
     public Field<String> getEmbargoenddate() {
         return embargoenddate;
     }
 
-    public void setEmbargoenddate(Field<String> embargoenddate) {
+    public Result setEmbargoenddate(Field<String> embargoenddate) {
         this.embargoenddate = embargoenddate;
+        return this;
     }
 
     public List<Field<String>> getSource() {
         return source;
     }
 
-    public void setSource(List<Field<String>> source) {
+    public Result setSource(List<Field<String>> source) {
         this.source = source;
+        return this;
     }
 
     public List<Field<String>> getFulltext() {
         return fulltext;
     }
 
-    public void setFulltext(List<Field<String>> fulltext) {
+    public Result setFulltext(List<Field<String>> fulltext) {
         this.fulltext = fulltext;
+        return this;
     }
 
     public List<Field<String>> getFormat() {
         return format;
     }
 
-    public void setFormat(List<Field<String>> format) {
+    public Result setFormat(List<Field<String>> format) {
         this.format = format;
+        return this;
     }
 
     public List<Field<String>> getContributor() {
         return contributor;
     }
 
-    public void setContributor(List<Field<String>> contributor) {
+    public Result setContributor(List<Field<String>> contributor) {
         this.contributor = contributor;
+        return this;
     }
 
     public Qualifier getResourcetype() {
         return resourcetype;
     }
 
-    public void setResourcetype(Qualifier resourcetype) {
+    public Result setResourcetype(Qualifier resourcetype) {
         this.resourcetype = resourcetype;
+        return this;
     }
 
     public List<Field<String>> getCoverage() {
         return coverage;
     }
 
-    public void setCoverage(List<Field<String>> coverage) {
+    public Result setCoverage(List<Field<String>> coverage) {
         this.coverage = coverage;
+        return this;
     }
 
     public Field<String> getRefereed() {
         return refereed;
     }
 
-    public void setRefereed(Field<String> refereed) {
+    public Result setRefereed(Field<String> refereed) {
         this.refereed = refereed;
+        return this;
     }
 
     public List<Context> getContext() {
         return context;
     }
 
-    public void setContext(List<Context> context) {
+    public Result setContext(List<Context> context) {
         this.context = context;
+        return this;
     }
 
     public List<ExternalReference> getExternalReference() {
         return externalReference;
     }
 
-    public void setExternalReference(List<ExternalReference> externalReference) {
+    public Result setExternalReference(List<ExternalReference> externalReference) {
         this.externalReference = externalReference;
+        return this;
     }
 
     public List<Instance> getInstance() {
         return instance;
     }
 
-    public void setInstance(List<Instance> instance) {
+    public Result setInstance(List<Instance> instance) {
         this.instance = instance;
+        return this;
     }
 }
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java
index e696cdb52..451efb99a 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java
@@ -17,31 +17,35 @@ public class Software extends Result implements Serializable {
         return documentationUrl;
     }
 
-    public void setDocumentationUrl(List<Field<String>> documentationUrl) {
+    public Software setDocumentationUrl(List<Field<String>> documentationUrl) {
         this.documentationUrl = documentationUrl;
+        return this;
     }
 
     public List<StructuredProperty> getLicense() {
         return license;
     }
 
-    public void setLicense(List<StructuredProperty> license) {
+    public Software setLicense(List<StructuredProperty> license) {
         this.license = license;
+        return this;
     }
 
     public Field<String> getCodeRepositoryUrl() {
         return codeRepositoryUrl;
     }
 
-    public void setCodeRepositoryUrl(Field<String> codeRepositoryUrl) {
+    public Software setCodeRepositoryUrl(Field<String> codeRepositoryUrl) {
         this.codeRepositoryUrl = codeRepositoryUrl;
+        return this;
     }
 
     public Qualifier getProgrammingLanguage() {
         return programmingLanguage;
     }
 
-    public void setProgrammingLanguage(Qualifier programmingLanguage) {
+    public Software setProgrammingLanguage(Qualifier programmingLanguage) {
         this.programmingLanguage = programmingLanguage;
+        return this;
     }
 }