diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java
index 971e8ae31..d3d0a05fb 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java
@@ -15,6 +15,9 @@ import java.util.List;
 import java.util.Map;
 
 public class AutoCompleteDataEntity extends ComboBoxDataEntity<AutoCompleteDataEntity> {
+    public AutoCompleteDataEntity() {
+        super(FieldType.AUTO_COMPLETE);
+    }
 
     public static class AuthAutoCompleteData {
         private String url;
@@ -145,11 +148,6 @@ public class AutoCompleteDataEntity extends ComboBoxDataEntity<AutoCompleteDataE
         return FieldDataComboBoxType.Autocomplete;
     }
 
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.AUTO_COMPLETE;
-    }
-
     @Override
     public Element toXml(Document doc) {
         Element root = super.toXml(doc);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java
index 291a5b2d5..decd68980 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java
@@ -8,9 +8,19 @@ import org.w3c.dom.Element;
 import java.util.Map;
 
 public abstract class BaseFieldDataEntity<T> implements XmlSerializable<T> {
+    
+    private final  FieldType fieldType;
+
+    public BaseFieldDataEntity(FieldType fieldType) {
+        this.fieldType = fieldType;
+    }
+
     private String label;
 
-    public abstract FieldType getFieldType();
+
+    public FieldType getFieldType() {
+        return fieldType;
+    }
 
     public String getLabel() {
         return label;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BooleanDecisionDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BooleanDecisionDataEntity.java
deleted file mode 100644
index b92b2c7d1..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BooleanDecisionDataEntity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class BooleanDecisionDataEntity extends BaseFieldDataEntity<BooleanDecisionDataEntity> {
-
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.BOOLEAN_DECISION;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CheckBoxDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CheckBoxDataEntity.java
deleted file mode 100644
index b45af367e..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CheckBoxDataEntity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class CheckBoxDataEntity extends BaseFieldDataEntity<CheckBoxDataEntity> {
-
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.CHECK_BOX;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java
index 2551604ce..a84abc5ba 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java
@@ -1,6 +1,7 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -10,6 +11,10 @@ import java.util.Map;
 
 public abstract class ComboBoxDataEntity<T> extends BaseFieldDataEntity<T> {
 
+    public ComboBoxDataEntity(FieldType fieldType) {
+        super(fieldType);
+    }
+
     public abstract FieldDataComboBoxType getFieldSubType();
     
     public static class Option implements XmlSerializable<Option> {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CurrencyDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CurrencyDataEntity.java
deleted file mode 100644
index b015d1d45..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CurrencyDataEntity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class CurrencyDataEntity extends BaseFieldDataEntity<CurrencyDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.CURRENCY;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DataRepositoryDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DataRepositoryDataEntity.java
deleted file mode 100644
index f481f67b1..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DataRepositoryDataEntity.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class DataRepositoryDataEntity extends BaseFieldDataEntity<DataRepositoryDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.DATA_REPOSITORIES;
-    }
-    
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-    
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public DataRepositoryDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetAutoCompleteDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetAutoCompleteDataEntity.java
deleted file mode 100644
index 1776ea64a..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetAutoCompleteDataEntity.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldDataComboBoxType;
-import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class DatasetAutoCompleteDataEntity extends InternalDmpBaseDataEntity<DatasetAutoCompleteDataEntity> {
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-
-	@Override
-	public FieldDataInternalDmpEntryType getFieldSubType() {
-		return FieldDataInternalDmpEntryType.Datasets;
-	}
-
-	@Override
-	public FieldType getFieldType() {
-		return FieldType.INTERNAL_DMP_ENTRIES_DATASETS;
-	}
-
-	@Override
-	public Element toXml(Document doc) {
-		Element root = super.toXml(doc);
-		root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
-
-		return root;
-	}
-
-	@Override
-	public DatasetAutoCompleteDataEntity fromXml(Element item) {
-		super.fromXml(item);
-		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
-
-		return this;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetIdentifierDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetIdentifierDataEntity.java
deleted file mode 100644
index 7f5004f71..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetIdentifierDataEntity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class DatasetIdentifierDataEntity extends BaseFieldDataEntity<DatasetIdentifierDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.DATASET_IDENTIFIER;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatePickerDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatePickerDataEntity.java
deleted file mode 100644
index 16066f18b..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatePickerDataEntity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class DatePickerDataEntity extends BaseFieldDataEntity<DatePickerDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.DATE_PICKER;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DmpAutoCompleteDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DmpAutoCompleteDataEntity.java
deleted file mode 100644
index 84adab457..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DmpAutoCompleteDataEntity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class DmpAutoCompleteDataEntity extends InternalDmpBaseDataEntity<DmpAutoCompleteDataEntity> {
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-
-	@Override
-	public FieldDataInternalDmpEntryType getFieldSubType() {
-		return FieldDataInternalDmpEntryType.Dmps;
-	}
-
-	@Override
-	public FieldType getFieldType() {
-		return FieldType.INTERNAL_DMP_ENTRIES_DMPS;
-	}
-	@Override
-	public Element toXml(Document doc) {
-		Element root = super.toXml(doc);
-		root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
-
-		return root;
-	}
-
-	@Override
-	public DmpAutoCompleteDataEntity fromXml(Element item) {
-		super.fromXml(item);
-		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
-
-		return this;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java
index 938bebfae..e9b2eb2eb 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java
@@ -9,10 +9,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ExternalDatasetDataEntity extends BaseFieldDataEntity<ExternalDatasetDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.EXTERNAL_DATASETS;
+    public ExternalDatasetDataEntity() {
+        super(FieldType.EXTERNAL_DATASETS);
     }
+
     private Boolean multiAutoComplete;
     private FieldDataExternalDatasetType type;
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FieldDataHelper.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FieldDataHelper.java
index 64f9eeac8..6a5f88bb5 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FieldDataHelper.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FieldDataHelper.java
@@ -26,41 +26,43 @@ public class FieldDataHelper {
                 if (subType != null && !subType.isBlank()) {
                     switch (FieldDataInternalDmpEntryType.of(subType)){
                         case Dmps: {
-                            return new DmpAutoCompleteDataEntity();
+                            return new InternalDmpBaseDataEntity(FieldType.INTERNAL_DMP_ENTRIES_DMPS, FieldDataInternalDmpEntryType.Dmps);
                         }
                         case Datasets: {
-                            return new DatasetAutoCompleteDataEntity();
+                            return new InternalDmpBaseDataEntity(FieldType.INTERNAL_DMP_ENTRIES_DATASETS, FieldDataInternalDmpEntryType.Datasets);
                         }
                         case Researchers : {
-                            return new ResearcherAutoCompleteDataEntity();
+                            return new InternalDmpBaseDataEntity(FieldType.INTERNAL_DMP_ENTRIES_RESEARCHERS, FieldDataInternalDmpEntryType.Researchers);
                         }
                     }
                 }
                 break;
             }
-            case BOOLEAN_DECISION: return new BooleanDecisionDataEntity();
+            case LICENSES: 
+            case ORGANIZATIONS: 
+            case PUBLICATIONS:
+            case REGISTRIES: 
+            case RESEARCHERS:
+            case SERVICES:
+            case TAXONOMIES:
+            case DATA_REPOSITORIES:
+            case JOURNAL_REPOSITORIES:
+            case PUB_REPOSITORIES: 
+            case BOOLEAN_DECISION: return new LabelAndMultiplicityDataEntity(type);
+            
+            case FREE_TEXT: 
+            case DATE_PICKER:
+            case RICH_TEXT_AREA:
+            case TAGS:
+            case TEXT_AREA:
+            case VALIDATION: 
+            case DATASET_IDENTIFIER:
+            case CURRENCY:
+            case CHECK_BOX: return new LabelDataEntity(type);
+            
             case RADIO_BOX: return new RadioBoxDataEntity();
-            case CHECK_BOX: return new CheckBoxDataEntity();
-            case FREE_TEXT: return new FreeTextDataEntity();
-            case TEXT_AREA: return new TextAreaDataEntity();
-            case RICH_TEXT_AREA: return new RichTextAreaDataEntity();
             case UPLOAD: return new UploadDataEntity();
-            case DATE_PICKER: return new DatePickerDataEntity();
             case EXTERNAL_DATASETS: return new ExternalDatasetDataEntity();
-            case DATA_REPOSITORIES: return new DataRepositoryDataEntity();
-            case PUB_REPOSITORIES: return new PublicationRepositoryDataEntity();
-            case JOURNAL_REPOSITORIES: return new JournalRepositoryDataEntity();
-            case TAXONOMIES: return new TaxonomyDataEntity();
-            case LICENSES: return new LicenseDataEntity();
-            case PUBLICATIONS: return new PublicationDataEntity();
-            case REGISTRIES: return new RegistryDataEntity();
-            case SERVICES: return new ServiceDataEntity();
-            case TAGS: return new TagDataEntity();
-            case RESEARCHERS: return new ResearcherDataEntity();
-            case ORGANIZATIONS: return new OrganizationDataEntity();
-            case DATASET_IDENTIFIER:  return new DatasetIdentifierDataEntity();
-            case CURRENCY:  return new CurrencyDataEntity();
-            case VALIDATION:  return new ValidationDataEntity();
             default: return null;
         }
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FreeTextDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FreeTextDataEntity.java
deleted file mode 100644
index eec9ebb89..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FreeTextDataEntity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class FreeTextDataEntity extends BaseFieldDataEntity<FreeTextDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.FREE_TEXT;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java
index 8c6b3f95f..0efb8491d 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java
@@ -1,16 +1,25 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class InternalDmpBaseDataEntity<T> extends BaseFieldDataEntity<T> {
+public class InternalDmpBaseDataEntity extends LabelAndMultiplicityDataEntity {
+
+	private final FieldDataInternalDmpEntryType fieldSubType;
+	public InternalDmpBaseDataEntity(FieldType fieldType, FieldDataInternalDmpEntryType fieldSubType) {
+		super(fieldType);
+		this.fieldSubType = fieldSubType;
+	}
+
+	public FieldDataInternalDmpEntryType getFieldSubType() {
+		return fieldSubType;
+	}
 
-	public abstract FieldDataInternalDmpEntryType getFieldSubType();
-	
 	@Override
 	public Element toXml(Document doc) {
 		Element root = super.toXml(doc);
@@ -19,8 +28,8 @@ public abstract class InternalDmpBaseDataEntity<T> extends BaseFieldDataEntity<T
 	}
 
 	@Override
-	public T fromXml(Element item) {
+	public InternalDmpBaseDataEntity fromXml(Element item) {
 		super.fromXml(item);
-		return (T) this;
+		return this;
 	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/JournalRepositoryDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/JournalRepositoryDataEntity.java
deleted file mode 100644
index bf085865a..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/JournalRepositoryDataEntity.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class JournalRepositoryDataEntity extends BaseFieldDataEntity<JournalRepositoryDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.JOURNAL_REPOSITORIES;
-    }
-    
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public JournalRepositoryDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TaxonomyDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LabelAndMultiplicityDataEntity.java
similarity index 76%
rename from dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TaxonomyDataEntity.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LabelAndMultiplicityDataEntity.java
index fada5e262..2d1b1f204 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TaxonomyDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LabelAndMultiplicityDataEntity.java
@@ -4,14 +4,11 @@ import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import java.util.HashMap;
-import java.util.Map;
-
-public class TaxonomyDataEntity extends BaseFieldDataEntity<TaxonomyDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.TAXONOMIES;
+public class LabelAndMultiplicityDataEntity extends BaseFieldDataEntity<LabelAndMultiplicityDataEntity> {
+    public LabelAndMultiplicityDataEntity(FieldType fieldType) {
+        super(fieldType);
     }
+
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -32,7 +29,7 @@ public class TaxonomyDataEntity extends BaseFieldDataEntity<TaxonomyDataEntity>
     }
 
     @Override
-    public TaxonomyDataEntity fromXml(Element item) {
+    public LabelAndMultiplicityDataEntity fromXml(Element item) {
         super.fromXml(item);
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LabelDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LabelDataEntity.java
new file mode 100644
index 000000000..d7e0ec06a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LabelDataEntity.java
@@ -0,0 +1,10 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import eu.eudat.commons.enums.FieldType;
+
+public class LabelDataEntity extends BaseFieldDataEntity<LabelDataEntity> {
+
+    public LabelDataEntity(FieldType fieldType) {
+        super(fieldType);
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LicenseDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LicenseDataEntity.java
deleted file mode 100644
index 94f1bd0ac..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LicenseDataEntity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class LicenseDataEntity extends BaseFieldDataEntity<LicenseDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.LICENSES;
-    }
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-    
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public LicenseDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/OrganizationDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/OrganizationDataEntity.java
deleted file mode 100644
index e175f54e9..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/OrganizationDataEntity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class OrganizationDataEntity extends BaseFieldDataEntity<OrganizationDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.ORGANIZATIONS;
-    }
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public OrganizationDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationDataEntity.java
deleted file mode 100644
index 4f7aaaecf..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationDataEntity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class PublicationDataEntity extends BaseFieldDataEntity<PublicationDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.PUBLICATIONS;
-    }
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public PublicationDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationRepositoryDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationRepositoryDataEntity.java
deleted file mode 100644
index 0e5a2d472..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationRepositoryDataEntity.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class PublicationRepositoryDataEntity extends BaseFieldDataEntity<PublicationRepositoryDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.PUB_REPOSITORIES;
-    }
-    
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-    
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public PublicationRepositoryDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java
index 1c057016d..ab4b569c4 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java
@@ -13,10 +13,10 @@ import java.util.List;
 import java.util.Map;
 
 public class RadioBoxDataEntity extends BaseFieldDataEntity<RadioBoxDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.RADIO_BOX;
+    public RadioBoxDataEntity() {
+        super(FieldType.RADIO_BOX);
     }
+
     public static class Option implements XmlSerializable<Option> {
         private String label;
         private String value;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RegistryDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RegistryDataEntity.java
deleted file mode 100644
index 8fdb5d5a0..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RegistryDataEntity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class RegistryDataEntity extends BaseFieldDataEntity<RegistryDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.REGISTRIES;
-    }
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public RegistryDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherAutoCompleteDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherAutoCompleteDataEntity.java
deleted file mode 100644
index 19c7e300d..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherAutoCompleteDataEntity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ResearcherAutoCompleteDataEntity extends InternalDmpBaseDataEntity<ResearcherAutoCompleteDataEntity> {
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-
-	@Override
-	public FieldDataInternalDmpEntryType getFieldSubType() {
-		return FieldDataInternalDmpEntryType.Researchers;
-	}
-
-	@Override
-	public FieldType getFieldType() {
-		return FieldType.INTERNAL_DMP_ENTRIES_RESEARCHERS;
-	}
-	
-	@Override
-	public Element toXml(Document doc) {
-		Element root = super.toXml(doc);
-		root.setAttribute("multiAutoComplete", this.multiAutoComplete != null ? this.multiAutoComplete.toString() : "false");
-
-		return root;
-	}
-
-	@Override
-	public ResearcherAutoCompleteDataEntity fromXml(Element item) {
-		super.fromXml(item);
-		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
-
-		return this;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherDataEntity.java
deleted file mode 100644
index eae316e0a..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherDataEntity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ResearcherDataEntity extends BaseFieldDataEntity<ResearcherDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.RESEARCHERS;
-    }
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-    
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public ResearcherDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RichTextAreaDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RichTextAreaDataEntity.java
deleted file mode 100644
index 86da016cc..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RichTextAreaDataEntity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class RichTextAreaDataEntity extends BaseFieldDataEntity<RichTextAreaDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.RICH_TEXT_AREA;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ServiceDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ServiceDataEntity.java
deleted file mode 100644
index 877542820..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ServiceDataEntity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ServiceDataEntity extends BaseFieldDataEntity<ServiceDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.SERVICES;
-    }
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-    
-    @Override
-    public Element toXml(Document doc) {
-        Element root = super.toXml(doc);
-        if (this.getMultiAutoComplete() != null) {
-            root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
-        }
-        return root;
-    }
-
-    @Override
-    public ServiceDataEntity fromXml(Element item) {
-        super.fromXml(item);
-        this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TagDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TagDataEntity.java
deleted file mode 100644
index 64ea04ead..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TagDataEntity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class TagDataEntity extends BaseFieldDataEntity<TagDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.TAGS;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TextAreaDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TextAreaDataEntity.java
deleted file mode 100644
index 01d10e43e..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TextAreaDataEntity.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-public class TextAreaDataEntity extends BaseFieldDataEntity<TextAreaDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.TEXT_AREA;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/UploadDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/UploadDataEntity.java
index 61fb7808a..522c7de64 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/UploadDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/UploadDataEntity.java
@@ -14,10 +14,10 @@ import java.util.Map;
 
 
 public class UploadDataEntity extends BaseFieldDataEntity<UploadDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.UPLOAD;
+    public UploadDataEntity() {
+        super(FieldType.UPLOAD);
     }
+
     public static class Option implements XmlSerializable<UploadDataEntity.Option> {
         private String label;
         private String value;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ValidationDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ValidationDataEntity.java
deleted file mode 100644
index 5278d4b0d..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ValidationDataEntity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ValidationDataEntity extends BaseFieldDataEntity<ValidationDataEntity> {
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.VALIDATION;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/WordListDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/WordListDataEntity.java
index 2ab8d7fe1..a7212ed8f 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/WordListDataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/WordListDataEntity.java
@@ -13,6 +13,10 @@ import java.util.List;
 import java.util.Map;
 
 public class WordListDataEntity extends ComboBoxDataEntity<WordListDataEntity> {
+
+    public WordListDataEntity() {
+        super(FieldType.WORD_LIST);
+    }
     private List<Option> options;
     
     private Boolean multiList;
@@ -38,11 +42,6 @@ public class WordListDataEntity extends ComboBoxDataEntity<WordListDataEntity> {
         return FieldDataComboBoxType.Wordlist;
     }
 
-    @Override
-    public FieldType getFieldType() {
-        return FieldType.WORD_LIST;
-    }
-
     @Override
     public Element toXml(Document doc) {
         Element root = super.toXml(doc);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/FieldImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/FieldImportExport.java
index b3bf3f768..fac558708 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/FieldImportExport.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/FieldImportExport.java
@@ -41,34 +41,34 @@ public class FieldImportExport {
     private FieldType fieldType;
 
     @XmlElements({
-            @XmlElement(name = FieldType.Names.CheckBox, type = CheckBoxDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Validation, type = ValidationDataImportExport.class),
-            @XmlElement(name = FieldType.Names.TextArea, type = TextAreaDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Taxonomies, type = TaxonomyDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Tags, type = TagDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Services, type = ServiceDataImportExport.class),
-            @XmlElement(name = FieldType.Names.RichTextarea, type = RichTextAreaDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Researchers, type = ResearcherDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Registries, type = RegistryDataImportExport.class),
-            @XmlElement(name = FieldType.Names.PubRepositories, type = PublicationRepositoryDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Publications, type = PublicationDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Organizations, type = OrganizationDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Licenses, type = LicenseDataImportExport.class),
-            @XmlElement(name = FieldType.Names.JournalRepositories, type = JournalRepositoryDataImportExport.class),
-            @XmlElement(name = FieldType.Names.FreeText, type = FreeTextDataImportExport.class),
+            @XmlElement(name = FieldType.Names.CheckBox, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Validation, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.TextArea, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Taxonomies, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Tags, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Services, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.RichTextarea, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Researchers, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Registries, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.PubRepositories, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Publications, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Organizations, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Licenses, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.JournalRepositories, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.FreeText, type = LabelDataImportExport.class),
             @XmlElement(name = FieldType.Names.ExternalDatasets, type = ExternalDatasetDataImportExport.class),
-            @XmlElement(name = FieldType.Names.DatePicker, type = DatePickerDataImportExport.class),
-            @XmlElement(name = FieldType.Names.DatasetIdentifier, type = DatasetIdentifierDataImportExport.class),
-            @XmlElement(name = FieldType.Names.DataRepositories, type = DataRepositoryDataImportExport.class),
-            @XmlElement(name = FieldType.Names.Currency, type = CurrencyDataImportExport.class),
-            @XmlElement(name = FieldType.Names.BooleanDecision, type = BooleanDecisionDataImportExport.class),
+            @XmlElement(name = FieldType.Names.DatePicker, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.DatasetIdentifier, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.DataRepositories, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.Currency, type = LabelDataImportExport.class),
+            @XmlElement(name = FieldType.Names.BooleanDecision, type = LabelAndMultiplicityDataImportExport.class),
             @XmlElement(name = FieldType.Names.Upload, type = UploadDataImportExport.class),
             @XmlElement(name = FieldType.Names.RadioBox, type = RadioBoxDataImportExport.class),
             @XmlElement(name = FieldType.Names.Wordlist, type = WordListDataImportExport.class),
             @XmlElement(name = FieldType.Names.Autocomplete, type = AutoCompleteDataImportExport.class),
-            @XmlElement(name = FieldType.Names.InternalDmpDatasets, type = DatasetAutoCompleteDataImportExport.class),
-            @XmlElement(name = FieldType.Names.InternalDmpDmps, type = DmpAutoCompleteDataImportExport.class),
-            @XmlElement(name = FieldType.Names.InternalDmpResearchers, type = ResearcherAutoCompleteDataImportExport.class),
+            @XmlElement(name = FieldType.Names.InternalDmpDatasets, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.InternalDmpDmps, type = LabelAndMultiplicityDataImportExport.class),
+            @XmlElement(name = FieldType.Names.InternalDmpResearchers, type = LabelAndMultiplicityDataImportExport.class),
     })
     private BaseFieldDataImportExport data;
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/BooleanDecisionDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/BooleanDecisionDataImportExport.java
deleted file mode 100644
index 6736c6eed..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/BooleanDecisionDataImportExport.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class BooleanDecisionDataImportExport extends BaseFieldDataImportExport {
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/CheckBoxDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/CheckBoxDataImportExport.java
deleted file mode 100644
index 4ff1bdedf..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/CheckBoxDataImportExport.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import eu.eudat.commons.enums.FieldType;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class CheckBoxDataImportExport extends BaseFieldDataImportExport {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/CurrencyDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/CurrencyDataImportExport.java
deleted file mode 100644
index fa08ab5f4..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/CurrencyDataImportExport.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class CurrencyDataImportExport extends BaseFieldDataImportExport {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatasetAutoCompleteDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatasetAutoCompleteDataImportExport.java
deleted file mode 100644
index 0eb0f86a1..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatasetAutoCompleteDataImportExport.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class DatasetAutoCompleteDataImportExport extends BaseFieldDataImportExport {
-	@XmlAttribute(name = "multiAutoComplete")
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatasetIdentifierDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatasetIdentifierDataImportExport.java
deleted file mode 100644
index ccb82afa1..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatasetIdentifierDataImportExport.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class DatasetIdentifierDataImportExport extends BaseFieldDataImportExport {
-    
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatePickerDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatePickerDataImportExport.java
deleted file mode 100644
index 114e28330..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DatePickerDataImportExport.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class DatePickerDataImportExport extends BaseFieldDataImportExport {
-    
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DmpAutoCompleteDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DmpAutoCompleteDataImportExport.java
deleted file mode 100644
index 65f7fed23..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DmpAutoCompleteDataImportExport.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class DmpAutoCompleteDataImportExport extends BaseFieldDataImportExport {
-	@XmlAttribute(name = "multiAutoComplete")
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/FreeTextDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/FreeTextDataImportExport.java
deleted file mode 100644
index 3b59e6c00..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/FreeTextDataImportExport.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class FreeTextDataImportExport extends BaseFieldDataImportExport {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/JournalRepositoryDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/JournalRepositoryDataImportExport.java
deleted file mode 100644
index 77df54834..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/JournalRepositoryDataImportExport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class JournalRepositoryDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DataRepositoryDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LabelAndMultiplicityDataImportExport.java
similarity index 86%
rename from dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DataRepositoryDataImportExport.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LabelAndMultiplicityDataImportExport.java
index f7c0267bf..6c90bcda4 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/DataRepositoryDataImportExport.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LabelAndMultiplicityDataImportExport.java
@@ -5,7 +5,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlAttribute;
 
 @XmlAccessorType(XmlAccessType.FIELD)
-public class DataRepositoryDataImportExport extends BaseFieldDataImportExport {
+public class LabelAndMultiplicityDataImportExport extends BaseFieldDataImportExport {
 
     @XmlAttribute(name = "multiAutoComplete")
     private Boolean multiAutoComplete;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TagDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LabelDataImportExport.java
similarity index 75%
rename from dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TagDataImportExport.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LabelDataImportExport.java
index ecdb12ad3..343147b2f 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TagDataImportExport.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LabelDataImportExport.java
@@ -4,5 +4,6 @@ import jakarta.xml.bind.annotation.XmlAccessType;
 import jakarta.xml.bind.annotation.XmlAccessorType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
-public class TagDataImportExport extends BaseFieldDataImportExport {
+public class LabelDataImportExport extends BaseFieldDataImportExport {
+
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LicenseDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LicenseDataImportExport.java
deleted file mode 100644
index 4fafeb705..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/LicenseDataImportExport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class LicenseDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/OrganizationDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/OrganizationDataImportExport.java
deleted file mode 100644
index 361198985..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/OrganizationDataImportExport.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class OrganizationDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/PublicationDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/PublicationDataImportExport.java
deleted file mode 100644
index 924e7d9c9..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/PublicationDataImportExport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class PublicationDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/PublicationRepositoryDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/PublicationRepositoryDataImportExport.java
deleted file mode 100644
index 6118b4aff..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/PublicationRepositoryDataImportExport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class PublicationRepositoryDataImportExport extends BaseFieldDataImportExport {
-
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/RegistryDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/RegistryDataImportExport.java
deleted file mode 100644
index d32943801..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/RegistryDataImportExport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class RegistryDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ResearcherAutoCompleteDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ResearcherAutoCompleteDataImportExport.java
deleted file mode 100644
index 361b0cdf3..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ResearcherAutoCompleteDataImportExport.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ResearcherAutoCompleteDataImportExport extends BaseFieldDataImportExport {
-	@XmlAttribute(name = "multiAutoComplete")
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ResearcherDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ResearcherDataImportExport.java
deleted file mode 100644
index bcf3c8f2c..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ResearcherDataImportExport.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ResearcherDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/RichTextAreaDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/RichTextAreaDataImportExport.java
deleted file mode 100644
index 69ea4f070..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/RichTextAreaDataImportExport.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class RichTextAreaDataImportExport extends BaseFieldDataImportExport {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ServiceDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ServiceDataImportExport.java
deleted file mode 100644
index 78833d6f7..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ServiceDataImportExport.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ServiceDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TaxonomyDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TaxonomyDataImportExport.java
deleted file mode 100644
index 03cf548ff..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TaxonomyDataImportExport.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class TaxonomyDataImportExport extends BaseFieldDataImportExport {
-    @XmlAttribute(name = "multiAutoComplete")
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TextAreaDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TextAreaDataImportExport.java
deleted file mode 100644
index ddfb8f3c9..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/TextAreaDataImportExport.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class TextAreaDataImportExport extends BaseFieldDataImportExport {
-    
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ValidationDataImportExport.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ValidationDataImportExport.java
deleted file mode 100644
index b0d09b3f1..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/importexport/fielddata/ValidationDataImportExport.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package eu.eudat.commons.types.descriptiontemplate.importexport.fielddata;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ValidationDataImportExport extends BaseFieldDataImportExport {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BooleanDecisionDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BooleanDecisionDataBuilder.java
deleted file mode 100644
index 1d6cb4840..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BooleanDecisionDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BooleanDecisionData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class BooleanDecisionDataBuilder extends BaseFieldDataBuilder<BooleanDecisionData, BooleanDecisionDataEntity> {
-
-	@Autowired
-	public BooleanDecisionDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(BooleanDecisionDataBuilder.class)));
-	}
-
-	protected BooleanDecisionData getInstance() {
-		return new BooleanDecisionData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, BooleanDecisionDataEntity d, BooleanDecisionData model) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CheckBoxDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CheckBoxDataBuilder.java
deleted file mode 100644
index fa79ea3b2..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CheckBoxDataBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.CheckBoxDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.CheckBoxData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class CheckBoxDataBuilder extends BaseFieldDataBuilder<CheckBoxData, CheckBoxDataEntity> {
-
-	@Autowired
-	public CheckBoxDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(CheckBoxDataBuilder.class)));
-	}
-
-	protected CheckBoxData getInstance() {
-		return new CheckBoxData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, CheckBoxDataEntity d, CheckBoxData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CurrencyDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CurrencyDataBuilder.java
deleted file mode 100644
index 75919c6b3..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CurrencyDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.CurrencyDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.CurrencyData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class CurrencyDataBuilder extends BaseFieldDataBuilder<CurrencyData, CurrencyDataEntity> {
-
-	@Autowired
-	public CurrencyDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(CurrencyDataBuilder.class)));
-	}
-
-	protected CurrencyData getInstance() {
-		return new CurrencyData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, CurrencyDataEntity d, CurrencyData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DataRepositoryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DataRepositoryDataBuilder.java
deleted file mode 100644
index 570f19977..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DataRepositoryDataBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ComboBoxOption;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class DataRepositoryDataBuilder extends BaseFieldDataBuilder<DataRepositoryData, DataRepositoryDataEntity> {
-
-	@Autowired
-	public DataRepositoryDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(DataRepositoryDataBuilder.class)));
-	}
-
-	protected DataRepositoryData getInstance() {
-		return new DataRepositoryData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, DataRepositoryDataEntity d, DataRepositoryData m) {
-		if (fields.hasField(this.asIndexer(DataRepositoryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataBuilder.java
deleted file mode 100644
index 48018a46c..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataBuilder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DatasetAutoCompleteDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetAutoCompleteData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class DatasetAutoCompleteDataBuilder extends BaseFieldDataBuilder<DatasetAutoCompleteData, DatasetAutoCompleteDataEntity> {
-
-	@Autowired
-	public DatasetAutoCompleteDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(DatasetAutoCompleteDataBuilder.class)));
-	}
-
-	protected DatasetAutoCompleteData getInstance() {
-		return new DatasetAutoCompleteData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, DatasetAutoCompleteDataEntity d, DatasetAutoCompleteData m) {
-		if (fields.hasField(this.asIndexer(DatasetAutoCompleteData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataBuilder.java
deleted file mode 100644
index 482b304c5..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DatasetIdentifierDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetIdentifierData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class DatasetIdentifierDataBuilder extends BaseFieldDataBuilder<DatasetIdentifierData, DatasetIdentifierDataEntity> {
-
-	@Autowired
-	public DatasetIdentifierDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(DatasetIdentifierDataBuilder.class)));
-	}
-
-	protected DatasetIdentifierData getInstance() {
-		return new DatasetIdentifierData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, DatasetIdentifierDataEntity d, DatasetIdentifierData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatePickerDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatePickerDataBuilder.java
deleted file mode 100644
index 8f65317f9..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatePickerDataBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DatePickerDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatePickerData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class DatePickerDataBuilder extends BaseFieldDataBuilder<DatePickerData, DatePickerDataEntity> {
-
-	@Autowired
-	public DatePickerDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(DatePickerDataBuilder.class)));
-	}
-
-	protected DatePickerData getInstance() {
-		return new DatePickerData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, DatePickerDataEntity d, DatePickerData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataBuilder.java
deleted file mode 100644
index 89c974c9f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DmpAutoCompleteDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DmpAutoCompleteData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class DmpAutoCompleteDataBuilder extends BaseFieldDataBuilder<DmpAutoCompleteData, DmpAutoCompleteDataEntity> {
-
-	@Autowired
-	public DmpAutoCompleteDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(DmpAutoCompleteDataBuilder.class)));
-	}
-
-	protected DmpAutoCompleteData getInstance() {
-		return new DmpAutoCompleteData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, DmpAutoCompleteDataEntity d, DmpAutoCompleteData m) {
-		if (fields.hasField(this.asIndexer(DmpAutoCompleteData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-		
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/FreeTextDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/FreeTextDataBuilder.java
deleted file mode 100644
index 987ab6890..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/FreeTextDataBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.FreeTextDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.FreeTextData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class FreeTextDataBuilder extends BaseFieldDataBuilder<FreeTextData, FreeTextDataEntity> {
-
-	@Autowired
-	public FreeTextDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(FreeTextDataBuilder.class)));
-	}
-
-	protected FreeTextData getInstance() {
-		return new FreeTextData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, FreeTextDataEntity d, FreeTextData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java
deleted file mode 100644
index e344b16d9..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.JournalRepositoryDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.JournalRepositoryData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class JournalRepositoryDataBuilder extends BaseFieldDataBuilder<JournalRepositoryData, JournalRepositoryDataEntity> {
-
-	@Autowired
-	public JournalRepositoryDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(JournalRepositoryDataBuilder.class)));
-	}
-
-	protected JournalRepositoryData getInstance() {
-		return new JournalRepositoryData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, JournalRepositoryDataEntity d, JournalRepositoryData m) {
-		if (fields.hasField(this.asIndexer(JournalRepositoryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataBuilder.java
new file mode 100644
index 000000000..9ac75df73
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class LabelAndMultiplicityDataBuilder extends BaseFieldDataBuilder<LabelAndMultiplicityData, LabelAndMultiplicityDataEntity> {
+
+	@Autowired
+	public LabelAndMultiplicityDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(LabelAndMultiplicityDataBuilder.class)));
+	}
+
+	protected LabelAndMultiplicityData getInstance() {
+		return new LabelAndMultiplicityData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, LabelAndMultiplicityDataEntity d, LabelAndMultiplicityData m) {
+		if (fields.hasField(this.asIndexer(LabelAndMultiplicityData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TagDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LabelDataBuilder.java
similarity index 57%
rename from dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TagDataBuilder.java
rename to dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LabelDataBuilder.java
index 7fab0da1a..0c0827cf6 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TagDataBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LabelDataBuilder.java
@@ -1,8 +1,8 @@
 package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
 
-import eu.eudat.commons.types.descriptiontemplate.fielddata.TagDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelDataEntity;
 import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.TagData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.LabelData;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import org.slf4j.LoggerFactory;
@@ -13,17 +13,18 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class TagDataBuilder extends BaseFieldDataBuilder<TagData, TagDataEntity> {
+public class LabelDataBuilder extends BaseFieldDataBuilder<LabelData, LabelDataEntity> {
 
 	@Autowired
-	public TagDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(TagDataBuilder.class)));
+	public LabelDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(LabelDataBuilder.class)));
 	}
 
-	protected TagData getInstance() {
-		return new TagData();
+	protected LabelData getInstance() {
+		return new LabelData();
 	}
+
 	@Override
-	protected void buildChild(FieldSet fields, TagDataEntity d, TagData m) {
+	protected void buildChild(FieldSet fields, LabelDataEntity d, LabelData model) {
 	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LicenseDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LicenseDataBuilder.java
deleted file mode 100644
index 85791fbda..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LicenseDataBuilder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.LicenseDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ComboBoxOption;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.LicenseData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class LicenseDataBuilder extends BaseFieldDataBuilder<LicenseData, LicenseDataEntity> {
-
-	@Autowired
-	public LicenseDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(LicenseDataBuilder.class)));
-	}
-
-	protected LicenseData getInstance() {
-		return new LicenseData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, LicenseDataEntity d, LicenseData m) {
-		if (fields.hasField(this.asIndexer(LicenseData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/OrganizationDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/OrganizationDataBuilder.java
deleted file mode 100644
index 0f6b1c2b7..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/OrganizationDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.OrganizationDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.OrganizationData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class OrganizationDataBuilder extends BaseFieldDataBuilder<OrganizationData, OrganizationDataEntity> {
-
-	@Autowired
-	public OrganizationDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(OrganizationDataBuilder.class)));
-	}
-
-	protected OrganizationData getInstance() {
-		return new OrganizationData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, OrganizationDataEntity d, OrganizationData m) {
-		if (fields.hasField(this.asIndexer(OrganizationData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationDataBuilder.java
deleted file mode 100644
index fad197524..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.PublicationDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.PublicationData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class PublicationDataBuilder extends BaseFieldDataBuilder<PublicationData, PublicationDataEntity> {
-
-	@Autowired
-	public PublicationDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(PublicationDataBuilder.class)));
-	}
-
-	protected PublicationData getInstance() {
-		return new PublicationData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, PublicationDataEntity d, PublicationData m) {
-		if (fields.hasField(this.asIndexer(PublicationData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataBuilder.java
deleted file mode 100644
index 55afea1bb..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataBuilder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.PublicationRepositoryDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.PublicationRepositoryData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class PublicationRepositoryDataBuilder extends BaseFieldDataBuilder<PublicationRepositoryData, PublicationRepositoryDataEntity> {
-
-	@Autowired
-	public PublicationRepositoryDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(PublicationRepositoryDataBuilder.class)));
-	}
-
-	protected PublicationRepositoryData getInstance() {
-		return new PublicationRepositoryData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, PublicationRepositoryDataEntity d, PublicationRepositoryData m) {
-		if (fields.hasField(this.asIndexer(PublicationRepositoryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RegistryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RegistryDataBuilder.java
deleted file mode 100644
index 86d697ef3..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RegistryDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.RegistryDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.RegistryData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class RegistryDataBuilder extends BaseFieldDataBuilder<RegistryData, RegistryDataEntity> {
-
-	@Autowired
-	public RegistryDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(RegistryDataBuilder.class)));
-	}
-
-	protected RegistryData getInstance() {
-		return new RegistryData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, RegistryDataEntity d, RegistryData m) {
-		if (fields.hasField(this.asIndexer(RegistryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataBuilder.java
deleted file mode 100644
index 9b6e3ad5c..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ResearcherAutoCompleteDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherAutoCompleteData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class ResearcherAutoCompleteDataBuilder extends BaseFieldDataBuilder<ResearcherAutoCompleteData, ResearcherAutoCompleteDataEntity> {
-
-	@Autowired
-	public ResearcherAutoCompleteDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(ResearcherAutoCompleteDataBuilder.class)));
-	}
-
-	protected ResearcherAutoCompleteData getInstance() {
-		return new ResearcherAutoCompleteData();
-	}
-
-	@Override
-	protected void buildChild(FieldSet fields, ResearcherAutoCompleteDataEntity d, ResearcherAutoCompleteData m) {
-		if (fields.hasField(this.asIndexer(ResearcherAutoCompleteData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-		
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherDataBuilder.java
deleted file mode 100644
index f075f5a44..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ResearcherDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class ResearcherDataBuilder extends BaseFieldDataBuilder<ResearcherData, ResearcherDataEntity> {
-
-	@Autowired
-	public ResearcherDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(ResearcherDataBuilder.class)));
-	}
-
-	protected ResearcherData getInstance() {
-		return new ResearcherData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, ResearcherDataEntity d, ResearcherData m) {
-		if (fields.hasField(this.asIndexer(ResearcherData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RichTextAreaDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RichTextAreaDataBuilder.java
deleted file mode 100644
index 73d037b43..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RichTextAreaDataBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.RichTextAreaDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.RichTextAreaData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class RichTextAreaDataBuilder extends BaseFieldDataBuilder<RichTextAreaData, RichTextAreaDataEntity> {
-
-	@Autowired
-	public RichTextAreaDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(RichTextAreaDataBuilder.class)));
-	}
-
-	protected RichTextAreaData getInstance() {
-		return new RichTextAreaData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, RichTextAreaDataEntity d, RichTextAreaData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ServiceDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ServiceDataBuilder.java
deleted file mode 100644
index 1801c0e25..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ServiceDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ServiceDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ServiceData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class ServiceDataBuilder extends BaseFieldDataBuilder<ServiceData, ServiceDataEntity> {
-
-	@Autowired
-	public ServiceDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(ServiceDataBuilder.class)));
-	}
-
-	protected ServiceData getInstance() {
-		return new ServiceData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, ServiceDataEntity d, ServiceData m) {
-		if (fields.hasField(this.asIndexer(ServiceData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TaxonomyDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TaxonomyDataBuilder.java
deleted file mode 100644
index 0ef3b83d6..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TaxonomyDataBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.TaxonomyDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.TaxonomyData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class TaxonomyDataBuilder extends BaseFieldDataBuilder<TaxonomyData, TaxonomyDataEntity> {
-
-	@Autowired
-	public TaxonomyDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(TaxonomyDataBuilder.class)));
-	}
-
-	protected TaxonomyData getInstance() {
-		return new TaxonomyData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, TaxonomyDataEntity d, TaxonomyData m) {
-		if (fields.hasField(this.asIndexer(TaxonomyData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TextAreaDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TextAreaDataBuilder.java
deleted file mode 100644
index 2cf32d61f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TextAreaDataBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.TextAreaDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.TextAreaData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class TextAreaDataBuilder extends BaseFieldDataBuilder<TextAreaData, TextAreaDataEntity> {
-
-	@Autowired
-	public TextAreaDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(TextAreaDataBuilder.class)));
-	}
-
-	protected TextAreaData getInstance() {
-		return new TextAreaData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, TextAreaDataEntity d, TextAreaData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ValidationDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ValidationDataBuilder.java
deleted file mode 100644
index 35b68642b..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ValidationDataBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ValidationDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ValidationData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class ValidationDataBuilder extends BaseFieldDataBuilder<ValidationData, ValidationDataEntity> {
-
-	@Autowired
-	public ValidationDataBuilder(ConventionService conventionService) {
-		super(conventionService, new LoggerService(LoggerFactory.getLogger(ValidationDataBuilder.class)));
-	}
-
-	protected ValidationData getInstance() {
-		return new ValidationData();
-	}
-	@Override
-	protected void buildChild(FieldSet fields, ValidationDataEntity d, ValidationData m) {
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BooleanDecisionData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BooleanDecisionData.java
deleted file mode 100644
index 4472e9005..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BooleanDecisionData.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class BooleanDecisionData extends BaseFieldData {
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CurrencyData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CurrencyData.java
deleted file mode 100644
index c5333dae4..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CurrencyData.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class CurrencyData extends BaseFieldData {
-    
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DataRepositoryData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DataRepositoryData.java
deleted file mode 100644
index 6ff4a22c8..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DataRepositoryData.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class DataRepositoryData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteData.java
deleted file mode 100644
index 62072b82d..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteData.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class DatasetAutoCompleteData extends BaseFieldData {
-	public final static String _multiAutoComplete = "multiAutoComplete";
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetIdentifierData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetIdentifierData.java
deleted file mode 100644
index 6d9336826..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetIdentifierData.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-public class DatasetIdentifierData extends BaseFieldData {
-  
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatePickerData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatePickerData.java
deleted file mode 100644
index cc2e50bd4..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatePickerData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class DatePickerData extends BaseFieldData {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/FreeTextData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/FreeTextData.java
deleted file mode 100644
index e953e0f33..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/FreeTextData.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class FreeTextData extends BaseFieldData {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/JournalRepositoryData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/JournalRepositoryData.java
deleted file mode 100644
index d403994c8..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/JournalRepositoryData.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class JournalRepositoryData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DmpAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityData.java
similarity index 85%
rename from dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DmpAutoCompleteData.java
rename to dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityData.java
index 24e6dc9e6..4b577281b 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DmpAutoCompleteData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityData.java
@@ -1,6 +1,6 @@
 package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
-public class DmpAutoCompleteData extends BaseFieldData {
+public class LabelAndMultiplicityData extends BaseFieldData {
 	public final static String _multiAutoComplete = "multiAutoComplete";
 	private Boolean multiAutoComplete;
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CheckBoxData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LabelData.java
similarity index 59%
rename from dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CheckBoxData.java
rename to dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LabelData.java
index 1ddcdebcb..26801255b 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CheckBoxData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LabelData.java
@@ -1,6 +1,7 @@
 package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
-public class CheckBoxData extends BaseFieldData {
 
+
+public class LabelData extends BaseFieldData {
     
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LicenseData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LicenseData.java
deleted file mode 100644
index cc9928ace..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LicenseData.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class LicenseData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/OrganizationData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/OrganizationData.java
deleted file mode 100644
index 258070f92..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/OrganizationData.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class OrganizationData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationData.java
deleted file mode 100644
index 7857d458f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationData.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-public class PublicationData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationRepositoryData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationRepositoryData.java
deleted file mode 100644
index af78d2634..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationRepositoryData.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class PublicationRepositoryData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RegistryData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RegistryData.java
deleted file mode 100644
index 4719b8e64..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RegistryData.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-public class RegistryData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteData.java
deleted file mode 100644
index ce6a215d4..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteData.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class ResearcherAutoCompleteData extends BaseFieldData {
-	public final static String _multiAutoComplete = "multiAutoComplete";
-	private Boolean multiAutoComplete;
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherData.java
deleted file mode 100644
index 06868dc47..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherData.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-public class ResearcherData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RichTextAreaData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RichTextAreaData.java
deleted file mode 100644
index 3f982196f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RichTextAreaData.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-
-public class RichTextAreaData extends BaseFieldData {
-    
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ServiceData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ServiceData.java
deleted file mode 100644
index f981038ad..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ServiceData.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-public class ServiceData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TagData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TagData.java
deleted file mode 100644
index 9a4a71800..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TagData.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-public class TagData extends BaseFieldData {
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TaxonomyData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TaxonomyData.java
deleted file mode 100644
index 35ad571c5..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TaxonomyData.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-
-public class TaxonomyData extends BaseFieldData {
-    public final static String _multiAutoComplete = "multiAutoComplete";
-    private Boolean multiAutoComplete;
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TextAreaData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TextAreaData.java
deleted file mode 100644
index 37e9931fe..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TextAreaData.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class TextAreaData extends BaseFieldData {
-    
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ValidationData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ValidationData.java
deleted file mode 100644
index 6df91ae22..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ValidationData.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-public class ValidationData extends BaseFieldData {
-  
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java
index 505a833b5..fc5ea1712 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java
@@ -8,6 +8,7 @@ import eu.eudat.commons.validation.specification.Specification;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.errorcode.ErrorThesaurusProperties;
 import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*;
+import eu.eudat.service.fielddatahelper.FieldDataHelperServiceProvider;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Scope;
@@ -118,11 +119,13 @@ public class FieldPersist {
         private final MessageSource messageSource;
 
         private final ValidatorFactory validatorFactory;
-
-        protected FieldPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) {
+        private final FieldDataHelperServiceProvider fieldDataHelperServiceProvider;
+        
+        protected FieldPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory, FieldDataHelperServiceProvider fieldDataHelperServiceProvider) {
             super(conventionService, errors);
             this.messageSource = messageSource;
             this.validatorFactory = validatorFactory;
+	        this.fieldDataHelperServiceProvider = fieldDataHelperServiceProvider;
         }
 
         @Override
@@ -149,145 +152,10 @@ public class FieldPersist {
                             .over(item.getVisibilityRules())
                             .using(() -> this.validatorFactory.validator(RulePersist.RulePersistValidator.class)),
                     this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.AUTO_COMPLETE)
+                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() != null)
                             .on(FieldPersist._data)
                             .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(AutoCompleteDataPersist.AutoCompleteDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.BOOLEAN_DECISION)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(BooleanDecisionDataPersist.BooleanDecisionPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.INTERNAL_DMP_ENTRIES_DATASETS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(DatasetAutoCompleteDataPersist.DatasetAutoCompleteDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.INTERNAL_DMP_ENTRIES_DMPS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(DmpAutoCompleteDataPersist.DmpAutoCompleteDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.CHECK_BOX)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(CheckBoxDataPersist.CheckBoxDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.DATE_PICKER)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(DatePickerDataPersist.DatePickerDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.EXTERNAL_DATASETS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(ExternalDatasetDataPersist.ExternalDatasetDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.FREE_TEXT)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(FreeTextDataPersist.FreeTextDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.LICENSES)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(LicenseDataPersist.LicenseDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.ORGANIZATIONS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(OrganizationDataPersist.OrganizationDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.PUBLICATIONS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(PublicationDataPersist.PublicationDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.RADIO_BOX)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(RadioBoxDataPersist.RadioBoxDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.REGISTRIES)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(RegistryDataPersist.RegistryDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.INTERNAL_DMP_ENTRIES_RESEARCHERS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(ResearcherAutoCompleteDataPersist.ResearcherAutoCompleteDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.RESEARCHERS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(ResearcherDataPersist.ResearcherDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.RICH_TEXT_AREA)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(RichTextAreaDataPersist.RichTextAreaDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.SERVICES)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(ServiceDataPersist.ServiceDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.TAGS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(TagDataPersist.TagDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.TAXONOMIES)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(TaxonomyDataPersist.TaxonomyDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.TEXT_AREA)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(TextAreaDataPersist.TextAreaDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.UPLOAD)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(UploadDataPersist.UploadDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.VALIDATION)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(ValidationDataPersist.ValidationDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.DATASET_IDENTIFIER)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(DatasetIdentifierDataPersist.DatasetIdentifierDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.CURRENCY)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(CurrencyDataPersist.CurrencyDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.WORD_LIST)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(WordListDataPersist.WordListDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.DATA_REPOSITORIES)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(DataRepositoryDataPersist.DataRepositoryDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.JOURNAL_REPOSITORIES)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(JournalRepositoryDataPersist.JournalRepositoryDataPersistValidator.class)),
-                    this.refSpec()
-                            .iff(() -> !this.isNull(item.getData()) && item.getData().getFieldType() == FieldType.PUBLICATIONS)
-                            .on(FieldPersist._data)
-                            .over(item.getData())
-                            .using(() -> this.validatorFactory.validator(PublicationRepositoryDataPersist.PublicationRepositoryDataPersistValidator.class))
+                            .using(() -> this.fieldDataHelperServiceProvider.get(item.getData().getFieldType()).getPersistModelValidator())
             );
         }
     }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java
index 6fe490360..07fff1d0d 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java
@@ -20,33 +20,33 @@ import java.util.List;
         visible = true)
 @JsonSubTypes({
         @JsonSubTypes.Type(value = AutoCompleteDataPersist.class, name = FieldType.Names.Autocomplete),
-        @JsonSubTypes.Type(value = BooleanDecisionDataPersist.class, name = FieldType.Names.BooleanDecision),
-        @JsonSubTypes.Type(value = DatasetAutoCompleteDataPersist.class, name = FieldType.Names.InternalDmpDatasets),
-        @JsonSubTypes.Type(value = DmpAutoCompleteDataPersist.class, name = FieldType.Names.InternalDmpDmps),
-        @JsonSubTypes.Type(value = CheckBoxDataPersist.class, name = FieldType.Names.CheckBox),
-        @JsonSubTypes.Type(value = DatePickerDataPersist.class, name = FieldType.Names.DatePicker),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.BooleanDecision),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.InternalDmpDatasets),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.InternalDmpDmps),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.CheckBox),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.DatePicker),
         @JsonSubTypes.Type(value = ExternalDatasetDataPersist.class, name = FieldType.Names.ExternalDatasets),
-        @JsonSubTypes.Type(value = FreeTextDataPersist.class, name = FieldType.Names.FreeText),
-        @JsonSubTypes.Type(value = LicenseDataPersist.class, name = FieldType.Names.Licenses),
-        @JsonSubTypes.Type(value = OrganizationDataPersist.class, name = FieldType.Names.Organizations),
-        @JsonSubTypes.Type(value = PublicationDataPersist.class, name = FieldType.Names.Publications),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.FreeText),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Licenses),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Organizations),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Publications),
         @JsonSubTypes.Type(value = RadioBoxDataPersist.class, name = FieldType.Names.RadioBox),
-        @JsonSubTypes.Type(value = RegistryDataPersist.class, name = FieldType.Names.Registries),
-        @JsonSubTypes.Type(value = ResearcherAutoCompleteDataPersist.class, name = FieldType.Names.InternalDmpResearchers),
-        @JsonSubTypes.Type(value = ResearcherDataPersist.class, name = FieldType.Names.Researchers),
-        @JsonSubTypes.Type(value = RichTextAreaDataPersist.class, name = FieldType.Names.RichTextarea),
-        @JsonSubTypes.Type(value = ServiceDataPersist.class, name = FieldType.Names.Services),
-        @JsonSubTypes.Type(value = TagDataPersist.class, name = FieldType.Names.Tags),
-        @JsonSubTypes.Type(value = TaxonomyDataPersist.class, name = FieldType.Names.Taxonomies),
-        @JsonSubTypes.Type(value = TextAreaDataPersist.class, name = FieldType.Names.TextArea),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Registries),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.InternalDmpResearchers),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Researchers),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.RichTextarea),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Services),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.Tags),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Taxonomies),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.TextArea),
         @JsonSubTypes.Type(value = UploadDataPersist.class, name = FieldType.Names.Upload),
-        @JsonSubTypes.Type(value = ValidationDataPersist.class, name = FieldType.Names.Validation),
-        @JsonSubTypes.Type(value = DatasetIdentifierDataPersist.class, name = FieldType.Names.DatasetIdentifier),
-        @JsonSubTypes.Type(value = CurrencyDataPersist.class, name = FieldType.Names.Currency),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.Validation),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.DatasetIdentifier),
+        @JsonSubTypes.Type(value = LabelDataPersist.class, name = FieldType.Names.Currency),
         @JsonSubTypes.Type(value = WordListDataPersist.class, name = FieldType.Names.Wordlist),
-        @JsonSubTypes.Type(value = DataRepositoryDataPersist.class, name = FieldType.Names.DataRepositories),
-        @JsonSubTypes.Type(value = JournalRepositoryDataPersist.class, name = FieldType.Names.JournalRepositories),
-        @JsonSubTypes.Type(value = PublicationRepositoryDataPersist.class, name = FieldType.Names.Publications),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.DataRepositories),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.JournalRepositories),
+        @JsonSubTypes.Type(value = LabelAndMultiplicityDataPersist.class, name = FieldType.Names.Publications),
 })
 public abstract class BaseFieldDataPersist {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BooleanDecisionDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BooleanDecisionDataPersist.java
deleted file mode 100644
index 13f8d515d..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BooleanDecisionDataPersist.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class BooleanDecisionDataPersist extends BaseFieldDataPersist {
-
-    @Component(BooleanDecisionPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class BooleanDecisionPersistValidator extends BaseFieldDataPersistValidator<BooleanDecisionDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.BooleanDecisionPersistValidator";
-
-        private final ValidatorFactory validatorFactory;
-
-        protected BooleanDecisionPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) {
-            super(conventionService, errors, messageSource);
-            this.validatorFactory = validatorFactory;
-        }
-
-        @Override
-        protected Class<BooleanDecisionDataPersist> modelClass() {
-            return BooleanDecisionDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(BooleanDecisionDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CurrencyDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CurrencyDataPersist.java
deleted file mode 100644
index 99ca7db47..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CurrencyDataPersist.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class CurrencyDataPersist extends BaseFieldDataPersist {
-
-    @Component(CurrencyDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class CurrencyDataPersistValidator extends BaseFieldDataPersistValidator<CurrencyDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.CurrencyDataPersistValidator";
-
-        protected CurrencyDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<CurrencyDataPersist> modelClass() {
-            return CurrencyDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(CurrencyDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DataRepositoryDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DataRepositoryDataPersist.java
deleted file mode 100644
index 42539a96d..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DataRepositoryDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class DataRepositoryDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(DataRepositoryDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class DataRepositoryDataPersistValidator extends BaseFieldDataPersistValidator<DataRepositoryDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.DataRepositoryDataPersistValidator";
-
-        protected DataRepositoryDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<DataRepositoryDataPersist> modelClass() {
-            return DataRepositoryDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(DataRepositoryDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(DataRepositoryDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{DataRepositoryDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataPersist.java
deleted file mode 100644
index e47c47812..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class DatasetAutoCompleteDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(DatasetAutoCompleteDataPersist.DatasetAutoCompleteDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class DatasetAutoCompleteDataPersistValidator extends BaseFieldDataPersistValidator<DatasetAutoCompleteDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.DatasetAutoCompleteDataPersistValidator";
-
-        protected DatasetAutoCompleteDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<DatasetAutoCompleteDataPersist> modelClass() {
-            return DatasetAutoCompleteDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(DatasetAutoCompleteDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(DatasetAutoCompleteDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{DatasetAutoCompleteDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataPersist.java
deleted file mode 100644
index 080b909af..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataPersist.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class DatasetIdentifierDataPersist extends BaseFieldDataPersist {
-
-    @Component(DatasetIdentifierDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class DatasetIdentifierDataPersistValidator extends BaseFieldDataPersistValidator<DatasetIdentifierDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.DatasetIdentifierDataPersistValidator";
-
-        protected DatasetIdentifierDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<DatasetIdentifierDataPersist> modelClass() {
-            return DatasetIdentifierDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(DatasetIdentifierDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatePickerDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatePickerDataPersist.java
deleted file mode 100644
index 4e38e4d54..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatePickerDataPersist.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.ValidatorFactory;
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class DatePickerDataPersist extends BaseFieldDataPersist {
-
-    @Component(DatePickerDataPersist.DatePickerDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class DatePickerDataPersistValidator extends BaseFieldDataPersistValidator<DatePickerDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.DatePickerDataPersistValidator";
-
-        private final ValidatorFactory validatorFactory;
-
-        protected DatePickerDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) {
-            super(conventionService, errors, messageSource);
-            this.validatorFactory = validatorFactory;
-        }
-
-        @Override
-        protected Class<DatePickerDataPersist> modelClass() {
-            return DatePickerDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(DatePickerDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataPersist.java
deleted file mode 100644
index ca19f633a..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class DmpAutoCompleteDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(DmpAutoCompleteDataPersist.DmpAutoCompleteDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class DmpAutoCompleteDataPersistValidator extends BaseFieldDataPersistValidator<DmpAutoCompleteDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.DmpAutoCompleteDataPersistValidator";
-
-        protected DmpAutoCompleteDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<DmpAutoCompleteDataPersist> modelClass() {
-            return DmpAutoCompleteDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(DmpAutoCompleteDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(DmpAutoCompleteDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{DmpAutoCompleteDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/FreeTextDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/FreeTextDataPersist.java
deleted file mode 100644
index 31896b639..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/FreeTextDataPersist.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class FreeTextDataPersist extends BaseFieldDataPersist {
-
-    @Component(FreeTextDataPersist.FreeTextDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class FreeTextDataPersistValidator extends BaseFieldDataPersistValidator<FreeTextDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.FreeTextDataPersistValidator";
-
-        protected FreeTextDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<FreeTextDataPersist> modelClass() {
-            return FreeTextDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(FreeTextDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/JournalRepositoryDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/JournalRepositoryDataPersist.java
deleted file mode 100644
index ccd7d0d3f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/JournalRepositoryDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class JournalRepositoryDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(JournalRepositoryDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class JournalRepositoryDataPersistValidator extends BaseFieldDataPersistValidator<JournalRepositoryDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.JournalRepositoryDataPersistValidator";
-
-        protected JournalRepositoryDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<JournalRepositoryDataPersist> modelClass() {
-            return JournalRepositoryDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(JournalRepositoryDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(JournalRepositoryDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{JournalRepositoryDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataPersist.java
similarity index 58%
rename from dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationDataPersist.java
rename to dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataPersist.java
index 9ea264215..079084859 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationDataPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelAndMultiplicityDataPersist.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-public class PublicationDataPersist extends BaseFieldDataPersist {
+public class LabelAndMultiplicityDataPersist extends BaseFieldDataPersist {
 
     private Boolean multiAutoComplete;
 
@@ -25,28 +25,28 @@ public class PublicationDataPersist extends BaseFieldDataPersist {
         this.multiAutoComplete = multiAutoComplete;
     }
 
-    @Component(PublicationDataPersist.PublicationDataPersistValidator.ValidatorName)
+    @Component(LabelAndMultiplicityDataPersist.LabelAndMultiplicityDataPersistValidator.ValidatorName)
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class PublicationDataPersistValidator extends BaseFieldDataPersistValidator<PublicationDataPersist> {
+    public static class LabelAndMultiplicityDataPersistValidator extends BaseFieldDataPersistValidator<LabelAndMultiplicityDataPersist> {
 
-        public static final String ValidatorName = "DescriptionTemplate.PublicationDataPersistValidator";
+        public static final String ValidatorName = "DescriptionTemplate.LabelAndMultiplicityDataPersistValidator";
 
-        protected PublicationDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
+        protected LabelAndMultiplicityDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
             super(conventionService, errors, messageSource);
         }
 
         @Override
-        protected Class<PublicationDataPersist> modelClass() {
-            return PublicationDataPersist.class;
+        protected Class<LabelAndMultiplicityDataPersist> modelClass() {
+            return LabelAndMultiplicityDataPersist.class;
         }
 
         @Override
-        protected List<Specification> specifications(PublicationDataPersist item) {
+        protected List<Specification> specifications(LabelAndMultiplicityDataPersist item) {
             List<Specification> specifications = getBaseSpecifications(item);
             specifications.add(
                     this.spec()
                             .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(PublicationDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{PublicationDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
+                            .failOn(LabelAndMultiplicityDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{LabelAndMultiplicityDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
             );
             return specifications;
         }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CheckBoxDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelDataPersist.java
similarity index 52%
rename from dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CheckBoxDataPersist.java
rename to dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelDataPersist.java
index 7fe287582..7da07e9aa 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CheckBoxDataPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LabelDataPersist.java
@@ -11,27 +11,27 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 
-public class CheckBoxDataPersist extends BaseFieldDataPersist {
+public class LabelDataPersist extends BaseFieldDataPersist {
 
-    @Component(CheckBoxDataPersist.CheckBoxDataPersistValidator.ValidatorName)
+    @Component(LabelPersistValidator.ValidatorName)
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class CheckBoxDataPersistValidator extends BaseFieldDataPersistValidator<CheckBoxDataPersist> {
+    public static class LabelPersistValidator extends BaseFieldDataPersistValidator<LabelDataPersist> {
 
-        public static final String ValidatorName = "DescriptionTemplate.CheckBoxDataPersistValidator";
+        public static final String ValidatorName = "LabelPersistValidator";
 
-        protected CheckBoxDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
+
+        protected LabelPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource, ValidatorFactory validatorFactory) {
             super(conventionService, errors, messageSource);
         }
 
         @Override
-        protected Class<CheckBoxDataPersist> modelClass() {
-            return CheckBoxDataPersist.class;
+        protected Class<LabelDataPersist> modelClass() {
+            return LabelDataPersist.class;
         }
 
         @Override
-        protected List<Specification> specifications(CheckBoxDataPersist item) {
+        protected List<Specification> specifications(LabelDataPersist item) {
             return getBaseSpecifications(item);
         }
     }
-
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LicenseDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LicenseDataPersist.java
deleted file mode 100644
index 954d45e15..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LicenseDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class LicenseDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(LicenseDataPersist.LicenseDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class LicenseDataPersistValidator extends BaseFieldDataPersistValidator<LicenseDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.LicenseDataPersistValidator";
-
-        protected LicenseDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<LicenseDataPersist> modelClass() {
-            return LicenseDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(LicenseDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(LicenseDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{LicenseDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/OrganizationDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/OrganizationDataPersist.java
deleted file mode 100644
index 6055bff29..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/OrganizationDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class OrganizationDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(OrganizationDataPersist.OrganizationDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class OrganizationDataPersistValidator extends BaseFieldDataPersistValidator<OrganizationDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.OrganizationDataPersistValidator";
-
-        protected OrganizationDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<OrganizationDataPersist> modelClass() {
-            return OrganizationDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(OrganizationDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(OrganizationDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{OrganizationDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataPersist.java
deleted file mode 100644
index 60321f8e0..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataPersist.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class PublicationRepositoryDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(PublicationRepositoryDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class PublicationRepositoryDataPersistValidator extends BaseFieldDataPersistValidator<PublicationRepositoryDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.PublicationRepositoryDataPersistValidator";
-
-        protected PublicationRepositoryDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<PublicationRepositoryDataPersist> modelClass() {
-            return PublicationRepositoryDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(PublicationRepositoryDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(PublicationRepositoryDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{PublicationRepositoryDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RegistryDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RegistryDataPersist.java
deleted file mode 100644
index d400f29f9..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RegistryDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class RegistryDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(RegistryDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class RegistryDataPersistValidator extends BaseFieldDataPersistValidator<RegistryDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.RegistryDataPersistValidator";
-
-        protected RegistryDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<RegistryDataPersist> modelClass() {
-            return RegistryDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(RegistryDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(RegistryDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{RegistryDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataPersist.java
deleted file mode 100644
index d53f286a6..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataPersist.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class ResearcherAutoCompleteDataPersist extends BaseFieldDataPersist {
-
-	private Boolean multiAutoComplete = null;
-
-	public static final String _multiAutoComplete = "multiAutoComplete";
-
-	public Boolean getMultiAutoComplete() {
-		return multiAutoComplete;
-	}
-	public void setMultiAutoComplete(Boolean multiAutoComplete) {
-		this.multiAutoComplete = multiAutoComplete;
-	}
-
-	@Component(ResearcherAutoCompleteDataPersistValidator.ValidatorName)
-	@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-	public static class ResearcherAutoCompleteDataPersistValidator extends BaseFieldDataPersistValidator<ResearcherAutoCompleteDataPersist> {
-
-		public static final String ValidatorName = "DescriptionTemplate.ResearcherAutoCompleteDataPersistValidator";
-
-		protected ResearcherAutoCompleteDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-			super(conventionService, errors, messageSource);
-		}
-
-		@Override
-		protected Class<ResearcherAutoCompleteDataPersist> modelClass() {
-			return ResearcherAutoCompleteDataPersist.class;
-		}
-
-		@Override
-		protected List<Specification> specifications(ResearcherAutoCompleteDataPersist item) {
-			List<Specification> specifications = getBaseSpecifications(item);
-			specifications.add(
-					this.spec()
-							.must(() -> !this.isNull(item.getMultiAutoComplete()))
-							.failOn(ResearcherAutoCompleteDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{ResearcherAutoCompleteDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-			);
-			return specifications;
-		}
-	}
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherDataPersist.java
deleted file mode 100644
index 016489dd3..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class ResearcherDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(ResearcherDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class ResearcherDataPersistValidator extends BaseFieldDataPersistValidator<ResearcherDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.ResearcherDataPersistValidator";
-
-        protected ResearcherDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<ResearcherDataPersist> modelClass() {
-            return ResearcherDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(ResearcherDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(ResearcherDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{ResearcherDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RichTextAreaDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RichTextAreaDataPersist.java
deleted file mode 100644
index 39395520f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RichTextAreaDataPersist.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class RichTextAreaDataPersist extends BaseFieldDataPersist {
-
-    @Component(RichTextAreaDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class RichTextAreaDataPersistValidator extends BaseFieldDataPersistValidator<RichTextAreaDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.RichTextAreaDataPersistValidator";
-
-        protected RichTextAreaDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<RichTextAreaDataPersist> modelClass() {
-            return RichTextAreaDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(RichTextAreaDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ServiceDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ServiceDataPersist.java
deleted file mode 100644
index 7024f6e0f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ServiceDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class ServiceDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(ServiceDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class ServiceDataPersistValidator extends BaseFieldDataPersistValidator<ServiceDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.ServiceDataPersistValidator";
-
-        protected ServiceDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<ServiceDataPersist> modelClass() {
-            return ServiceDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(ServiceDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(ServiceDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{ServiceDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TagDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TagDataPersist.java
deleted file mode 100644
index 7ea9701f7..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TagDataPersist.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class TagDataPersist extends BaseFieldDataPersist {
-
-    @Component(TagDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class TagDataPersistValidator extends BaseFieldDataPersistValidator<TagDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.TagDataPersistValidator";
-
-        protected TagDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<TagDataPersist> modelClass() {
-            return TagDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(TagDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TaxonomyDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TaxonomyDataPersist.java
deleted file mode 100644
index bf1bc0416..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TaxonomyDataPersist.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class TaxonomyDataPersist extends BaseFieldDataPersist {
-
-    private Boolean multiAutoComplete = null;
-
-    public static final String _multiAutoComplete = "multiAutoComplete";
-
-    public Boolean getMultiAutoComplete() {
-        return multiAutoComplete;
-    }
-
-    public void setMultiAutoComplete(Boolean multiAutoComplete) {
-        this.multiAutoComplete = multiAutoComplete;
-    }
-
-    @Component(TaxonomyDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class TaxonomyDataPersistValidator extends BaseFieldDataPersistValidator<TaxonomyDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.TaxonomyDataPersistValidator";
-
-        protected TaxonomyDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<TaxonomyDataPersist> modelClass() {
-            return TaxonomyDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(TaxonomyDataPersist item) {
-            List<Specification> specifications = getBaseSpecifications(item);
-            specifications.add(
-                    this.spec()
-                            .must(() -> !this.isNull(item.getMultiAutoComplete()))
-                            .failOn(TaxonomyDataPersist._multiAutoComplete).failWith(messageSource.getMessage("Validation_Required", new Object[]{TaxonomyDataPersist._multiAutoComplete}, LocaleContextHolder.getLocale()))
-            );
-            return specifications;
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TextAreaDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TextAreaDataPersist.java
deleted file mode 100644
index 6fe58f41f..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TextAreaDataPersist.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class TextAreaDataPersist extends BaseFieldDataPersist {
-
-    @Component(TextAreaDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class TextAreaDataPersistValidator extends BaseFieldDataPersistValidator<TextAreaDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.TextAreaDataPersistValidator";
-
-        protected TextAreaDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<TextAreaDataPersist> modelClass() {
-            return TextAreaDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(TextAreaDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-    
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ValidationDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ValidationDataPersist.java
deleted file mode 100644
index c9a9e0842..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ValidationDataPersist.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.validation.specification.Specification;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.errorcode.ErrorThesaurusProperties;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-public class ValidationDataPersist extends BaseFieldDataPersist {
-
-    @Component(ValidationDataPersistValidator.ValidatorName)
-    @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    public static class ValidationDataPersistValidator extends BaseFieldDataPersistValidator<ValidationDataPersist> {
-
-        public static final String ValidatorName = "DescriptionTemplate.ValidationDataPersistValidator";
-
-        protected ValidationDataPersistValidator(ConventionService conventionService, ErrorThesaurusProperties errors, MessageSource messageSource) {
-            super(conventionService, errors, messageSource);
-        }
-
-        @Override
-        protected Class<ValidationDataPersist> modelClass() {
-            return ValidationDataPersist.class;
-        }
-
-        @Override
-        protected List<Specification> specifications(ValidationDataPersist item) {
-            return getBaseSpecifications(item);
-        }
-    }
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java
index db9386b18..cde2f6bc4 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java
@@ -7,6 +7,8 @@ import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.ComboBoxDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.*;
+import eu.eudat.commons.validation.Validator;
+import eu.eudat.commons.validation.ValidatorFactory;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.AutoCompleteDataBuilder;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
@@ -31,18 +33,15 @@ import java.util.List;
 public class AutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<AutoCompleteData, AutoCompleteDataPersist, AutoCompleteDataEntity, AutoCompleteDataImportExport> {
 	private final ConventionService conventionService;
 	private final BuilderFactory builderFactory;
+	private final ValidatorFactory validatorFactory;
 
-	public AutoCompleteFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory) {
+	public AutoCompleteFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory, ValidatorFactory validatorFactory) {
 		this.conventionService = conventionService;
 		this.builderFactory = builderFactory;
+		this.validatorFactory = validatorFactory;
 	}
 
 
-	@Override
-	public FieldType getFormType() {
-		return FieldType.AUTO_COMPLETE;
-	}
-
 	@Override
 	public AutoCompleteDataEntity newDataInstanceInternal() {
 		return new AutoCompleteDataEntity();
@@ -81,6 +80,11 @@ public class AutoCompleteFieldDataHelperService extends BaseFieldDataHelperServi
 		return AutoCompleteDataImportExport.class;
 	}
 
+	@Override
+	public Validator getPersistModelValidator() {
+		return this.validatorFactory.validator(AutoCompleteDataPersist.AutoCompleteDataPersistValidator.class);
+	}
+
 	@Override
 	public List<AutoCompleteData> buildInternal(FieldSet fieldSet, List<AutoCompleteDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
 		return this.builderFactory.builder(AutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BaseFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BaseFieldDataHelperService.java
index 22102cde3..9cbbcf60f 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BaseFieldDataHelperService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BaseFieldDataHelperService.java
@@ -1,21 +1,20 @@
 package eu.eudat.service.fielddatahelper;
 
 import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BooleanDecisionData;
 import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BooleanDecisionDataPersist;
 import gr.cite.tools.fieldset.FieldSet;
-import org.w3c.dom.Element;
 
 import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public abstract class BaseFieldDataHelperService<M extends BaseFieldData, PM extends BaseFieldDataPersist, D extends BaseFieldDataEntity<?>, IE extends BaseFieldDataImportExport> implements FieldDataHelperService {
+	protected FieldType fieldType;
+	
 	protected abstract D newDataInstanceInternal();
 	protected abstract M newModelInstanceInternal();
 	protected abstract PM newPersistModelInstanceInternal();
@@ -26,6 +25,16 @@ public abstract class BaseFieldDataHelperService<M extends BaseFieldData, PM ext
 	protected abstract PM importExportMapDataToPersistInternal(IE data, PM persist);
 	protected abstract IE dataToImportExportXmlInternal(D data, IE xml);
 	protected abstract boolean isMultiValueInternal(D data);
+
+	@Override
+	public FieldType getFieldType() {
+		return fieldType;
+	}
+
+	public void setFieldType(FieldType fieldType) {
+		this.fieldType = fieldType;
+	}
+
 	@Override
 	public BaseFieldDataEntity<?> newDataInstance() {
 		return this.newDataInstanceInternal();
@@ -49,7 +58,7 @@ public abstract class BaseFieldDataHelperService<M extends BaseFieldData, PM ext
 	@Override
 	public BaseFieldDataPersist importExportMapDataToPersist(BaseFieldDataImportExport data) {
 		PM model = this.newPersistModelInstanceInternal();
-		model.setFieldType(this.getFormType());
+		model.setFieldType(this.getFieldType());
 		model.setLabel(data.getLabel());
 		return this.importExportMapDataToPersistInternal((IE)data, model);
 	}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BooleanDecisionFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BooleanDecisionFieldDataHelperService.java
deleted file mode 100644
index 873c2909c..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BooleanDecisionFieldDataHelperService.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.BooleanDecisionDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.BooleanDecisionDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BooleanDecisionData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-import org.w3c.dom.Element;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class BooleanDecisionFieldDataHelperService extends BaseFieldDataHelperService<BooleanDecisionData, BooleanDecisionDataPersist, BooleanDecisionDataEntity, BooleanDecisionDataImportExport> {
-	private final BuilderFactory builderFactory;
-
-	public BooleanDecisionFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.BOOLEAN_DECISION;
-	}
-
-	@Override
-	public BooleanDecisionDataEntity newDataInstanceInternal() {
-		return new BooleanDecisionDataEntity();
-	}
-
-	@Override
-	public BooleanDecisionData newModelInstanceInternal() {
-		return new BooleanDecisionData();
-	}
-
-	@Override
-	public BooleanDecisionDataPersist newPersistModelInstanceInternal() {
-		return new BooleanDecisionDataPersist();
-	}
-
-	@Override
-	protected BooleanDecisionDataImportExport newImportExportInstanceInternal() {
-		return new BooleanDecisionDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return BooleanDecisionDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return BooleanDecisionData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return BooleanDecisionDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return BooleanDecisionDataImportExport.class;
-	}
-
-	@Override
-	public List<BooleanDecisionData> buildInternal(FieldSet fieldSet, List<BooleanDecisionDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(BooleanDecisionDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected BooleanDecisionDataEntity applyPersistInternal(BooleanDecisionDataPersist persist, BooleanDecisionDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected BooleanDecisionDataPersist importExportMapDataToPersistInternal(BooleanDecisionDataImportExport data, BooleanDecisionDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected BooleanDecisionDataImportExport dataToImportExportXmlInternal(BooleanDecisionDataEntity data, BooleanDecisionDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(BooleanDecisionDataEntity data) {
-		return false;
-	}
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CheckBoxFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CheckBoxFieldDataHelperService.java
deleted file mode 100644
index 1feef1698..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CheckBoxFieldDataHelperService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.CheckBoxDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.CheckBoxDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.CheckBoxDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.CheckBoxData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BooleanDecisionDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.CheckBoxDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class CheckBoxFieldDataHelperService extends BaseFieldDataHelperService<CheckBoxData, CheckBoxDataPersist, CheckBoxDataEntity, CheckBoxDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public CheckBoxFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.CHECK_BOX;
-	}
-
-	@Override
-	public CheckBoxDataEntity newDataInstanceInternal() {
-		return new CheckBoxDataEntity();
-	}
-
-	@Override
-	public CheckBoxData newModelInstanceInternal() {
-		return new CheckBoxData();
-	}
-
-	@Override
-	public CheckBoxDataPersist newPersistModelInstanceInternal() {
-		return new CheckBoxDataPersist();
-	}
-
-	@Override
-	protected CheckBoxDataImportExport newImportExportInstanceInternal() {
-		return new CheckBoxDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return CheckBoxDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return CheckBoxData.class;
-	}
-
-	@Override
-	public Class<?> getPersistModelClass() {
-		return CheckBoxDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return CheckBoxDataImportExport.class;
-	}
-
-	@Override
-	public List<CheckBoxData> buildInternal(FieldSet fieldSet, List<CheckBoxDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(CheckBoxDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected CheckBoxDataEntity applyPersistInternal(CheckBoxDataPersist persist, CheckBoxDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected CheckBoxDataPersist importExportMapDataToPersistInternal(CheckBoxDataImportExport data, CheckBoxDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected CheckBoxDataImportExport dataToImportExportXmlInternal(CheckBoxDataEntity data, CheckBoxDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(CheckBoxDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CurrencyFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CurrencyFieldDataHelperService.java
deleted file mode 100644
index a1d77c014..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CurrencyFieldDataHelperService.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.CurrencyDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.CurrencyDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.CurrencyDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.CurrencyData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.CurrencyDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class CurrencyFieldDataHelperService extends BaseFieldDataHelperService<CurrencyData, CurrencyDataPersist, CurrencyDataEntity, CurrencyDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public CurrencyFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.CURRENCY;
-	}
-
-	@Override
-	public CurrencyDataEntity newDataInstanceInternal() {
-		return new CurrencyDataEntity();
-	}
-
-	@Override
-	public CurrencyData newModelInstanceInternal() {
-		return new CurrencyData();
-	}
-
-	@Override
-	public CurrencyDataPersist newPersistModelInstanceInternal() {
-		return new CurrencyDataPersist();
-	}
-
-	@Override
-	protected CurrencyDataImportExport newImportExportInstanceInternal() {
-		return new CurrencyDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return CurrencyDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return CurrencyData.class;
-	}
-
-	@Override
-	public Class<?> getPersistModelClass() {
-		return CurrencyDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return CurrencyDataImportExport.class;
-	}
-
-	@Override
-	public List<CurrencyData> buildInternal(FieldSet fieldSet, List<CurrencyDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(CurrencyDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-	@Override
-	protected CurrencyDataEntity applyPersistInternal(CurrencyDataPersist persist, CurrencyDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected CurrencyDataPersist importExportMapDataToPersistInternal(CurrencyDataImportExport data, CurrencyDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected CurrencyDataImportExport dataToImportExportXmlInternal(CurrencyDataEntity data, CurrencyDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(CurrencyDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DataRepositoryFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DataRepositoryFieldDataHelperService.java
deleted file mode 100644
index 3213096f7..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DataRepositoryFieldDataHelperService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.DataRepositoryDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DataRepositoryDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.*;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class DataRepositoryFieldDataHelperService extends BaseFieldDataHelperService<DataRepositoryData, DataRepositoryDataPersist, DataRepositoryDataEntity, DataRepositoryDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public DataRepositoryFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.DATA_REPOSITORIES;
-	}
-
-	@Override
-	public DataRepositoryDataEntity newDataInstanceInternal() {
-		return new DataRepositoryDataEntity();
-	}
-
-	@Override
-	public DataRepositoryData newModelInstanceInternal() {
-		return new DataRepositoryData();
-	}
-
-	@Override
-	public DataRepositoryDataPersist newPersistModelInstanceInternal() {
-		return new DataRepositoryDataPersist();
-	}
-
-	@Override
-	protected DataRepositoryDataImportExport newImportExportInstanceInternal() {
-		return new DataRepositoryDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return DataRepositoryDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return DataRepositoryData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return DataRepositoryDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return DataRepositoryDataImportExport.class;
-	}
-
-	@Override
-	public List<DataRepositoryData> buildInternal(FieldSet fieldSet, List<DataRepositoryDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(DataRepositoryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}	
-	
-	@Override
-	protected DataRepositoryDataEntity applyPersistInternal(DataRepositoryDataPersist persist, DataRepositoryDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected DataRepositoryDataPersist importExportMapDataToPersistInternal(DataRepositoryDataImportExport data, DataRepositoryDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected DataRepositoryDataImportExport dataToImportExportXmlInternal(DataRepositoryDataEntity data, DataRepositoryDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(DataRepositoryDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetAutoCompleteFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetAutoCompleteFieldDataHelperService.java
deleted file mode 100644
index 1c22136a4..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetAutoCompleteFieldDataHelperService.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DatasetAutoCompleteDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.DatasetAutoCompleteDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DatasetAutoCompleteDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetAutoCompleteData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DatasetAutoCompleteDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class DatasetAutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<DatasetAutoCompleteData, DatasetAutoCompleteDataPersist, DatasetAutoCompleteDataEntity, DatasetAutoCompleteDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public DatasetAutoCompleteFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.INTERNAL_DMP_ENTRIES_DATASETS;
-	}
-
-	@Override
-	public DatasetAutoCompleteDataEntity newDataInstanceInternal() {
-		return new DatasetAutoCompleteDataEntity();
-	}
-
-	@Override
-	public DatasetAutoCompleteData newModelInstanceInternal() {
-		return new DatasetAutoCompleteData();
-	}
-
-	@Override
-	public DatasetAutoCompleteDataPersist newPersistModelInstanceInternal() {
-		return new DatasetAutoCompleteDataPersist();
-	}
-
-	@Override
-	protected DatasetAutoCompleteDataImportExport newImportExportInstanceInternal() {
-		return new DatasetAutoCompleteDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return DatasetAutoCompleteDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return DatasetAutoCompleteData.class;
-	}
-
-	@Override
-	public Class<?> getPersistModelClass() {
-		return DatasetAutoCompleteDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return DatasetAutoCompleteDataImportExport.class;
-	}
-
-	@Override
-	public List<DatasetAutoCompleteData> buildInternal(FieldSet fieldSet, List<DatasetAutoCompleteDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(DatasetAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected DatasetAutoCompleteDataEntity applyPersistInternal(DatasetAutoCompleteDataPersist persist, DatasetAutoCompleteDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected DatasetAutoCompleteDataPersist importExportMapDataToPersistInternal(DatasetAutoCompleteDataImportExport data, DatasetAutoCompleteDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected DatasetAutoCompleteDataImportExport dataToImportExportXmlInternal(DatasetAutoCompleteDataEntity data, DatasetAutoCompleteDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(DatasetAutoCompleteDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetIdentifierFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetIdentifierFieldDataHelperService.java
deleted file mode 100644
index 4f4ba91fc..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetIdentifierFieldDataHelperService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DatasetIdentifierDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.DatasetIdentifierDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DatasetIdentifierDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetIdentifierData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BooleanDecisionDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DatasetIdentifierDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class DatasetIdentifierFieldDataHelperService extends BaseFieldDataHelperService<DatasetIdentifierData, DatasetIdentifierDataPersist, DatasetIdentifierDataEntity, DatasetIdentifierDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public DatasetIdentifierFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.DATASET_IDENTIFIER;
-	}
-
-	@Override
-	public DatasetIdentifierDataEntity newDataInstanceInternal() {
-		return new DatasetIdentifierDataEntity();
-	}
-
-	@Override
-	public DatasetIdentifierData newModelInstanceInternal() {
-		return new DatasetIdentifierData();
-	}
-
-	@Override
-	public DatasetIdentifierDataPersist newPersistModelInstanceInternal() {
-		return new DatasetIdentifierDataPersist();
-	}
-
-	@Override
-	protected DatasetIdentifierDataImportExport newImportExportInstanceInternal() {
-		return new DatasetIdentifierDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return DatasetIdentifierDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return DatasetIdentifierData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return DatasetIdentifierDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return DatasetIdentifierDataImportExport.class;
-	}
-
-	@Override
-	public List<DatasetIdentifierData> buildInternal(FieldSet fieldSet, List<DatasetIdentifierDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(DatasetIdentifierDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected DatasetIdentifierDataEntity applyPersistInternal(DatasetIdentifierDataPersist persist, DatasetIdentifierDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected DatasetIdentifierDataPersist importExportMapDataToPersistInternal(DatasetIdentifierDataImportExport data, DatasetIdentifierDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected DatasetIdentifierDataImportExport dataToImportExportXmlInternal(DatasetIdentifierDataEntity data, DatasetIdentifierDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(DatasetIdentifierDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatePickerFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatePickerFieldDataHelperService.java
deleted file mode 100644
index 004a850db..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatePickerFieldDataHelperService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DatePickerDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.DatePickerDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DatePickerDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatePickerData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BooleanDecisionDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DatePickerDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class DatePickerFieldDataHelperService extends BaseFieldDataHelperService<DatePickerData, DatePickerDataPersist, DatePickerDataEntity, DatePickerDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public DatePickerFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.DATE_PICKER;
-	}
-
-	@Override
-	public DatePickerDataEntity newDataInstanceInternal() {
-		return new DatePickerDataEntity();
-	}
-
-	@Override
-	public DatePickerData newModelInstanceInternal() {
-		return new DatePickerData();
-	}
-	@Override
-	public DatePickerDataPersist newPersistModelInstanceInternal() {
-		return new DatePickerDataPersist();
-	}
-
-	@Override
-	protected DatePickerDataImportExport newImportExportInstanceInternal() {
-		return new DatePickerDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return DatePickerDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return DatePickerData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return DatePickerDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return DatePickerDataImportExport.class;
-	}
-
-	@Override
-	public List<DatePickerData> buildInternal(FieldSet fieldSet, List<DatePickerDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(DatePickerDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected DatePickerDataEntity applyPersistInternal(DatePickerDataPersist persist, DatePickerDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected DatePickerDataPersist importExportMapDataToPersistInternal(DatePickerDataImportExport data, DatePickerDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected DatePickerDataImportExport dataToImportExportXmlInternal(DatePickerDataEntity data, DatePickerDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(DatePickerDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DmpAutoCompleteFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DmpAutoCompleteFieldDataHelperService.java
deleted file mode 100644
index 873a853ab..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DmpAutoCompleteFieldDataHelperService.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DmpAutoCompleteDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.DmpAutoCompleteDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DmpAutoCompleteDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DmpAutoCompleteData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DmpAutoCompleteDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class DmpAutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<DmpAutoCompleteData, DmpAutoCompleteDataPersist, DmpAutoCompleteDataEntity, DmpAutoCompleteDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public DmpAutoCompleteFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.INTERNAL_DMP_ENTRIES_DMPS;
-	}
-
-	@Override
-	public DmpAutoCompleteDataEntity newDataInstanceInternal() {
-		return new DmpAutoCompleteDataEntity();
-	}
-
-	@Override
-	public DmpAutoCompleteData newModelInstanceInternal() {
-		return new DmpAutoCompleteData();
-	}
-
-	@Override
-	public DmpAutoCompleteDataPersist newPersistModelInstanceInternal() {
-		return new DmpAutoCompleteDataPersist();
-	}
-
-	@Override
-	protected DmpAutoCompleteDataImportExport newImportExportInstanceInternal() {
-		return new DmpAutoCompleteDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return DmpAutoCompleteDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return DmpAutoCompleteData.class;
-	}
-
-	@Override
-	public Class<?> getPersistModelClass() {
-		return DmpAutoCompleteDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return DmpAutoCompleteDataImportExport.class;
-	}
-
-	@Override
-	public List<DmpAutoCompleteData> buildInternal(FieldSet fieldSet, List<DmpAutoCompleteDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(DmpAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected DmpAutoCompleteDataEntity applyPersistInternal(DmpAutoCompleteDataPersist persist, DmpAutoCompleteDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected DmpAutoCompleteDataPersist importExportMapDataToPersistInternal(DmpAutoCompleteDataImportExport data, DmpAutoCompleteDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected DmpAutoCompleteDataImportExport dataToImportExportXmlInternal(DmpAutoCompleteDataEntity data, DmpAutoCompleteDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(DmpAutoCompleteDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java
index 6d720ee19..c5c4272ad 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java
@@ -2,22 +2,16 @@ package eu.eudat.service.fielddatahelper;
 
 import eu.eudat.authorization.AuthorizationFlags;
 import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.ExternalDatasetDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ExternalDatasetDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
+import eu.eudat.commons.validation.Validator;
+import eu.eudat.commons.validation.ValidatorFactory;
 import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ExternalDatasetDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.ExternalDatasetData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
+import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.AutoCompleteDataPersist;
 import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ExternalDatasetDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import java.util.EnumSet;
@@ -27,15 +21,11 @@ import java.util.List;
 public class ExternalDatasetFieldDataHelperService extends BaseFieldDataHelperService<ExternalDatasetData, ExternalDatasetDataPersist, ExternalDatasetDataEntity, ExternalDatasetDataImportExport> {
 	
 	private final BuilderFactory builderFactory;
+	private final ValidatorFactory validatorFactory;
 
-	public ExternalDatasetFieldDataHelperService(BuilderFactory builderFactory) {
+	public ExternalDatasetFieldDataHelperService(BuilderFactory builderFactory, ValidatorFactory validatorFactory) {
 		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.EXTERNAL_DATASETS;
+		this.validatorFactory = validatorFactory;
 	}
 
 	@Override
@@ -76,6 +66,10 @@ public class ExternalDatasetFieldDataHelperService extends BaseFieldDataHelperSe
 		return ExternalDatasetDataImportExport.class;
 	}
 
+	@Override
+	public Validator getPersistModelValidator() {
+		return this.validatorFactory.validator(ExternalDatasetDataPersist.ExternalDatasetDataPersistValidator.class);
+	}
 	@Override
 	public List<ExternalDatasetData> buildInternal(FieldSet fieldSet, List<ExternalDatasetDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
 		return this.builderFactory.builder(ExternalDatasetDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java
index a14f0e5c2..724df766f 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java
@@ -4,6 +4,7 @@ import eu.eudat.authorization.AuthorizationFlags;
 import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport;
+import eu.eudat.commons.validation.Validator;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
 import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
 import gr.cite.tools.fieldset.FieldSet;
@@ -12,7 +13,7 @@ import java.util.EnumSet;
 import java.util.List;
 
 public interface FieldDataHelperService {
-	FieldType getFormType();
+	FieldType getFieldType();
 	BaseFieldDataEntity<?> newDataInstance();
 	BaseFieldData newModelInstance();
 	BaseFieldDataPersist newPersistModelInstance();
@@ -21,6 +22,7 @@ public interface FieldDataHelperService {
 	Class<?> getModelClass();
 	Class<?> getPersistModelClass();
 	Class<?> getImportExportClass();
+	Validator getPersistModelValidator();
 	List<BaseFieldData> build(gr.cite.tools.fieldset.FieldSet fieldSet, List<BaseFieldDataEntity<?>> data, EnumSet<AuthorizationFlags> authorizationFlags);
 	BaseFieldData buildOne(FieldSet fieldSet, BaseFieldDataEntity<?> data, EnumSet<AuthorizationFlags> authorizationFlags);
 	BaseFieldDataEntity<?> applyPersist(BaseFieldDataPersist persist);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java
index 8d7e9a3d6..d9f2c1c5d 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java
@@ -1,6 +1,7 @@
 package eu.eudat.service.fielddatahelper;
 
 import eu.eudat.commons.enums.FieldType;
+import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.LabelDataPersist;
 import gr.cite.tools.data.builder.Builder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -15,101 +16,50 @@ public class FieldDataHelperServiceProvider {
 	private ApplicationContext applicationContext;
 	
 	public  FieldDataHelperService get(FieldType type){
-		FieldDataHelperService item = null;
+		BaseFieldDataHelperService<?, ?, ?, ? > item = null;
 		
 		switch (type) {
-			case BOOLEAN_DECISION:  {
-				item = this.applicationContext.getBean(BooleanDecisionFieldDataHelperService.class);
+			case DATA_REPOSITORIES:
+			case PUB_REPOSITORIES:
+			case JOURNAL_REPOSITORIES:
+			case TAXONOMIES:
+			case LICENSES:
+			case PUBLICATIONS:
+			case REGISTRIES:
+			case SERVICES:
+			case RESEARCHERS:
+			case BOOLEAN_DECISION:
+			case INTERNAL_DMP_ENTRIES_DATASETS:
+			case INTERNAL_DMP_ENTRIES_DMPS:
+			case INTERNAL_DMP_ENTRIES_RESEARCHERS:
+			case ORGANIZATIONS: {
+				item = this.applicationContext.getBean(LabelAndMultiplicityFieldDataHelperService.class);
 				break;
 			}
 			case RADIO_BOX:  {
 				item = this.applicationContext.getBean(RadioBoxFieldDataHelperService.class);
 				break;
 			}
-			case CHECK_BOX:  {
-				item = this.applicationContext.getBean(CheckBoxFieldDataHelperService.class);
+			case RICH_TEXT_AREA:
+			case DATE_PICKER: 
+			case TEXT_AREA:  
+			case FREE_TEXT:
+			case TAGS:
+			case DATASET_IDENTIFIER:
+			case CURRENCY:
+			case CHECK_BOX:
+			case VALIDATION: {
+				item = this.applicationContext.getBean(LabelFieldDataHelperService.class);
 				break;
-			}
-			case FREE_TEXT:  {
-				item = this.applicationContext.getBean(FreeTextFieldDataHelperService.class);
-				break;
-			}
-			case TEXT_AREA:  {
-				item = this.applicationContext.getBean(TextAreaFieldDataHelperService.class);
-				break;
-			}
-			case RICH_TEXT_AREA:  {
-				item = this.applicationContext.getBean(RichTextAreaDataFieldDataHelperService.class);
-				break;
-			}
+			} 
 			case UPLOAD:  {
 				item = this.applicationContext.getBean(UploadFieldDataHelperService.class);
 				break;
 			}
-			case DATE_PICKER: {
-				item = this.applicationContext.getBean(DatePickerFieldDataHelperService.class);
-				break;
-			}
 			case EXTERNAL_DATASETS:  {
 				item = this.applicationContext.getBean(ExternalDatasetFieldDataHelperService.class);
 				break;
-			}
-			case DATA_REPOSITORIES: {
-				item = this.applicationContext.getBean(DataRepositoryFieldDataHelperService.class);
-				break;
-			}
-			case PUB_REPOSITORIES: {
-				item = this.applicationContext.getBean(PublicationRepositoryFieldDataHelperService.class);
-				break;
-			}
-			case JOURNAL_REPOSITORIES:  {
-				item = this.applicationContext.getBean(JournalRepositoryFieldDataHelperService.class);
-				break;
-			}
-			case TAXONOMIES:  {
-				item = this.applicationContext.getBean(TaxonomyFieldDataHelperService.class);
-				break;
-			}
-			case LICENSES:  {
-				item = this.applicationContext.getBean(LicenseFieldDataHelperService.class);
-				break;
-			}
-			case PUBLICATIONS:  {
-				item = this.applicationContext.getBean(PublicationFieldDataHelperService.class);
-				break;
-			}
-			case REGISTRIES:  {
-				item = this.applicationContext.getBean(RegistryFieldDataHelperService.class);
-				break;
-			}
-			case SERVICES:  {
-				item = this.applicationContext.getBean(ServiceFieldDataHelperService.class);
-				break;
-			}
-			case TAGS: {
-				item = this.applicationContext.getBean(TagFieldDataHelperService.class);
-				break;
-			}
-			case RESEARCHERS:  {
-				item = this.applicationContext.getBean(ResearcherFieldDataHelperService.class);
-				break;
-			}
-			case ORGANIZATIONS:  {
-				item = this.applicationContext.getBean(OrganizationFieldDataHelperService.class);
-				break;
-			}
-			case DATASET_IDENTIFIER:   {
-				item = this.applicationContext.getBean(DatasetIdentifierFieldDataHelperService.class);
-				break;
-			}
-			case CURRENCY:   {
-				item = this.applicationContext.getBean(CurrencyFieldDataHelperService.class);
-				break;
-			}
-			case VALIDATION:   {
-				item = this.applicationContext.getBean(ValidationFieldDataHelperService.class);
-				break;
-			}
+			} 
 			case WORD_LIST: {
 				item = this.applicationContext.getBean(WordListFieldDataHelperService.class);
 				break;
@@ -117,25 +67,10 @@ public class FieldDataHelperServiceProvider {
 			case AUTO_COMPLETE: {
 				item = this.applicationContext.getBean(AutoCompleteFieldDataHelperService.class);
 				break;
-			}
-			case INTERNAL_DMP_ENTRIES_DMPS: {
-				item = this.applicationContext.getBean(DmpAutoCompleteFieldDataHelperService.class);
-				break;
-			}
-			case INTERNAL_DMP_ENTRIES_DATASETS: {
-				item = this.applicationContext.getBean(DatasetAutoCompleteFieldDataHelperService.class);
-				break;
-			}
-			case INTERNAL_DMP_ENTRIES_RESEARCHERS: {
-				item = this.applicationContext.getBean(ResearcherAutoCompleteFieldDataHelperService.class);
-				break;
-			}
+			} 
 			default: throw new RuntimeException("unrecognized builder " + type.getValue());
 		}
-		if (item != null && item instanceof FieldDataHelperService) {
-			return item;
-		} else {
-			throw new RuntimeException("unrecognized builder " + type.getValue());
-		}
+		item.setFieldType(type);
+		return item;
 	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FreeTextFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FreeTextFieldDataHelperService.java
deleted file mode 100644
index f21eadab0..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FreeTextFieldDataHelperService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.FreeTextDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.FreeTextDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.FreeTextDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.FreeTextData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BooleanDecisionDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.FreeTextDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class FreeTextFieldDataHelperService extends BaseFieldDataHelperService<FreeTextData, FreeTextDataPersist, FreeTextDataEntity, FreeTextDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public FreeTextFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.FREE_TEXT;
-	}
-
-	@Override
-	public FreeTextDataEntity newDataInstanceInternal() {
-		return new FreeTextDataEntity();
-	}
-
-	@Override
-	public FreeTextData newModelInstanceInternal() {
-		return new FreeTextData();
-	}
-
-	@Override
-	public FreeTextDataPersist newPersistModelInstanceInternal() {
-		return new FreeTextDataPersist();
-	}
-
-	@Override
-	protected FreeTextDataImportExport newImportExportInstanceInternal() {
-		return new FreeTextDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return FreeTextDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return FreeTextData.class;
-	}
-
-	@Override
-	public Class<?> getPersistModelClass() {
-		return FreeTextDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return FreeTextDataImportExport.class;
-	}
-
-	@Override
-	public List<FreeTextData> buildInternal(FieldSet fieldSet, List<FreeTextDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(FreeTextDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected FreeTextDataEntity applyPersistInternal(FreeTextDataPersist persist, FreeTextDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected FreeTextDataPersist importExportMapDataToPersistInternal(FreeTextDataImportExport data, FreeTextDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected FreeTextDataImportExport dataToImportExportXmlInternal(FreeTextDataEntity data, FreeTextDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(FreeTextDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/JournalRepositoryFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/JournalRepositoryFieldDataHelperService.java
deleted file mode 100644
index 1518861a3..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/JournalRepositoryFieldDataHelperService.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.JournalRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.JournalRepositoryDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DataRepositoryDataBuilder;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.JournalRepositoryDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.JournalRepositoryData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.JournalRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class JournalRepositoryFieldDataHelperService extends BaseFieldDataHelperService<JournalRepositoryData, JournalRepositoryDataPersist, JournalRepositoryDataEntity, JournalRepositoryDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public JournalRepositoryFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.JOURNAL_REPOSITORIES;
-	}
-
-	@Override
-	public JournalRepositoryDataEntity newDataInstanceInternal() {
-		return new JournalRepositoryDataEntity();
-	}
-
-	@Override
-	public JournalRepositoryData newModelInstanceInternal() {
-		return new JournalRepositoryData();
-	}
-
-	@Override
-	public JournalRepositoryDataPersist newPersistModelInstanceInternal() {
-		return new JournalRepositoryDataPersist();
-	}
-
-	@Override
-	protected JournalRepositoryDataImportExport newImportExportInstanceInternal() {
-		return new JournalRepositoryDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return JournalRepositoryDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return JournalRepositoryData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return JournalRepositoryDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return JournalRepositoryDataImportExport.class;
-	}
-
-	@Override
-	public List<JournalRepositoryData> buildInternal(FieldSet fieldSet, List<JournalRepositoryDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(JournalRepositoryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected JournalRepositoryDataEntity applyPersistInternal(JournalRepositoryDataPersist persist, JournalRepositoryDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected JournalRepositoryDataPersist importExportMapDataToPersistInternal(JournalRepositoryDataImportExport data, JournalRepositoryDataPersist persist){
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected JournalRepositoryDataImportExport dataToImportExportXmlInternal(JournalRepositoryDataEntity data, JournalRepositoryDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(JournalRepositoryDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java
new file mode 100644
index 000000000..34b3a133b
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java
@@ -0,0 +1,101 @@
+package eu.eudat.service.fielddatahelper;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.LabelAndMultiplicityDataImportExport;
+import eu.eudat.commons.validation.Validator;
+import eu.eudat.commons.validation.ValidatorFactory;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityData;
+import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ExternalDatasetDataPersist;
+import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.LabelAndMultiplicityDataPersist;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import org.springframework.stereotype.Component;
+
+import java.util.EnumSet;
+import java.util.List;
+
+@Component
+public class LabelAndMultiplicityFieldDataHelperService extends BaseFieldDataHelperService<LabelAndMultiplicityData, LabelAndMultiplicityDataPersist, LabelAndMultiplicityDataEntity, LabelAndMultiplicityDataImportExport> {
+	
+	private final BuilderFactory builderFactory;
+
+	private final ValidatorFactory validatorFactory;
+	public LabelAndMultiplicityFieldDataHelperService(BuilderFactory builderFactory, ValidatorFactory validatorFactory) {
+		this.builderFactory = builderFactory;
+		this.validatorFactory = validatorFactory;
+	}
+
+	@Override
+	public LabelAndMultiplicityDataEntity newDataInstanceInternal() {
+		return new LabelAndMultiplicityDataEntity(this.getFieldType());
+	}
+
+	@Override
+	public LabelAndMultiplicityData newModelInstanceInternal() {
+		return new LabelAndMultiplicityData();
+	}
+
+	@Override
+	public LabelAndMultiplicityDataPersist newPersistModelInstanceInternal() {
+		return new LabelAndMultiplicityDataPersist();
+	}
+
+	@Override
+	protected LabelAndMultiplicityDataImportExport newImportExportInstanceInternal() {
+		return new LabelAndMultiplicityDataImportExport();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return LabelAndMultiplicityDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return LabelAndMultiplicityData.class;
+	}
+	@Override
+	public Class<?> getPersistModelClass() {
+		return LabelAndMultiplicityDataPersist.class;
+	}
+
+	@Override
+	public Class<?> getImportExportClass() {
+		return LabelAndMultiplicityDataImportExport.class;
+	}
+	
+	@Override
+	public Validator getPersistModelValidator() {
+		return this.validatorFactory.validator(LabelAndMultiplicityDataPersist.LabelAndMultiplicityDataPersistValidator.class);
+	}
+
+	@Override
+	public List<LabelAndMultiplicityData> buildInternal(FieldSet fieldSet, List<LabelAndMultiplicityDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(LabelAndMultiplicityDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
+	}
+
+	@Override
+	protected LabelAndMultiplicityDataEntity applyPersistInternal(LabelAndMultiplicityDataPersist persist, LabelAndMultiplicityDataEntity data) {
+		data.setMultiAutoComplete(persist.getMultiAutoComplete());
+		return data;
+	}
+
+	@Override
+	protected LabelAndMultiplicityDataPersist importExportMapDataToPersistInternal(LabelAndMultiplicityDataImportExport data, LabelAndMultiplicityDataPersist persist){
+		persist.setMultiAutoComplete(data.getMultiAutoComplete());
+		return persist;
+	}
+
+	@Override
+	protected LabelAndMultiplicityDataImportExport dataToImportExportXmlInternal(LabelAndMultiplicityDataEntity data, LabelAndMultiplicityDataImportExport xml) {
+		xml.setMultiAutoComplete(data.getMultiAutoComplete());
+		return xml;
+	}
+
+	@Override
+	protected boolean isMultiValueInternal(LabelAndMultiplicityDataEntity data) {
+		return data.getMultiAutoComplete();
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelFieldDataHelperService.java
new file mode 100644
index 000000000..3afde0c6f
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LabelFieldDataHelperService.java
@@ -0,0 +1,99 @@
+package eu.eudat.service.fielddatahelper;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.LabelDataImportExport;
+import eu.eudat.commons.validation.Validator;
+import eu.eudat.commons.validation.ValidatorFactory;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.LabelDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.LabelData;
+import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ExternalDatasetDataPersist;
+import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.LabelDataPersist;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import org.springframework.stereotype.Component;
+
+import java.util.EnumSet;
+import java.util.List;
+
+@Component
+public class LabelFieldDataHelperService extends BaseFieldDataHelperService<LabelData, LabelDataPersist, LabelDataEntity, LabelDataImportExport> {
+	private final BuilderFactory builderFactory;
+
+	private final ValidatorFactory validatorFactory;
+	public LabelFieldDataHelperService(BuilderFactory builderFactory, ValidatorFactory validatorFactory) {
+		this.builderFactory = builderFactory;
+		this.validatorFactory = validatorFactory;
+	}
+
+
+	@Override
+	public LabelDataEntity newDataInstanceInternal() {
+		return new LabelDataEntity(this.getFieldType());
+	}
+
+	@Override
+	public LabelData newModelInstanceInternal() {
+		return new LabelData();
+	}
+
+	@Override
+	public LabelDataPersist newPersistModelInstanceInternal() {
+		return new LabelDataPersist();
+	}
+
+	@Override
+	protected LabelDataImportExport newImportExportInstanceInternal() {
+		return new LabelDataImportExport();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return LabelDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return LabelData.class;
+	}
+	@Override
+	public Class<?> getPersistModelClass() {
+		return LabelDataPersist.class;
+	}
+
+	@Override
+	public Class<?> getImportExportClass() {
+		return LabelDataImportExport.class;
+	}
+	
+	@Override
+	public Validator getPersistModelValidator() {
+		return this.validatorFactory.validator(LabelDataPersist.LabelPersistValidator.class);
+	}
+
+	@Override
+	public List<LabelData> buildInternal(FieldSet fieldSet, List<LabelDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(LabelDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
+	}
+
+	@Override
+	protected LabelDataEntity applyPersistInternal(LabelDataPersist persist, LabelDataEntity data) {
+		return data;
+	}
+
+	@Override
+	protected LabelDataPersist importExportMapDataToPersistInternal(LabelDataImportExport data, LabelDataPersist persist) {
+		return persist;
+	}
+
+	@Override
+	protected LabelDataImportExport dataToImportExportXmlInternal(LabelDataEntity data, LabelDataImportExport xml) {
+		return xml;
+	}
+
+	@Override
+	protected boolean isMultiValueInternal(LabelDataEntity data) {
+		return false;
+	}
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LicenseFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LicenseFieldDataHelperService.java
deleted file mode 100644
index 68e037169..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LicenseFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.LicenseDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.LicenseDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.LicenseDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.LicenseData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.LicenseDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class LicenseFieldDataHelperService extends BaseFieldDataHelperService<LicenseData, LicenseDataPersist, LicenseDataEntity, LicenseDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public LicenseFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.LICENSES;
-	}
-
-	@Override
-	public LicenseDataEntity newDataInstanceInternal() {
-		return new LicenseDataEntity();
-	}
-
-	@Override
-	public LicenseData newModelInstanceInternal() {
-		return new LicenseData();
-	}
-
-	@Override
-	public LicenseDataPersist newPersistModelInstanceInternal() {
-		return new LicenseDataPersist();
-	}
-
-	@Override
-	protected LicenseDataImportExport newImportExportInstanceInternal() {
-		return new LicenseDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return LicenseDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return LicenseData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return LicenseDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return LicenseDataImportExport.class;
-	}
-
-	@Override
-	public List<LicenseData> buildInternal(FieldSet fieldSet, List<LicenseDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(LicenseDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected LicenseDataEntity applyPersistInternal(LicenseDataPersist persist, LicenseDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected LicenseDataPersist importExportMapDataToPersistInternal(LicenseDataImportExport data, LicenseDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected LicenseDataImportExport dataToImportExportXmlInternal(LicenseDataEntity data, LicenseDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(LicenseDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/OrganizationFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/OrganizationFieldDataHelperService.java
deleted file mode 100644
index 351d61ef4..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/OrganizationFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.OrganizationDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.OrganizationDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.OrganizationDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.OrganizationData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.OrganizationDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class OrganizationFieldDataHelperService extends BaseFieldDataHelperService<OrganizationData, OrganizationDataPersist, OrganizationDataEntity, OrganizationDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public OrganizationFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.ORGANIZATIONS;
-	}
-
-	@Override
-	public OrganizationDataEntity newDataInstanceInternal() {
-		return new OrganizationDataEntity();
-	}
-
-	@Override
-	public OrganizationData newModelInstanceInternal() {
-		return new OrganizationData();
-	}
-
-	@Override
-	public OrganizationDataPersist newPersistModelInstanceInternal() {
-		return new OrganizationDataPersist();
-	}
-
-	@Override
-	protected OrganizationDataImportExport newImportExportInstanceInternal() {
-		return new OrganizationDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return OrganizationDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return OrganizationData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return OrganizationDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return OrganizationDataImportExport.class;
-	}
-
-	@Override
-	public List<OrganizationData> buildInternal(FieldSet fieldSet, List<OrganizationDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(OrganizationDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected OrganizationDataEntity applyPersistInternal(OrganizationDataPersist persist, OrganizationDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected OrganizationDataPersist importExportMapDataToPersistInternal(OrganizationDataImportExport data, OrganizationDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected OrganizationDataImportExport dataToImportExportXmlInternal(OrganizationDataEntity data, OrganizationDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(OrganizationDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationFieldDataHelperService.java
deleted file mode 100644
index 274770f12..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.PublicationDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.PublicationDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.PublicationDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.PublicationData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.PublicationDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class PublicationFieldDataHelperService extends BaseFieldDataHelperService<PublicationData, PublicationDataPersist, PublicationDataEntity, PublicationDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public PublicationFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.PUBLICATIONS;
-	}
-
-	@Override
-	public PublicationDataEntity newDataInstanceInternal() {
-		return new PublicationDataEntity();
-	}
-
-	@Override
-	public PublicationData newModelInstanceInternal() {
-		return new PublicationData();
-	}
-
-	@Override
-	public PublicationDataPersist newPersistModelInstanceInternal() {
-		return new PublicationDataPersist();
-	}
-
-	@Override
-	protected PublicationDataImportExport newImportExportInstanceInternal() {
-		return new PublicationDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return PublicationDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return PublicationData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return PublicationDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return PublicationDataImportExport.class;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(PublicationDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-
-	@Override
-	public List<PublicationData> buildInternal(FieldSet fieldSet, List<PublicationDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(PublicationDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected PublicationDataEntity applyPersistInternal(PublicationDataPersist persist, PublicationDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected PublicationDataPersist importExportMapDataToPersistInternal(PublicationDataImportExport data, PublicationDataPersist persist){
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected PublicationDataImportExport dataToImportExportXmlInternal(PublicationDataEntity data, PublicationDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationRepositoryFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationRepositoryFieldDataHelperService.java
deleted file mode 100644
index 640d64a8d..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationRepositoryFieldDataHelperService.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.PublicationRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.PublicationRepositoryDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DataRepositoryDataBuilder;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.PublicationRepositoryDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.PublicationRepositoryData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.PublicationRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class PublicationRepositoryFieldDataHelperService extends BaseFieldDataHelperService<PublicationRepositoryData, PublicationRepositoryDataPersist, PublicationRepositoryDataEntity, PublicationRepositoryDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public PublicationRepositoryFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.PUB_REPOSITORIES;
-	}
-
-	@Override
-	public PublicationRepositoryDataEntity newDataInstanceInternal() {
-		return new PublicationRepositoryDataEntity();
-	}
-
-	@Override
-	public PublicationRepositoryData newModelInstanceInternal() {
-		return new PublicationRepositoryData();
-	}
-
-	@Override
-	public PublicationRepositoryDataPersist newPersistModelInstanceInternal() {
-		return new PublicationRepositoryDataPersist();
-	}
-
-	@Override
-	protected PublicationRepositoryDataImportExport newImportExportInstanceInternal() {
-		return new PublicationRepositoryDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return PublicationRepositoryDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return PublicationRepositoryData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return PublicationRepositoryDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return PublicationRepositoryDataImportExport.class;
-	}
-
-	@Override
-	public List<PublicationRepositoryData> buildInternal(FieldSet fieldSet, List<PublicationRepositoryDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(PublicationRepositoryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected PublicationRepositoryDataEntity applyPersistInternal(PublicationRepositoryDataPersist persist, PublicationRepositoryDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected PublicationRepositoryDataPersist importExportMapDataToPersistInternal(PublicationRepositoryDataImportExport data, PublicationRepositoryDataPersist persist){
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected PublicationRepositoryDataImportExport dataToImportExportXmlInternal(PublicationRepositoryDataEntity data, PublicationRepositoryDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(PublicationRepositoryDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java
index 28afddd3d..e95947dcc 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java
@@ -10,6 +10,8 @@ import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.RadioBo
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.RadioBoxOption;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.UploadDataOption;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
+import eu.eudat.commons.validation.Validator;
+import eu.eudat.commons.validation.ValidatorFactory;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.RadioBoxDataBuilder;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
@@ -32,17 +34,14 @@ public class RadioBoxFieldDataHelperService extends BaseFieldDataHelperService<R
 	private final ConventionService conventionService;
 	private final BuilderFactory builderFactory;
 
-	public RadioBoxFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory) {
+	private final ValidatorFactory validatorFactory;
+	public RadioBoxFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory, ValidatorFactory validatorFactory) {
 		this.conventionService = conventionService;
 		this.builderFactory = builderFactory;
+		this.validatorFactory = validatorFactory;
 	}
 
 
-	@Override
-	public FieldType getFormType() {
-		return FieldType.RADIO_BOX;
-	}
-
 	@Override
 	public RadioBoxDataEntity newDataInstanceInternal() {
 		return new RadioBoxDataEntity();
@@ -81,6 +80,11 @@ public class RadioBoxFieldDataHelperService extends BaseFieldDataHelperService<R
 		return RadioBoxDataImportExport.class;
 	}
 
+	@Override
+	public Validator getPersistModelValidator() {
+		return this.validatorFactory.validator(RadioBoxDataPersist.RadioBoxDataPersistValidator.class);
+	}
+
 	@Override
 	public List<RadioBoxData> buildInternal(FieldSet fieldSet, List<RadioBoxDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
 		return this.builderFactory.builder(RadioBoxDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RegistryFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RegistryFieldDataHelperService.java
deleted file mode 100644
index c5bf4b77a..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RegistryFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.RegistryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.RegistryDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.RegistryDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.RegistryData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.RegistryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class RegistryFieldDataHelperService extends BaseFieldDataHelperService<RegistryData, RegistryDataPersist, RegistryDataEntity, RegistryDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public RegistryFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.REGISTRIES;
-	}
-
-	@Override
-	public RegistryDataEntity newDataInstanceInternal() {
-		return new RegistryDataEntity();
-	}
-
-	@Override
-	public RegistryData newModelInstanceInternal() {
-		return new RegistryData();
-	}
-
-	@Override
-	public RegistryDataPersist newPersistModelInstanceInternal() {
-		return new RegistryDataPersist();
-	}
-
-	@Override
-	protected RegistryDataImportExport newImportExportInstanceInternal() {
-		return new RegistryDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return RegistryDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return RegistryData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return RegistryDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return RegistryDataImportExport.class;
-	}
-
-	@Override
-	public List<RegistryData> buildInternal(FieldSet fieldSet, List<RegistryDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(RegistryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected RegistryDataEntity applyPersistInternal(RegistryDataPersist persist, RegistryDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected RegistryDataPersist importExportMapDataToPersistInternal(RegistryDataImportExport data, RegistryDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected RegistryDataImportExport dataToImportExportXmlInternal(RegistryDataEntity data, RegistryDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(RegistryDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherAutoCompleteFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherAutoCompleteFieldDataHelperService.java
deleted file mode 100644
index 2efb84529..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherAutoCompleteFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ResearcherAutoCompleteDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ResearcherAutoCompleteDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ResearcherAutoCompleteDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherAutoCompleteData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ResearcherAutoCompleteDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class ResearcherAutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<ResearcherAutoCompleteData, ResearcherAutoCompleteDataPersist, ResearcherAutoCompleteDataEntity, ResearcherAutoCompleteDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public ResearcherAutoCompleteFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.INTERNAL_DMP_ENTRIES_RESEARCHERS;
-	}
-
-	@Override
-	public ResearcherAutoCompleteDataEntity newDataInstanceInternal() {
-		return new ResearcherAutoCompleteDataEntity();
-	}
-
-	@Override
-	public ResearcherAutoCompleteData newModelInstanceInternal() {
-		return new ResearcherAutoCompleteData();
-	}
-
-	@Override
-	public ResearcherAutoCompleteDataPersist newPersistModelInstanceInternal() {
-		return new ResearcherAutoCompleteDataPersist();
-	}
-
-	@Override
-	protected ResearcherAutoCompleteDataImportExport newImportExportInstanceInternal() {
-		return new ResearcherAutoCompleteDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return ResearcherAutoCompleteDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return ResearcherAutoCompleteData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return ResearcherAutoCompleteDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return ResearcherAutoCompleteDataImportExport.class;
-	}
-
-	@Override
-	public List<ResearcherAutoCompleteData> buildInternal(FieldSet fieldSet, List<ResearcherAutoCompleteDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(ResearcherAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected ResearcherAutoCompleteDataEntity applyPersistInternal(ResearcherAutoCompleteDataPersist persist, ResearcherAutoCompleteDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected ResearcherAutoCompleteDataPersist importExportMapDataToPersistInternal(ResearcherAutoCompleteDataImportExport data, ResearcherAutoCompleteDataPersist persist){
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected ResearcherAutoCompleteDataImportExport dataToImportExportXmlInternal(ResearcherAutoCompleteDataEntity data, ResearcherAutoCompleteDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(ResearcherAutoCompleteDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherFieldDataHelperService.java
deleted file mode 100644
index 2f70ed52a..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ResearcherDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ResearcherDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ResearcherDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ResearcherDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class ResearcherFieldDataHelperService extends BaseFieldDataHelperService<ResearcherData, ResearcherDataPersist, ResearcherDataEntity, ResearcherDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public ResearcherFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.RESEARCHERS;
-	}
-
-	@Override
-	public ResearcherDataEntity newDataInstanceInternal() {
-		return new ResearcherDataEntity();
-	}
-
-	@Override
-	public ResearcherData newModelInstanceInternal() {
-		return new ResearcherData();
-	}
-
-	@Override
-	public ResearcherDataPersist newPersistModelInstanceInternal() {
-		return new ResearcherDataPersist();
-	}
-
-	@Override
-	protected ResearcherDataImportExport newImportExportInstanceInternal() {
-		return new ResearcherDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return ResearcherDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return ResearcherData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return ResearcherDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return ResearcherDataImportExport.class;
-	}
-
-	@Override
-	public List<ResearcherData> buildInternal(FieldSet fieldSet, List<ResearcherDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(ResearcherDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected ResearcherDataEntity applyPersistInternal(ResearcherDataPersist persist, ResearcherDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected ResearcherDataPersist importExportMapDataToPersistInternal(ResearcherDataImportExport data, ResearcherDataPersist persist){
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected ResearcherDataImportExport dataToImportExportXmlInternal(ResearcherDataEntity data, ResearcherDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(ResearcherDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RichTextAreaDataFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RichTextAreaDataFieldDataHelperService.java
deleted file mode 100644
index eeccc0b19..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RichTextAreaDataFieldDataHelperService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.RichTextAreaDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.RichTextAreaDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.RichTextAreaDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.RichTextAreaData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BooleanDecisionDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.RichTextAreaDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class RichTextAreaDataFieldDataHelperService extends BaseFieldDataHelperService<RichTextAreaData, RichTextAreaDataPersist, RichTextAreaDataEntity, RichTextAreaDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public RichTextAreaDataFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.RICH_TEXT_AREA;
-	}
-
-	@Override
-	public RichTextAreaDataEntity newDataInstanceInternal() {
-		return new RichTextAreaDataEntity();
-	}
-
-	@Override
-	public RichTextAreaData newModelInstanceInternal() {
-		return new RichTextAreaData();
-	}
-
-	@Override
-	public RichTextAreaDataPersist newPersistModelInstanceInternal() {
-		return new RichTextAreaDataPersist();
-	}
-
-	@Override
-	protected RichTextAreaDataImportExport newImportExportInstanceInternal() {
-		return new RichTextAreaDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return RichTextAreaDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return RichTextAreaData.class;
-	}
-
-	@Override
-	public Class<?> getPersistModelClass() {
-		return RichTextAreaDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return RichTextAreaDataImportExport.class;
-	}
-
-	@Override
-	public List<RichTextAreaData> buildInternal(FieldSet fieldSet, List<RichTextAreaDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(RichTextAreaDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected RichTextAreaDataEntity applyPersistInternal(RichTextAreaDataPersist persist, RichTextAreaDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected RichTextAreaDataPersist importExportMapDataToPersistInternal(RichTextAreaDataImportExport data, RichTextAreaDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected RichTextAreaDataImportExport dataToImportExportXmlInternal(RichTextAreaDataEntity data, RichTextAreaDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(RichTextAreaDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ServiceFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ServiceFieldDataHelperService.java
deleted file mode 100644
index b2c1e5dcf..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ServiceFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ServiceDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ServiceDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ServiceDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ServiceData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ServiceDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class ServiceFieldDataHelperService extends BaseFieldDataHelperService<ServiceData, ServiceDataPersist, ServiceDataEntity, ServiceDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public ServiceFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.SERVICES;
-	}
-
-	@Override
-	public ServiceDataEntity newDataInstanceInternal() {
-		return new ServiceDataEntity();
-	}
-
-	@Override
-	public ServiceData newModelInstanceInternal() {
-		return new ServiceData();
-	}
-
-	@Override
-	public ServiceDataPersist newPersistModelInstanceInternal() {
-		return new ServiceDataPersist();
-	}
-
-	@Override
-	protected ServiceDataImportExport newImportExportInstanceInternal() {
-		return new ServiceDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return ServiceDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return ServiceData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return ServiceDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return ServiceDataImportExport.class;
-	}
-
-	@Override
-	public List<ServiceData> buildInternal(FieldSet fieldSet, List<ServiceDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(ServiceDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected ServiceDataEntity applyPersistInternal(ServiceDataPersist persist, ServiceDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected ServiceDataPersist importExportMapDataToPersistInternal(ServiceDataImportExport data, ServiceDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected ServiceDataImportExport dataToImportExportXmlInternal(ServiceDataEntity data, ServiceDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(ServiceDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TagFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TagFieldDataHelperService.java
deleted file mode 100644
index f6be1e2da..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TagFieldDataHelperService.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.TagDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.TagDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.TagDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.TagData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BooleanDecisionDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.TagDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class TagFieldDataHelperService extends BaseFieldDataHelperService<TagData, TagDataPersist, TagDataEntity, TagDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public TagFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.TAGS;
-	}
-
-	@Override
-	public TagDataEntity newDataInstanceInternal() {
-		return new TagDataEntity();
-	}
-
-	@Override
-	public TagDataPersist newPersistModelInstanceInternal() {
-		return new TagDataPersist();
-	}
-
-	@Override
-	protected TagDataImportExport newImportExportInstanceInternal() {
-		return new TagDataImportExport();
-	}
-
-	@Override
-	public TagData newModelInstanceInternal() {
-		return new TagData();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return TagDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return TagData.class;
-	}
-
-	@Override
-	public Class<?> getPersistModelClass() {
-		return TagDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return TagDataImportExport.class;
-	}
-
-	@Override
-	public List<TagData> buildInternal(FieldSet fieldSet, List<TagDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(TagDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected TagDataEntity applyPersistInternal(TagDataPersist persist, TagDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected TagDataPersist importExportMapDataToPersistInternal(TagDataImportExport data, TagDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected TagDataImportExport dataToImportExportXmlInternal(TagDataEntity data, TagDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(TagDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TaxonomyFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TaxonomyFieldDataHelperService.java
deleted file mode 100644
index bc425144a..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TaxonomyFieldDataHelperService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.TaxonomyDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.TaxonomyDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.TaxonomyDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.TaxonomyData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.TaxonomyDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class TaxonomyFieldDataHelperService extends BaseFieldDataHelperService<TaxonomyData, TaxonomyDataPersist, TaxonomyDataEntity, TaxonomyDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public TaxonomyFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.TAXONOMIES;
-	}
-
-	@Override
-	public TaxonomyDataEntity newDataInstanceInternal() {
-		return new TaxonomyDataEntity();
-	}
-
-	@Override
-	public TaxonomyData newModelInstanceInternal() {
-		return new TaxonomyData();
-	}
-
-	@Override
-	public TaxonomyDataPersist newPersistModelInstanceInternal() {
-		return new TaxonomyDataPersist();
-	}
-
-	@Override
-	protected TaxonomyDataImportExport newImportExportInstanceInternal() {
-		return new TaxonomyDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return TaxonomyDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return TaxonomyData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return TaxonomyDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return TaxonomyDataImportExport.class;
-	}
-
-	@Override
-	public List<TaxonomyData> buildInternal(FieldSet fieldSet, List<TaxonomyDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(TaxonomyDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected TaxonomyDataEntity applyPersistInternal(TaxonomyDataPersist persist, TaxonomyDataEntity data) {
-		data.setMultiAutoComplete(persist.getMultiAutoComplete());
-		return data;
-	}
-
-	@Override
-	protected TaxonomyDataPersist importExportMapDataToPersistInternal(TaxonomyDataImportExport data, TaxonomyDataPersist persist) {
-		persist.setMultiAutoComplete(data.getMultiAutoComplete());
-		return persist;
-	}
-
-	@Override
-	protected TaxonomyDataImportExport dataToImportExportXmlInternal(TaxonomyDataEntity data, TaxonomyDataImportExport xml) {
-		xml.setMultiAutoComplete(data.getMultiAutoComplete());
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(TaxonomyDataEntity data) {
-		return data.getMultiAutoComplete();
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TextAreaFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TextAreaFieldDataHelperService.java
deleted file mode 100644
index 13b7afadd..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TextAreaFieldDataHelperService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.TextAreaDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.TextAreaDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.TextAreaDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.TextAreaData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.TextAreaDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class TextAreaFieldDataHelperService extends BaseFieldDataHelperService<TextAreaData, TextAreaDataPersist, TextAreaDataEntity, TextAreaDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public TextAreaFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.TEXT_AREA;
-	}
-
-	@Override
-	public TextAreaDataEntity newDataInstanceInternal() {
-		return new TextAreaDataEntity();
-	}
-
-	@Override
-	public TextAreaData newModelInstanceInternal() {
-		return new TextAreaData();
-	}
-
-	@Override
-	public TextAreaDataPersist newPersistModelInstanceInternal() {
-		return new TextAreaDataPersist();
-	}
-
-	@Override
-	protected TextAreaDataImportExport newImportExportInstanceInternal() {
-		return new TextAreaDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return TextAreaDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return TextAreaData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return TextAreaDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return TextAreaDataImportExport.class;
-	}
-
-	@Override
-	public List<TextAreaData> buildInternal(FieldSet fieldSet, List<TextAreaDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(TextAreaDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}
-
-	@Override
-	protected TextAreaDataEntity applyPersistInternal(TextAreaDataPersist persist, TextAreaDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected TextAreaDataPersist importExportMapDataToPersistInternal(TextAreaDataImportExport data, TextAreaDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected TextAreaDataImportExport dataToImportExportXmlInternal(TextAreaDataEntity data, TextAreaDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(TextAreaDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java
index ddbff2d55..e9c6f029a 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java
@@ -8,6 +8,8 @@ import eu.eudat.commons.types.descriptiontemplate.fielddata.UploadDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.UploadDataImportExport;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.UploadDataOption;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
+import eu.eudat.commons.validation.Validator;
+import eu.eudat.commons.validation.ValidatorFactory;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.UploadDataBuilder;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
@@ -30,17 +32,14 @@ public class UploadFieldDataHelperService extends BaseFieldDataHelperService<Upl
 	private final ConventionService conventionService;
 	private final BuilderFactory builderFactory;
 
-	public UploadFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory) {
+	private final ValidatorFactory validatorFactory;
+	public UploadFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory, ValidatorFactory validatorFactory) {
 		this.conventionService = conventionService;
 		this.builderFactory = builderFactory;
+		this.validatorFactory = validatorFactory;
 	}
 
 
-	@Override
-	public FieldType getFormType() {
-		return FieldType.UPLOAD;
-	}
-
 	@Override
 	public UploadDataEntity newDataInstanceInternal() {
 		return new UploadDataEntity();
@@ -79,6 +78,12 @@ public class UploadFieldDataHelperService extends BaseFieldDataHelperService<Upl
 		return UploadDataImportExport.class;
 	}
 
+
+	@Override
+	public Validator getPersistModelValidator() {
+		return this.validatorFactory.validator(UploadDataPersist.UploadDataPersistValidator.class);
+	}
+
 	@Override
 	public List<UploadData> buildInternal(FieldSet fieldSet, List<UploadDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
 		return this.builderFactory.builder(UploadDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ValidationFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ValidationFieldDataHelperService.java
deleted file mode 100644
index 53fb0fcab..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ValidationFieldDataHelperService.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ValidationDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ValidationDataImportExport;
-import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ValidationDataBuilder;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ValidationData;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.DataRepositoryDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.ValidationDataPersist;
-import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.WordListDataPersist;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.fieldset.FieldSet;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-
-import java.util.EnumSet;
-import java.util.List;
-
-@Component
-public class ValidationFieldDataHelperService extends BaseFieldDataHelperService<ValidationData, ValidationDataPersist, ValidationDataEntity, ValidationDataImportExport> {
-	
-	private final BuilderFactory builderFactory;
-
-	public ValidationFieldDataHelperService(BuilderFactory builderFactory) {
-		this.builderFactory = builderFactory;
-	}
-
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.LICENSES;
-	}
-
-	@Override
-	public ValidationDataEntity newDataInstanceInternal() {
-		return new ValidationDataEntity();
-	}
-
-	@Override
-	public ValidationData newModelInstanceInternal() {
-		return new ValidationData();
-	}
-
-	@Override
-	public ValidationDataPersist newPersistModelInstanceInternal() {
-		return new ValidationDataPersist();
-	}
-
-	@Override
-	protected ValidationDataImportExport newImportExportInstanceInternal() {
-		return new ValidationDataImportExport();
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		return ValidationDataEntity.class;
-	}
-	@Override
-	public Class<?> getModelClass() {
-		return ValidationData.class;
-	}
-	@Override
-	public Class<?> getPersistModelClass() {
-		return ValidationDataPersist.class;
-	}
-
-	@Override
-	public Class<?> getImportExportClass() {
-		return ValidationDataImportExport.class;
-	}
-
-	@Override
-	public List<ValidationData> buildInternal(FieldSet fieldSet, List<ValidationDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
-		return this.builderFactory.builder(ValidationDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
-	}	
-	
-	@Override
-	protected ValidationDataEntity applyPersistInternal(ValidationDataPersist persist, ValidationDataEntity data) {
-		return data;
-	}
-
-	@Override
-	protected ValidationDataPersist importExportMapDataToPersistInternal(ValidationDataImportExport data, ValidationDataPersist persist) {
-		return persist;
-	}
-
-	@Override
-	protected ValidationDataImportExport dataToImportExportXmlInternal(ValidationDataEntity data, ValidationDataImportExport xml) {
-		return xml;
-	}
-
-	@Override
-	protected boolean isMultiValueInternal(ValidationDataEntity data) {
-		return false;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java
index f9ad4e755..584857db0 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java
@@ -6,6 +6,8 @@ import eu.eudat.commons.types.descriptiontemplate.fielddata.*;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.WordListDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.ComboBoxDataOptionEntity;
 import eu.eudat.commons.types.descriptiontemplate.importexport.fielddata.WordListDataImportExport;
+import eu.eudat.commons.validation.Validator;
+import eu.eudat.commons.validation.ValidatorFactory;
 import eu.eudat.convention.ConventionService;
 import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.WordListDataBuilder;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
@@ -28,17 +30,14 @@ public class WordListFieldDataHelperService extends BaseFieldDataHelperService<W
 	private final ConventionService conventionService;
 	private final BuilderFactory builderFactory;
 
-	public WordListFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory) {
+	private final ValidatorFactory validatorFactory;
+	public WordListFieldDataHelperService(ConventionService conventionService, BuilderFactory builderFactory, ValidatorFactory validatorFactory) {
 		this.conventionService = conventionService;
 		this.builderFactory = builderFactory;
+		this.validatorFactory = validatorFactory;
 	}
 
 
-	@Override
-	public FieldType getFormType() {
-		return FieldType.WORD_LIST;
-	}
-
 	@Override
 	public WordListDataEntity newDataInstanceInternal() {
 		return new WordListDataEntity();
@@ -77,6 +76,11 @@ public class WordListFieldDataHelperService extends BaseFieldDataHelperService<W
 		return WordListDataImportExport.class;
 	}
 
+	@Override
+	public Validator getPersistModelValidator() {
+		return this.validatorFactory.validator(WordListDataPersist.WordListDataPersistValidator.class);
+	}
+
 	@Override
 	public List<WordListData> buildInternal(FieldSet fieldSet, List<WordListDataEntity> data, EnumSet<AuthorizationFlags> authorizationFlags){
 		return this.builderFactory.builder(WordListDataBuilder.class).authorize(authorizationFlags).build(fieldSet, data);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java
index e1370db39..0a75a15b0 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/prefilling/PrefillingServiceImpl.java
@@ -9,7 +9,7 @@ import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.ComboBoxDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.LicenseDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
 import eu.eudat.commons.types.descriptiontemplate.fielddata.WordListDataEntity;
 import eu.eudat.commons.types.prefilling.PrefillingEntity;
 import eu.eudat.commons.validation.ValidatorFactory;
@@ -308,7 +308,7 @@ public class PrefillingServiceImpl implements PrefillingService {
             }
             case LICENSES: {
                 List<ReferenceEntity> licenses = this.queryFactory.query(ReferenceQuery.class).references(parsedValues).collect();
-                LicenseDataEntity wordListDataEntity = (LicenseDataEntity) fieldEntity.getData();
+                LabelAndMultiplicityDataEntity wordListDataEntity = (LabelAndMultiplicityDataEntity) fieldEntity.getData();
                 if (licenses != null && !licenses.isEmpty() && wordListDataEntity != null) {
                     boolean isMultiAutocomplete = wordListDataEntity.getMultiAutoComplete();
                     List<Reference> licenseModels = this.builderFactory.builder(ReferenceBuilder.class).authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermissionOrPublic).build(new BaseFieldSet(), licenses);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
index 2b92d3aa1..290713485 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java
@@ -940,7 +940,7 @@ public class WordBuilder {
             case RADIO_BOX:
                 return field.getValue() != null ? field.getValue().toString() : null;
             case CHECK_BOX:
-                CheckBoxDataEntity data = (CheckBoxDataEntity) field.getData();
+                LabelDataEntity data = (LabelDataEntity) field.getData();
                 if (field.getValue() == null || field.getValue().equals("false")) return null;
                 return data.getLabel();
             case DATE_PICKER:{
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java
index 6e7cd26bc..e88f1a531 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java
@@ -261,7 +261,7 @@ public class ExportXmlBuilderDatasetProfile {
                         dataOut.appendChild(types);
                         break;
                     case BOOLEAN_DECISION:
-                        BooleanDecisionDataEntity booleanDecisionDataEntityObject = (BooleanDecisionDataEntity) field.getData();
+                        LabelAndMultiplicityDataEntity booleanDecisionDataEntityObject = (LabelAndMultiplicityDataEntity) field.getData();
                         dataOut.setAttribute("label", booleanDecisionDataEntityObject.getLabel());
                         break;
                     case RADIO_BOX:
@@ -294,15 +294,15 @@ public class ExportXmlBuilderDatasetProfile {
                         dataOut.setAttribute("type", internalDmpEntitiesData.getFieldType().getValue());
                         switch (internalDmpEntitiesData.getFieldSubType()) {
                             case Researchers:
-                                ResearcherAutoCompleteDataEntity researchersAutoCompleteData = (ResearcherAutoCompleteDataEntity) internalDmpEntitiesData;
+                                InternalDmpBaseDataEntity researchersAutoCompleteData = (InternalDmpBaseDataEntity) internalDmpEntitiesData;
                                 dataOut.setAttribute("multiAutocomplete", researchersAutoCompleteData.getMultiAutoComplete().toString());
                                 break;
                             case Datasets:
-                                DatasetAutoCompleteDataEntity datasetAutoCompleteDataEntity = (DatasetAutoCompleteDataEntity) internalDmpEntitiesData;
+                                InternalDmpBaseDataEntity datasetAutoCompleteDataEntity = (InternalDmpBaseDataEntity) internalDmpEntitiesData;
                                 dataOut.setAttribute("multiAutocomplete", datasetAutoCompleteDataEntity.getMultiAutoComplete().toString());
                                 break;
                             case Dmps:
-                                DmpAutoCompleteDataEntity dmpAutoCompleteDataEntity = (DmpAutoCompleteDataEntity) internalDmpEntitiesData;
+                                InternalDmpBaseDataEntity dmpAutoCompleteDataEntity = (InternalDmpBaseDataEntity) internalDmpEntitiesData;
                                 dataOut.setAttribute("multiAutocomplete", dmpAutoCompleteDataEntity.getMultiAutoComplete().toString());
                                 break;
                         }
@@ -316,42 +316,42 @@ public class ExportXmlBuilderDatasetProfile {
                     case DATA_REPOSITORIES:
                     case JOURNAL_REPOSITORIES:
                     case PUB_REPOSITORIES:
-                        DataRepositoryDataEntity dataRepositoryDataEntity = (DataRepositoryDataEntity) field.getData();
+                        InternalDmpBaseDataEntity dataRepositoryDataEntity = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", dataRepositoryDataEntity.getLabel());
                         dataOut.setAttribute("multiAutocomplete", dataRepositoryDataEntity.getMultiAutoComplete().toString());
                         break;
                     case TAXONOMIES:
-                        TaxonomyDataEntity taxonomyDataEntity = (TaxonomyDataEntity) field.getData();
+                        InternalDmpBaseDataEntity taxonomyDataEntity = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", taxonomyDataEntity.getLabel());
                         dataOut.setAttribute("multiAutocomplete", taxonomyDataEntity.getMultiAutoComplete().toString());
                         break;
                     case LICENSES:
-                        LicenseDataEntity licensesData = (LicenseDataEntity) field.getData();
+                        InternalDmpBaseDataEntity licensesData = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", licensesData.getLabel());
                         dataOut.setAttribute("multiAutocomplete", licensesData.getMultiAutoComplete().toString());
                         break;
                     case PUBLICATIONS:
-                        PublicationDataEntity publicationDataEntity = (PublicationDataEntity) field.getData();
+                        InternalDmpBaseDataEntity publicationDataEntity = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", publicationDataEntity.getLabel());
                         dataOut.setAttribute("multiAutocomplete", publicationDataEntity.getMultiAutoComplete().toString());
                         break;
                     case ORGANIZATIONS:
-                        OrganizationDataEntity organizationDataEntity = (OrganizationDataEntity) field.getData();
+                        InternalDmpBaseDataEntity organizationDataEntity = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", organizationDataEntity.getLabel());
                         dataOut.setAttribute("multiAutocomplete", organizationDataEntity.getMultiAutoComplete().toString());
                         break;
                     case RESEARCHERS:
-                        ResearcherDataEntity researcherDataEntity = (ResearcherDataEntity) field.getData();
+                        InternalDmpBaseDataEntity researcherDataEntity = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", researcherDataEntity.getLabel());
                         dataOut.setAttribute("multiAutocomplete", researcherDataEntity.getMultiAutoComplete().toString());
                         break;
                     case REGISTRIES:
-                        RegistryDataEntity registriesEntity = (RegistryDataEntity) field.getData();
+                        InternalDmpBaseDataEntity registriesEntity = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", registriesEntity.getLabel());
                         dataOut.setAttribute("multiAutocomplete", registriesEntity.getMultiAutoComplete().toString());
                         break;
                     case SERVICES:
-                        ServiceDataEntity serviceDataEntity = (ServiceDataEntity) field.getData();
+                        InternalDmpBaseDataEntity serviceDataEntity = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", serviceDataEntity.getLabel());
                         dataOut.setAttribute("multiAutocomplete", serviceDataEntity.getMultiAutoComplete().toString());
                         break;