diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java
index 04efa40c0..0c8d40bb9 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java
@@ -6,10 +6,15 @@ import eu.eudat.data.converters.enums.DatabaseEnum;
 import java.util.Map;
 
 public enum FieldType implements DatabaseEnum<String> {
-	COMBO_BOX("combobox"),
+	COMBO_BOX("combobox"), //TODO remove from xml an keep subtypes only AUTO_COMPLETE, WORD_LIST
+	AUTO_COMPLETE("autocomplete"),
+	WORD_LIST("wordlist"),
 	BOOLEAN_DECISION("booleanDecision"),
 	RADIO_BOX("radiobox"),
-	INTERNAL_DMP_ENTRIES("internalDmpEntities"),
+	INTERNAL_DMP_ENTRIES("internalDmpEntities"), //TODO remove from xml an keep subtypes only INTERNAL_DMP_ENTRIES_RESEARCHERS. INTERNAL_DMP_ENTRIES_DMPS, INTERNAL_DMP_ENTRIES_DATASETS
+	INTERNAL_DMP_ENTRIES_RESEARCHERS("internalDmpResearchers"),
+	INTERNAL_DMP_ENTRIES_DMPS("internalDmpDmps"),
+	INTERNAL_DMP_ENTRIES_DATASETS("internalDmpDatasets"),
 	CHECK_BOX("checkBox"),
 	FREE_TEXT("freetext"),
 	TEXT_AREA("textarea"),
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java
index 9f3ec2064..25635b74c 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java
@@ -3,8 +3,7 @@ package eu.eudat.commons.types.descriptiontemplate;
 import eu.eudat.commons.enums.FieldValidationType;
 import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.FieldDataHelper;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.*;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import eu.eudat.commons.types.xml.XmlBuilder;
 import org.w3c.dom.Document;
@@ -24,7 +23,6 @@ public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable
     private List<RuleEntity> visibilityRules;
     private BaseFieldDataEntity<?> data;
     private List<FieldValidationType> validations;
-    private FieldType fieldType;
     private Boolean includeInExport;
 
     public String getId() {
@@ -55,14 +53,6 @@ public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable
         this.data = data;
     }
 
-    public FieldType getFieldType() {
-        return fieldType;
-    }
-
-    public void setFieldType(FieldType fieldType) {
-        this.fieldType = fieldType;
-    }
-
     public String getDefaultValue() {
         return defaultValue;
     }
@@ -117,8 +107,25 @@ public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable
         }
 
         Element viewStyle = doc.createElement("viewStyle");
-        viewStyle.setAttribute("renderstyle", this.getFieldType().getValue());
-
+        if (this.data != null) {
+            switch (this.data.getFieldType()){
+                case COMBO_BOX:
+                case AUTO_COMPLETE:
+                case WORD_LIST:{
+                    viewStyle.setAttribute("renderstyle", FieldType.COMBO_BOX.getValue());
+                    break;
+                }
+                case INTERNAL_DMP_ENTRIES:
+                case INTERNAL_DMP_ENTRIES_DMPS:
+                case INTERNAL_DMP_ENTRIES_DATASETS:
+                case INTERNAL_DMP_ENTRIES_RESEARCHERS:{
+                    viewStyle.setAttribute("renderstyle", FieldType.INTERNAL_DMP_ENTRIES.getValue());
+                    break;
+                }
+                case BOOLEAN_DECISION: viewStyle.setAttribute("renderstyle", this.data.getFieldType().getValue());;
+            }
+            
+        }
         Element visibilityRulesElement = doc.createElement("visible");
         if (this.visibilityRules != null && !this.visibilityRules.isEmpty()) {
             for (RuleEntity rule : this.visibilityRules) {
@@ -144,7 +151,10 @@ public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable
         rootElement.appendChild(defaultValue);
         rootElement.appendChild(visibilityRulesElement);
         rootElement.appendChild(viewStyle);
-        if (this.data != null) rootElement.appendChild(this.data.toXml(doc));
+        if (this.data != null) {
+            rootElement.appendChild(this.data.toXml(doc));
+        
+        }
         rootElement.setAttribute("export", this.includeInExport == null || this.includeInExport ? "true" : "false");
         return rootElement;
     }
@@ -157,8 +167,8 @@ public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable
 
         Element viewStyle = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "viewStyle");
 
-        this.fieldType = FieldType.of(viewStyle.getAttribute("renderstyle"));
-
+        FieldType fieldType = FieldType.of(viewStyle.getAttribute("renderstyle"));
+        
         Element visibility = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "visible");
         NodeList rulesElements = visibility.getChildNodes();
         this.visibilityRules = new LinkedList();
@@ -189,7 +199,7 @@ public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable
         Element defaultValue = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "defaultValue");
 
         this.defaultValue = defaultValue.getAttribute("value");
-        this.data = new FieldDataHelper().toFieldData(null, this.getFieldType(), dataElement);
+        this.data = new FieldDataHelper().toFieldData(null, fieldType, dataElement);
         if (this.data != null) this.data.fromXml(dataElement);
 
         this.validations = new LinkedList<>();
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java
index 49ebbb054..7cfd8dd04 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java
@@ -22,7 +22,7 @@ public class FieldSetEntity implements DatabaseViewStyleDefinition, XmlSerializa
     private String additionalInformation;
     private MultiplicityEntity multiplicity;
     private boolean hasCommentField;
-    private String commentFieldValue; //TODO: DescriptionTemplate
+//    private String commentFieldValue; //TODO: DescriptionTemplate
 
     public List<FieldEntity> getFields() {
         return fields;
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 ae7213b8f..8c4076222 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
@@ -2,6 +2,8 @@ package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 import eu.eudat.commons.enums.EnumUtils;
+import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.enums.FieldType;
 import eu.eudat.data.converters.enums.DatabaseEnum;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -138,6 +140,16 @@ public class AutoCompleteDataEntity extends ComboBoxDataEntity<AutoCompleteDataE
         this.autoCompleteSingleDataList = autoCompleteSingleDataList;
     }
 
+    @Override
+    public FieldDataComboBoxType getFieldSubType() {
+        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 e0ead5a54..9d3d91489 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -8,7 +9,8 @@ import java.util.Map;
 
 public abstract class BaseFieldDataEntity<T> implements XmlSerializable<T> {
     private String label;
-    private String subType;
+
+    public abstract FieldType getFieldType();
 
     public String getLabel() {
         return label;
@@ -18,13 +20,6 @@ public abstract class BaseFieldDataEntity<T> implements XmlSerializable<T> {
         this.label = label;
     }
 
-    public String getSubType() {
-        return subType;
-    }
-
-    public void setSubType(String subType) {
-        this.subType = subType;
-    }
 
     public T fromData(Object data) {
         return null;
@@ -34,8 +29,17 @@ public abstract class BaseFieldDataEntity<T> implements XmlSerializable<T> {
         return null;
     }
 
+
     public Element toXml(Document doc) {
-        return null;
+        Element root = doc.createElement("data");
+        root.setAttribute("label", this.getLabel());
+        return root;
+    }
+
+    public T fromXml(Element item) {
+
+        this.setLabel(item.getAttribute("label"));
+        return (T) this;
     }
 
     public abstract Map<String, Object> toMap(Element item);
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
index ee37fbcd9..74e008f71 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -8,6 +9,11 @@ import java.util.Map;
 
 public class BooleanDecisionDataEntity extends BaseFieldDataEntity<BooleanDecisionDataEntity> {
 
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.BOOLEAN_DECISION;
+    }
+    
     @Override
     public BooleanDecisionDataEntity fromData(Object data) {
         if (data != null) {
@@ -21,18 +27,6 @@ public class BooleanDecisionDataEntity extends BaseFieldDataEntity<BooleanDecisi
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element element = doc.createElement("data");
-        element.setAttribute("label", this.getLabel());
-        return element;
-    }
-
-    @Override
-    public BooleanDecisionDataEntity fromXml(Element item) {
-        this.setLabel(item.getAttribute("label"));
-        return this;
-    }
 
     @Override
     public Map<String, Object> toMap(Element item) {
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
index b6cdb3c04..7c52326c1 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -9,18 +10,10 @@ import java.util.Map;
 public class CheckBoxDataEntity extends BaseFieldDataEntity<CheckBoxDataEntity> {
 
     @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
+    public FieldType getFieldType() {
+        return FieldType.CHECK_BOX;
     }
-
-    @Override
-    public CheckBoxDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
-        return this;
-    }
-
+    
     @Override
     public CheckBoxDataEntity fromData(Object data) {
         if (data != null) {
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 3695a68c9..53ead3180 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
@@ -9,6 +9,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 public abstract class ComboBoxDataEntity<T> extends BaseFieldDataEntity<T> {
+
+    public abstract FieldDataComboBoxType getFieldSubType();
+    
     public static class Option implements XmlSerializable<Option> {
         private String label;
         private String value;
@@ -65,26 +68,16 @@ public abstract class ComboBoxDataEntity<T> extends BaseFieldDataEntity<T> {
 
     }
 
-    public FieldDataComboBoxType getType() {
-        return FieldDataComboBoxType.of(this.getSubType());
-    }
-
-    public void setType(FieldDataComboBoxType type) {
-        this.setSubType(type.getValue());
-    }
-
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("type", this.getSubType());
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
+        root.setAttribute("type", this.getFieldSubType().toString());
         return root;
     }
 
     @Override
     public T fromXml(Element item) {
-        this.setLabel(item.getAttribute("label"));
-        this.setSubType(item.getAttribute("type"));
+        super.fromXml(item);
         return (T) this;
     }
 
@@ -92,7 +85,6 @@ public abstract class ComboBoxDataEntity<T> extends BaseFieldDataEntity<T> {
     public T fromData(Object data) {
 
         if (data != null) {
-            this.setSubType((String) ((Map<String, Object>) data).get("type"));
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
 
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
index 3907d9025..65ccaf9b3 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,11 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class CurrencyDataEntity extends BaseFieldDataEntity<CurrencyDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.CURRENCY;
+    }
+    
     @Override
     public CurrencyDataEntity fromData(Object data) {
         if (data != null) {
@@ -20,19 +26,6 @@ public class CurrencyDataEntity extends BaseFieldDataEntity<CurrencyDataEntity>
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public CurrencyDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
-        return this;
-    }
-
     @Override
     public Map<String, Object> toMap(Element item) {
         HashMap dataMap = new HashMap();
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
index a4a570c19..5b3347c0c 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,11 @@ 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() {
@@ -33,8 +39,7 @@ public class DataRepositoryDataEntity extends BaseFieldDataEntity<DataRepository
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +48,7 @@ public class DataRepositoryDataEntity extends BaseFieldDataEntity<DataRepository
 
     @Override
     public DataRepositoryDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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
index e66aeffb2..d3e580b6a 100644
--- 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
@@ -1,5 +1,8 @@
 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;
 
@@ -16,6 +19,16 @@ public class DatasetAutoCompleteDataEntity extends InternalDmpBaseDataEntity<Dat
 		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);
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
index 2e31e8c0b..27ebc4581 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class DatasetIdentifierDataEntity extends BaseFieldDataEntity<DatasetIdentifierDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.DATASET_IDENTIFIER;
+    }
     @Override
     public DatasetIdentifierDataEntity fromData(Object data) {
         if (data != null) {
@@ -20,19 +25,6 @@ public class DatasetIdentifierDataEntity extends BaseFieldDataEntity<DatasetIden
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public DatasetIdentifierDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
-        return this;
-    }
-
     @Override
     public Map<String, Object> toMap(Element item) {
         HashMap dataMap = new HashMap();
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
index 58b8fff50..fd53df315 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class DatePickerDataEntity extends BaseFieldDataEntity<DatePickerDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.DATE_PICKER;
+    }
     @Override
     public DatePickerDataEntity fromData(Object data) {
         if (data != null) {
@@ -20,19 +25,6 @@ public class DatePickerDataEntity extends BaseFieldDataEntity<DatePickerDataEnti
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public DatePickerDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
-        return this;
-    }
-
     @Override
     public Map<String, Object> toMap(Element item) {
         HashMap dataMap = new HashMap();
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
index 37033d4b3..ee47511a5 100644
--- 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
@@ -1,5 +1,7 @@
 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;
 
@@ -16,6 +18,15 @@ public class DmpAutoCompleteDataEntity extends InternalDmpBaseDataEntity<DmpAuto
 		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);
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 3705b41da..8c54fe59c 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
@@ -1,6 +1,7 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import eu.eudat.commons.enums.FieldDataExternalDatasetType;
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -8,6 +9,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ExternalDatasetDataEntity extends BaseFieldDataEntity<ExternalDatasetDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return 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 f3d01f299..e44d26921 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
@@ -47,9 +47,9 @@ public class FieldDataHelper {
             case UPLOAD: return new UploadDataEntity();
             case DATE_PICKER: return new DatePickerDataEntity();
             case EXTERNAL_DATASETS: return new ExternalDatasetDataEntity();
-            case DATA_REPOSITORIES:
-            case PUB_REPOSITORIES:
-            case JOURNAL_REPOSITORIES: return new DataRepositoryDataEntity();
+            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();
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
index 923354765..1096961b9 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -8,7 +9,11 @@ import java.util.Map;
 
 
 public class FreeTextDataEntity extends BaseFieldDataEntity<FreeTextDataEntity> {
-
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.FREE_TEXT;
+    }
+    
     @Override
     public FreeTextDataEntity fromData(Object data) {
         if (data != null) {
@@ -22,19 +27,6 @@ public class FreeTextDataEntity extends BaseFieldDataEntity<FreeTextDataEntity>
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public FreeTextDataEntity fromXml(Element item) {
-        this.setLabel(item.getAttribute("label"));
-        return this;
-    }
-
     @Override
     public Map<String, Object> toMap(Element item) {
         HashMap dataMap = new HashMap();
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 f859326c6..d92a5eac2 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
@@ -8,25 +8,19 @@ import java.util.HashMap;
 import java.util.Map;
 
 public abstract class InternalDmpBaseDataEntity<T> extends BaseFieldDataEntity<T> {
-	public FieldDataInternalDmpEntryType getType() {
-		return FieldDataInternalDmpEntryType.of(this.getSubType());
-	}
-	public void setType(FieldDataInternalDmpEntryType type) {
-		this.setSubType(type.getValue());
-	}
 
+	public abstract FieldDataInternalDmpEntryType getFieldSubType();
+	
 	@Override
 	public Element toXml(Document doc) {
-		Element root = doc.createElement("data");
-		root.setAttribute("type", this.getType().getValue());
-		root.setAttribute("label", this.getLabel());
+		Element root = super.toXml(doc);
+		root.setAttribute("type", this.getFieldSubType().toString());
 		return root;
 	}
 
 	@Override
 	public T fromXml(Element item) {
-		this.setLabel(item.getAttribute("label"));
-		this.setType(FieldDataInternalDmpEntryType.of(item.getAttribute("type")));
+		super.fromXml(item);
 		return (T) this;
 	}
 
@@ -34,7 +28,6 @@ public abstract class InternalDmpBaseDataEntity<T> extends BaseFieldDataEntity<T
 	public T fromData(Object data) {
 
 		if (data != null) {
-			this.setType(FieldDataInternalDmpEntryType.of ((String) ((Map<String, Object>) data).get("type")));
 			this.setLabel((String) ((Map<String, Object>) data).get("label"));
 		}
 
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
new file mode 100644
index 000000000..bc5966e9e
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/JournalRepositoryDataEntity.java
@@ -0,0 +1,63 @@
+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 JournalRepositoryDataEntity fromData(Object data) {
+        if (data != null) {
+            this.setLabel((String) ((Map<String, Object>) data).get("label"));
+            this.setMultiAutoComplete(((Map<String, Object>) data).get("multiAutoComplete") != null && !((Map<String, Object>) data).get("multiAutoComplete").toString().isEmpty()? Boolean.parseBoolean(((Map<String, Object>) data).get("multiAutoComplete").toString()) : false);
+        }
+        return this;
+    }
+
+    @Override
+    public Object toData() {
+        return null;
+    }
+
+    @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;
+    }
+
+    @Override
+    public Map<String, Object> toMap(Element item) {
+        HashMap dataMap = new HashMap();
+        dataMap.put("label", item != null && item.getAttributes().getLength() > 0? item.getAttribute("label") : "");
+        dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0 ? item.getAttribute("multiAutocomplete") : false);
+        return dataMap;
+    }
+}
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
index ada34559c..8a748c72b 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ 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() {
@@ -33,8 +38,7 @@ public class LicenseDataEntity extends BaseFieldDataEntity<LicenseDataEntity> {
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +47,7 @@ public class LicenseDataEntity extends BaseFieldDataEntity<LicenseDataEntity> {
 
     @Override
     public LicenseDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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
index 5ee596ace..22fc29d28 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ 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() {
@@ -33,8 +38,7 @@ public class OrganizationDataEntity extends BaseFieldDataEntity<OrganizationData
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +47,7 @@ public class OrganizationDataEntity extends BaseFieldDataEntity<OrganizationData
 
     @Override
     public OrganizationDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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
index 65daa9654..c3a6a16b7 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ 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() {
@@ -33,8 +38,7 @@ public class PublicationDataEntity extends BaseFieldDataEntity<PublicationDataEn
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +47,7 @@ public class PublicationDataEntity extends BaseFieldDataEntity<PublicationDataEn
 
     @Override
     public PublicationDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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
new file mode 100644
index 000000000..0d3ac8bb5
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationRepositoryDataEntity.java
@@ -0,0 +1,63 @@
+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 PublicationRepositoryDataEntity fromData(Object data) {
+        if (data != null) {
+            this.setLabel((String) ((Map<String, Object>) data).get("label"));
+            this.setMultiAutoComplete(((Map<String, Object>) data).get("multiAutoComplete") != null && !((Map<String, Object>) data).get("multiAutoComplete").toString().isEmpty()? Boolean.parseBoolean(((Map<String, Object>) data).get("multiAutoComplete").toString()) : false);
+        }
+        return this;
+    }
+
+    @Override
+    public Object toData() {
+        return null;
+    }
+
+    @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;
+    }
+
+    @Override
+    public Map<String, Object> toMap(Element item) {
+        HashMap dataMap = new HashMap();
+        dataMap.put("label", item != null && item.getAttributes().getLength() > 0? item.getAttribute("label") : "");
+        dataMap.put("multiAutoComplete", item != null && item.getAttributes().getLength() > 0 ? item.getAttribute("multiAutocomplete") : false);
+        return dataMap;
+    }
+}
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 fac8b5c3f..28febe795 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -12,7 +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 class Option implements XmlSerializable<Option> {
         private String label;
         private String value;
@@ -85,22 +89,20 @@ public class RadioBoxDataEntity extends BaseFieldDataEntity<RadioBoxDataEntity>
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
+        Element root = super.toXml(doc);
         Element element = doc.createElement("options");
         for (Option option : this.options) {
             element.appendChild(option.toXml(doc));
         }
-        root.setAttribute("label", this.getLabel());
         root.appendChild(element);
         return root;
     }
 
     @Override
     public RadioBoxDataEntity fromXml(Element item) {
-
+        super.fromXml(item);
         this.options = new LinkedList<>();
         Element optionsElement = (Element) item.getElementsByTagName("options").item(0);
-        this.setLabel(item.getAttribute("label"));
         if (optionsElement != null) {
             NodeList optionElements = optionsElement.getChildNodes();
             for (int temp = 0; temp < optionElements.getLength(); temp++) {
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
index 5bd11ace7..6fa6dc51c 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ 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() {
@@ -33,8 +38,7 @@ public class RegistryDataEntity extends BaseFieldDataEntity<RegistryDataEntity>
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +47,7 @@ public class RegistryDataEntity extends BaseFieldDataEntity<RegistryDataEntity>
 
     @Override
     public RegistryDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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
index 13e0b09e9..f1a1a2452 100644
--- 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
@@ -1,5 +1,7 @@
 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;
 
@@ -16,6 +18,16 @@ public class ResearcherAutoCompleteDataEntity extends InternalDmpBaseDataEntity<
 		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);
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
index d1d30216c..94e60893b 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ 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() {
@@ -33,8 +38,7 @@ public class ResearcherDataEntity extends BaseFieldDataEntity<ResearcherDataEnti
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +47,7 @@ public class ResearcherDataEntity extends BaseFieldDataEntity<ResearcherDataEnti
 
     @Override
     public ResearcherDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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
index 8dbfe5337..dd660e828 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -8,6 +9,10 @@ import java.util.Map;
 
 
 public class RichTextAreaDataEntity extends BaseFieldDataEntity<RichTextAreaDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.RICH_TEXT_AREA;
+    }
     @Override
     public RichTextAreaDataEntity fromData(Object data) {
         if (data != null) {
@@ -21,19 +26,6 @@ public class RichTextAreaDataEntity extends BaseFieldDataEntity<RichTextAreaData
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public RichTextAreaDataEntity fromXml(Element item) {
-        this.setLabel(item.getAttribute("label"));
-        return this;
-    }
-
     @Override
     public Map<String, Object> toMap(Element item) {
         HashMap dataMap = new HashMap();
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
index 33938233b..0a0ac0a64 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ 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() {
@@ -33,8 +38,7 @@ public class ServiceDataEntity extends BaseFieldDataEntity<ServiceDataEntity> {
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +47,7 @@ public class ServiceDataEntity extends BaseFieldDataEntity<ServiceDataEntity> {
 
     @Override
     public ServiceDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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
index 20fcdb63e..7f7f8fa95 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class TagDataEntity extends BaseFieldDataEntity<TagDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.TAGS;
+    }
     @Override
     public TagDataEntity fromData(Object data) {
         if (data != null) {
@@ -20,18 +25,6 @@ public class TagDataEntity extends BaseFieldDataEntity<TagDataEntity> {
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public TagDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
-        return this;
-    }
 
     @Override
     public Map<String, Object> toMap(Element item) {
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/TaxonomyDataEntity.java
index 4c11a9155..001845da1 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/TaxonomyDataEntity.java
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class TaxonomyDataEntity extends BaseFieldDataEntity<TaxonomyDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.TAXONOMIES;
+    }
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -33,8 +38,7 @@ public class TaxonomyDataEntity extends BaseFieldDataEntity<TaxonomyDataEntity>
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
+        Element root = super.toXml(doc);
         if (this.getMultiAutoComplete() != null) {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
@@ -43,7 +47,7 @@ public class TaxonomyDataEntity extends BaseFieldDataEntity<TaxonomyDataEntity>
 
     @Override
     public TaxonomyDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
+        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/TextAreaDataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TextAreaDataEntity.java
index c92767f3a..e7c9fdfba 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -8,6 +9,11 @@ import java.util.Map;
 
 
 public class TextAreaDataEntity extends BaseFieldDataEntity<TextAreaDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.TEXT_AREA;
+    }
+
     @Override
     public TextAreaDataEntity fromData(Object data) {
         if (data != null) {
@@ -21,18 +27,6 @@ public class TextAreaDataEntity extends BaseFieldDataEntity<TextAreaDataEntity>
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public TextAreaDataEntity fromXml(Element item) {
-        this.setLabel(item.getAttribute("label"));
-        return this;
-    }
 
     @Override
     public Map<String, Object> toMap(Element item) {
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 cb8a6718b..3b6386258 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -13,6 +14,10 @@ import java.util.Map;
 
 
 public class UploadDataEntity extends BaseFieldDataEntity<UploadDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.UPLOAD;
+    }
     public class Option implements XmlSerializable<UploadDataEntity.Option> {
         private String label;
         private String value;
@@ -102,12 +107,11 @@ public class UploadDataEntity extends BaseFieldDataEntity<UploadDataEntity> {
 
     @Override
     public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
+        Element root = super.toXml(doc);
         Element element = doc.createElement("types");
         for (UploadDataEntity.Option type : this.types) {
             element.appendChild(type.toXml(doc));
         }
-        root.setAttribute("label", this.getLabel());
         root.setAttribute("maxFileSizeInMB", this.getMaxFileSizeInMB().toString());
         root.appendChild(element);
         return root;
@@ -116,8 +120,8 @@ public class UploadDataEntity extends BaseFieldDataEntity<UploadDataEntity> {
     @Override
     public UploadDataEntity fromXml(Element item) {
         this.types = new LinkedList<>();
+        super.fromXml(item);
         Element optionsElement = (Element) item.getElementsByTagName("types").item(0);
-        this.setLabel(item.getAttribute("label"));
         if(item.getAttribute("maxFileSizeInMB") != null) {
             this.setMaxFileSizeInMB(Integer.parseInt(item.getAttribute("maxFileSizeInMB")));
         }
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
index b390a84d0..81bfec926 100644
--- 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
@@ -1,5 +1,6 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -7,6 +8,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ValidationDataEntity extends BaseFieldDataEntity<ValidationDataEntity> {
+    @Override
+    public FieldType getFieldType() {
+        return FieldType.VALIDATION;
+    }
     @Override
     public ValidationDataEntity fromData(Object data) {
         if (data != null) {
@@ -20,18 +25,6 @@ public class ValidationDataEntity extends BaseFieldDataEntity<ValidationDataEnti
         return null;
     }
 
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public ValidationDataEntity fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
-        return this;
-    }
 
     @Override
     public Map<String, Object> toMap(Element item) {
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 d931e40bb..39a1a1205 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
@@ -1,5 +1,7 @@
 package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.enums.FieldType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -31,6 +33,16 @@ public class WordListDataEntity extends ComboBoxDataEntity<WordListDataEntity> {
         this.multiList = multiList;
     }
 
+    @Override
+    public FieldDataComboBoxType getFieldSubType() {
+        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/model/builder/descriptiontemplatedefinition/FieldBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/FieldBuilder.java
index 00d77997d..e4da9b38e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/FieldBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/FieldBuilder.java
@@ -59,15 +59,13 @@ public class FieldBuilder extends BaseBuilder<Field, FieldEntity> {
             if (fields.hasField(this.asIndexer(Field._numbering))) m.setNumbering(d.getNumbering());
             if (fields.hasField(this.asIndexer(Field._schematics))) m.setSchematics(d.getSchematics());
             if (fields.hasField(this.asIndexer(Field._defaultValue))) m.setDefaultValue(d.getDefaultValue());
-            if (fields.hasField(this.asIndexer(Field._fieldType))) m.setFieldType(d.getFieldType());
             if (fields.hasField(this.asIndexer(Field._includeInExport))) m.setIncludeInExport(d.getIncludeInExport());
             if (fields.hasField(this.asIndexer(Field._validations))) m.setValidations(d.getValidations());
             if (fields.hasField(this.asIndexer(Field._numbering))) m.setNumbering(d.getNumbering());
             if (fields.hasField(this.asIndexer(Field._numbering))) m.setNumbering(d.getNumbering());
             if (!visibilityRulesFields.isEmpty() && d.getVisibilityRules() != null) m.setVisibilityRules(this.builderFactory.builder(RuleBuilder.class).authorize(this.authorize).build(visibilityRulesFields, d.getVisibilityRules()));
             if (!dataFields.isEmpty() && d.getData() != null){
-                FieldDataHelperService fieldDataHelperService = this.fieldDataHelperServiceProvider.get(d.getFieldType());
-                if (fieldDataHelperService.requireSubType()) fieldDataHelperService.setSubType(d.getData().getSubType());
+                FieldDataHelperService fieldDataHelperService = this.fieldDataHelperServiceProvider.get(d.getData().getFieldType());
                 m.setData(fieldDataHelperService.buildOne(dataFields, d.getData(), this.authorize));
             }
             
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AutoCompleteDataBuilder.java
index 702e65a1a..e3f291a9e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AutoCompleteDataBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AutoCompleteDataBuilder.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class AutoCompleteDataBuilder extends ComboBoxDataBuilder<AutoCompleteData, AutoCompleteDataEntity> {
+public class AutoCompleteDataBuilder extends BaseFieldDataBuilder<AutoCompleteData, AutoCompleteDataEntity> {
 	private final BuilderFactory builderFactory;
 	@Autowired
 	public AutoCompleteDataBuilder(ConventionService conventionService, BuilderFactory builderFactory) {
@@ -28,9 +28,10 @@ public class AutoCompleteDataBuilder extends ComboBoxDataBuilder<AutoCompleteDat
 	}
 
 	@Override
-	protected void buildComboBoxChild(FieldSet fields, AutoCompleteDataEntity d, AutoCompleteData m) {
+	protected void buildChild(FieldSet fields, AutoCompleteDataEntity d, AutoCompleteData m) {
 		FieldSet autoCompleteSingleDataListFields = fields.extractPrefixed(this.asPrefix(AutoCompleteData._autoCompleteSingleDataList));
 		if (fields.hasField(this.asIndexer(AutoCompleteData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
 		if (!autoCompleteSingleDataListFields.isEmpty() && d.getAutoCompleteSingleDataList() != null) m.setAutoCompleteSingleDataList(this.builderFactory.builder(AutoCompleteSingleDataBuilder.class).authorize(this.authorize).build(autoCompleteSingleDataListFields, d.getAutoCompleteSingleDataList()));
+
 	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BaseFieldDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BaseFieldDataBuilder.java
index c7b4bcdc3..8f61f8caf 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BaseFieldDataBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BaseFieldDataBuilder.java
@@ -46,6 +46,7 @@ public abstract class BaseFieldDataBuilder<Model extends BaseFieldData, Entity e
         for (Entity d : data) {
             Model m = this.getInstance();
             if (fields.hasField(this.asIndexer(Model._label))) m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(Model._fieldType))) m.setFieldType(d.getFieldType());
             this.buildChild(fields, d, m);
             models.add(m);
         }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxDataBuilder.java
deleted file mode 100644
index 0864e3d7d..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxDataBuilder.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.ComboBoxDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ComboBoxData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public abstract class ComboBoxDataBuilder<M extends ComboBoxData, D extends ComboBoxDataEntity<?>> extends BaseFieldDataBuilder<M, D> {
-
-	protected abstract void buildComboBoxChild(FieldSet fields, D d, M m);
-	@Autowired
-	public ComboBoxDataBuilder(ConventionService conventionService, LoggerService logger) {
-		super(conventionService, logger);
-	}
-
-	protected void buildChild(FieldSet fields, D d, M m) {
-		if (fields.hasField(this.asIndexer(ComboBoxData._type))) m.setType(d.getType());
-		this.buildComboBoxChild(fields, d, m);
-	}
-}
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
index 41057d936..48018a46c 100644
--- 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
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class DatasetAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<DatasetAutoCompleteData, DatasetAutoCompleteDataEntity> {
+public class DatasetAutoCompleteDataBuilder extends BaseFieldDataBuilder<DatasetAutoCompleteData, DatasetAutoCompleteDataEntity> {
 
 	@Autowired
 	public DatasetAutoCompleteDataBuilder(ConventionService conventionService) {
@@ -25,7 +25,7 @@ public class DatasetAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<D
 	}
 
 	@Override
-	protected void buildInternalDmpChild(FieldSet fields, DatasetAutoCompleteDataEntity m, DatasetAutoCompleteData d) {
+	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/DmpAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataBuilder.java
index bcd2e7eb0..89c974c9f 100644
--- 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
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class DmpAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<DmpAutoCompleteData, DmpAutoCompleteDataEntity> {
+public class DmpAutoCompleteDataBuilder extends BaseFieldDataBuilder<DmpAutoCompleteData, DmpAutoCompleteDataEntity> {
 
 	@Autowired
 	public DmpAutoCompleteDataBuilder(ConventionService conventionService) {
@@ -25,7 +25,8 @@ public class DmpAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<DmpAu
 	}
 
 	@Override
-	protected void buildInternalDmpChild(FieldSet fields, DmpAutoCompleteDataEntity m, DmpAutoCompleteData d) {
+	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/ExternalDatasetDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ExternalDatasetDataBuilder.java
index 3df37aa81..0924d9f58 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ExternalDatasetDataBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ExternalDatasetDataBuilder.java
@@ -2,7 +2,6 @@ package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
 
 import eu.eudat.commons.types.descriptiontemplate.fielddata.ExternalDatasetDataEntity;
 import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.ComboBoxOption;
 import eu.eudat.model.descriptiontemplatedefinition.fielddata.ExternalDatasetData;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/InternalDmpBaseDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/InternalDmpBaseDataBuilder.java
deleted file mode 100644
index c85334852..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/InternalDmpBaseDataBuilder.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.types.descriptiontemplate.fielddata.InternalDmpBaseDataEntity;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.descriptiontemplatedefinition.fielddata.InternalDmpBaseData;
-import gr.cite.tools.fieldset.FieldSet;
-import gr.cite.tools.logging.LoggerService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public abstract class InternalDmpBaseDataBuilder<M extends InternalDmpBaseData, D extends InternalDmpBaseDataEntity<?>> extends BaseFieldDataBuilder<M, D> {
-
-	protected abstract void buildInternalDmpChild(FieldSet fields, D d, M m);
-	@Autowired
-	public InternalDmpBaseDataBuilder(ConventionService conventionService, LoggerService logger) {
-		super(conventionService, logger);
-	}
-
-	protected void buildChild(FieldSet fields, D d, M m) {
-		if (fields.hasField(this.asIndexer(InternalDmpBaseData._type))) m.setType(d.getType());
-		this.buildInternalDmpChild(fields, d, 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
new file mode 100644
index 000000000..a78fc4d4a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/JournalRepositoryDataBuilder.java
@@ -0,0 +1,31 @@
+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.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 JournalRepositoryDataBuilder extends BaseFieldDataBuilder<DataRepositoryData, DataRepositoryDataEntity> {
+
+	@Autowired
+	public JournalRepositoryDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(JournalRepositoryDataBuilder.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/PublicationRepositoryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataBuilder.java
new file mode 100644
index 000000000..84ab496b5
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataBuilder.java
@@ -0,0 +1,31 @@
+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.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 PublicationRepositoryDataBuilder extends BaseFieldDataBuilder<DataRepositoryData, DataRepositoryDataEntity> {
+
+	@Autowired
+	public PublicationRepositoryDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(PublicationRepositoryDataBuilder.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/ResearcherAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataBuilder.java
index 3719d5546..9b6e3ad5c 100644
--- 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
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class ResearcherAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<ResearcherAutoCompleteData, ResearcherAutoCompleteDataEntity> {
+public class ResearcherAutoCompleteDataBuilder extends BaseFieldDataBuilder<ResearcherAutoCompleteData, ResearcherAutoCompleteDataEntity> {
 
 	@Autowired
 	public ResearcherAutoCompleteDataBuilder(ConventionService conventionService) {
@@ -25,7 +25,7 @@ public class ResearcherAutoCompleteDataBuilder extends InternalDmpBaseDataBuilde
 	}
 
 	@Override
-	protected void buildInternalDmpChild(FieldSet fields, ResearcherAutoCompleteDataEntity d, ResearcherAutoCompleteData m) {
+	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/WordListDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/WordListDataBuilder.java
index a29e98831..7acf9eec3 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/WordListDataBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/WordListDataBuilder.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class WordListDataBuilder extends ComboBoxDataBuilder<WordListData, WordListDataEntity> {
+public class WordListDataBuilder extends BaseFieldDataBuilder<WordListData, WordListDataEntity> {
 	private final BuilderFactory builderFactory;
 	@Autowired
 	public WordListDataBuilder(ConventionService conventionService, BuilderFactory builderFactory) {
@@ -28,9 +28,10 @@ public class WordListDataBuilder extends ComboBoxDataBuilder<WordListData, WordL
 	}
 
 	@Override
-	protected void buildComboBoxChild(FieldSet fields, WordListDataEntity d, WordListData m) {
+	protected void buildChild(FieldSet fields, WordListDataEntity d, WordListData m) {
 		FieldSet optionsFields = fields.extractPrefixed(this.asPrefix(WordListData._options));
 		if (fields.hasField(this.asIndexer(WordListData._multiList))) m.setMultiList(d.getMultiList());
 		if (!optionsFields.isEmpty() && d.getOptions() != null) m.setOptions(this.builderFactory.builder(ComboBoxOptionBuilder.class).authorize(this.authorize).build(optionsFields, d.getOptions()));
+		
 	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/deleter/DescriptionTemplateDeleter.java b/dmp-backend/core/src/main/java/eu/eudat/model/deleter/DescriptionTemplateDeleter.java
new file mode 100644
index 000000000..630452689
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/deleter/DescriptionTemplateDeleter.java
@@ -0,0 +1,81 @@
+package eu.eudat.model.deleter;
+
+import eu.eudat.commons.enums.IsActive;
+import eu.eudat.data.DescriptionTemplateEntity;
+import eu.eudat.query.DescriptionTemplateQuery;
+import gr.cite.tools.data.deleter.Deleter;
+import gr.cite.tools.data.deleter.DeleterFactory;
+import gr.cite.tools.data.query.QueryFactory;
+import gr.cite.tools.logging.LoggerService;
+import gr.cite.tools.logging.MapLogEntry;
+import jakarta.persistence.EntityManager;
+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;
+
+import javax.management.InvalidApplicationException;
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DescriptionTemplateDeleter implements Deleter {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(DescriptionTemplateDeleter.class));
+
+    private final EntityManager entityManager;
+
+    protected final QueryFactory queryFactory;
+
+    protected final DeleterFactory deleterFactory;
+
+    @Autowired
+    public DescriptionTemplateDeleter(
+            EntityManager entityManager,
+            QueryFactory queryFactory,
+            DeleterFactory deleterFactory
+    ) {
+        this.entityManager = entityManager;
+        this.queryFactory = queryFactory;
+        this.deleterFactory = deleterFactory;
+    }
+
+    public void deleteAndSaveByIds(List<UUID> ids) throws InvalidApplicationException {
+        logger.debug(new MapLogEntry("collecting to delete").And("count", Optional.ofNullable(ids).map(List::size).orElse(0)).And("ids", ids));
+        List<DescriptionTemplateEntity> data = this.queryFactory.query(DescriptionTemplateQuery.class).ids(ids).collect();
+        logger.trace("retrieved {} items", Optional.ofNullable(data).map(List::size).orElse(0));
+        this.deleteAndSave(data);
+    }
+
+    public void deleteAndSave(List<DescriptionTemplateEntity> data) throws InvalidApplicationException {
+        logger.debug("will delete {} items", Optional.ofNullable(data).map(List::size).orElse(0));
+        this.delete(data);
+        logger.trace("saving changes");
+        this.entityManager.flush();
+        logger.trace("changes saved");
+    }
+
+    public void delete(List<DescriptionTemplateEntity> data) throws InvalidApplicationException {
+        logger.debug("will delete {} items", Optional.ofNullable(data).map(List::size).orElse(0));
+        if (data == null || data.isEmpty())
+            return;
+        
+        //TODO can not delete profile if has Datasets
+        
+        Instant now = Instant.now();
+
+        for (DescriptionTemplateEntity item : data) {
+            logger.trace("deleting item {}", item.getId());
+            item.setIsActive(IsActive.Inactive);
+            item.setUpdatedAt(now);
+            logger.trace("updating item");
+            this.entityManager.merge(item);
+            logger.trace("updated item");
+        }
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Field.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Field.java
index 947ed3cd0..083be69c4 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Field.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Field.java
@@ -15,7 +15,7 @@ public class Field {
 	private Integer ordinal;
 
 	public final static String _numbering = "numbering";
-	private String numbering;
+	private String numbering; //TODO maybe remove
 
 	public final static String _schematics = "schematics";
 	private List<String> schematics;
@@ -29,9 +29,6 @@ public class Field {
 	public final static String _validations = "validations";
 	private List<FieldValidationType> validations;
 
-	public final static String _fieldType = "fieldType";
-	private FieldType fieldType;
-
 	public final static String _includeInExport = "includeInExport";
 	private Boolean includeInExport;
 
@@ -94,14 +91,6 @@ public class Field {
 		this.validations = validations;
 	}
 
-	public FieldType getFieldType() {
-		return fieldType;
-	}
-
-	public void setFieldType(FieldType fieldType) {
-		this.fieldType = fieldType;
-	}
-
 	public Boolean getIncludeInExport() {
 		return includeInExport;
 	}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Page.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Page.java
index b498b879b..6b06e80b2 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Page.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Page.java
@@ -9,7 +9,7 @@ public class Page {
 	private String id;
 
 	public final static String _ordinal = "ordinal";
-	private int ordinal;
+	private Integer ordinal;
 
 	public final static String _title = "title";
 	private String title;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
index cdac01aae..d128bcf2c 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
@@ -9,7 +9,7 @@ public class Section {
 	private String id;
 
 	public final static String _ordinal = "ordinal";
-	private int ordinal;
+	private Integer ordinal;
 
 	public final static String _defaultVisibility = "defaultVisibility";
 	private Boolean defaultVisibility;
@@ -18,7 +18,7 @@ public class Section {
 	private Boolean multiplicity;
 
 	public final static String _numbering = "numbering";
-	private String numbering;
+	private String numbering; //TODO maybe remove
 
 	public final static String _page = "page";
 	private String page;
@@ -30,7 +30,7 @@ public class Section {
 	private String description;
 
 	public final static String _extendedDescription = "extendedDescription";
-	private String extendedDescription;
+	private String extendedDescription; //TODO maybe remove
 
 	public final static String _sections = "sections";
 	private List<Section> sections;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteData.java
index 87efae744..980b83a73 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteData.java
@@ -2,7 +2,7 @@ package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
 import java.util.List;
 
-public class AutoCompleteData extends ComboBoxData {
+public class AutoCompleteData extends BaseFieldData {
     public final static String _multiAutoComplete = "multiAutoComplete";
     private Boolean multiAutoComplete;
     public final static String _autoCompleteSingleDataList = "autoCompleteSingleDataList";
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BaseFieldData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BaseFieldData.java
index ce23bc0e3..c720d564d 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BaseFieldData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BaseFieldData.java
@@ -1,10 +1,15 @@
 package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
+import eu.eudat.commons.enums.FieldType;
+
 public abstract class BaseFieldData {
 
 	public final static String _label = "label";
 	private String label;
 
+	public final static String _fieldType = "fieldType";
+	private FieldType fieldType;
+
 	public String getLabel() {
 		return label;
 	}
@@ -12,4 +17,12 @@ public abstract class BaseFieldData {
 	public void setLabel(String label) {
 		this.label = label;
 	}
+
+	public FieldType getFieldType() {
+		return fieldType;
+	}
+
+	public void setFieldType(FieldType fieldType) {
+		this.fieldType = fieldType;
+	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ComboBoxData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ComboBoxData.java
deleted file mode 100644
index 8a7f1c6a6..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ComboBoxData.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.enums.FieldDataComboBoxType;
-
-public abstract class ComboBoxData extends BaseFieldData {
-
-
-    public final static String _type = "type";
-    private FieldDataComboBoxType type;
-
-    public FieldDataComboBoxType getType() {
-        return type;
-    }
-
-    public void setType(FieldDataComboBoxType type) {
-        this.type = type;
-    }
-    
-}
-
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
index 36c199474..62072b82d 100644
--- 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
@@ -1,6 +1,6 @@
 package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
-public class DatasetAutoCompleteData extends InternalDmpBaseData {
+public class DatasetAutoCompleteData 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/DmpAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DmpAutoCompleteData.java
index 09a09db00..24e6dc9e6 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/DmpAutoCompleteData.java
@@ -1,6 +1,6 @@
 package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
-public class DmpAutoCompleteData extends InternalDmpBaseData {
+public class DmpAutoCompleteData 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/InternalDmpBaseData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/InternalDmpBaseData.java
deleted file mode 100644
index 0cbf24905..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/InternalDmpBaseData.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.eudat.model.descriptiontemplatedefinition.fielddata;
-
-import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
-
-public abstract class InternalDmpBaseData extends BaseFieldData {
-	public final static String _type = "type";
-	private FieldDataInternalDmpEntryType type;
-
-	public FieldDataInternalDmpEntryType getType() {
-		return type;
-	}
-	public void setType(FieldDataInternalDmpEntryType type) {
-		this.type = type;
-	}
-}
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
new file mode 100644
index 000000000..d403994c8
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/JournalRepositoryData.java
@@ -0,0 +1,14 @@
+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/PublicationRepositoryData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationRepositoryData.java
new file mode 100644
index 000000000..af78d2634
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationRepositoryData.java
@@ -0,0 +1,14 @@
+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/ResearcherAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteData.java
index 2e6c8af5a..ce6a215d4 100644
--- 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
@@ -1,6 +1,6 @@
 package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
-public class ResearcherAutoCompleteData extends InternalDmpBaseData {
+public class ResearcherAutoCompleteData 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/WordListData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/WordListData.java
index 120b756d1..fb8741e4b 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/WordListData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/WordListData.java
@@ -2,7 +2,7 @@ package eu.eudat.model.descriptiontemplatedefinition.fielddata;
 
 import java.util.List;
 
-public class WordListData extends ComboBoxData {
+public class WordListData extends BaseFieldData {
     public final static String _options = "options";
     private List<ComboBoxOption> options;
     public final static String _multiList = "multiList";
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplatePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplatePersist.java
new file mode 100644
index 000000000..dbb51a994
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplatePersist.java
@@ -0,0 +1,137 @@
+package eu.eudat.model.persist;
+
+
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.validation.FieldNotNullIfOtherSet;
+import eu.eudat.commons.validation.ValidEnum;
+import eu.eudat.commons.validation.ValidId;
+import eu.eudat.data.DescriptionTemplateEntity;
+import eu.eudat.model.persist.descriptiontemplatedefinition.DefinitionPersist;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+
+import java.util.UUID;
+
+@FieldNotNullIfOtherSet(message = "{validation.hashempty}")
+public class DescriptionTemplatePersist {
+
+    @ValidId(message = "{validation.invalidid}")
+    private UUID id;
+
+    @NotNull(message = "{validation.empty}")
+    @NotEmpty(message = "{validation.empty}")
+    @Size(max = DescriptionTemplateEntity._labelLength, message = "{validation.largerthanmax}")
+    private String label = null;
+
+    @NotNull(message = "{validation.empty}")
+    @NotEmpty(message = "{validation.empty}")
+    private String description = null;
+
+    @NotNull(message = "{validation.empty}")
+    @ValidId(message = "{validation.invalidid}")
+    private UUID groupId = null;
+
+    @NotNull(message = "{validation.empty}")
+    private Short version = null;
+
+    @NotNull(message = "{validation.empty}")
+    @NotEmpty(message = "{validation.empty}")
+    private String language = null;
+
+    @NotNull(message = "{validation.empty}")
+    @ValidId(message = "{validation.invalidid}")
+    private UUID type = null;
+
+    @ValidEnum(message = "{validation.empty}")
+    private DescriptionTemplateStatus status;
+
+    @NotNull(message = "{validation.empty}")
+    @Valid
+    private DefinitionPersist definition = null;
+
+
+    private String hash;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public UUID getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(UUID groupId) {
+        this.groupId = groupId;
+    }
+
+    public Short getVersion() {
+        return version;
+    }
+
+    public void setVersion(Short version) {
+        this.version = version;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public UUID getType() {
+        return type;
+    }
+
+    public void setType(UUID type) {
+        this.type = type;
+    }
+
+    public String getHash() {
+        return hash;
+    }
+
+    public void setHash(String hash) {
+        this.hash = hash;
+    }
+
+    public DescriptionTemplateStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(DescriptionTemplateStatus status) {
+        this.status = status;
+    }
+
+    public DefinitionPersist getDefinition() {
+        return definition;
+    }
+
+    public void setDefinition(DefinitionPersist definition) {
+        this.definition = definition;
+    }
+}
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java
new file mode 100644
index 000000000..b1fb3aa68
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/DefinitionPersist.java
@@ -0,0 +1,33 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class DefinitionPersist {
+
+	@NotNull(message = "{validation.empty}")
+	@Valid
+	private List<SectionPersist> sections = null;
+
+	@NotNull(message = "{validation.empty}")
+	@Valid
+	private List<PagePersist> pages = null;
+
+	public List<SectionPersist> getSections() {
+		return sections;
+	}
+
+	public void setSections(List<SectionPersist> sections) {
+		this.sections = sections;
+	}
+
+	public List<PagePersist> getPages() {
+		return pages;
+	}
+
+	public void setPages(List<PagePersist> pages) {
+		this.pages = pages;
+	}
+}
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
new file mode 100644
index 000000000..be84fb58c
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldPersist.java
@@ -0,0 +1,99 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition;
+
+import eu.eudat.commons.enums.FieldValidationType;
+import eu.eudat.model.persist.descriptiontemplatedefinition.fielddata.BaseFieldDataPersist;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class FieldPersist {
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String id = null;
+
+	@NotNull(message = "{validation.empty}")
+	private Integer ordinal = null;
+
+	private List<String> schematics;
+
+	private String defaultValue;
+
+	@Valid
+	private List<RulePersist> visibilityRules;
+
+	private List<FieldValidationType> validations;
+
+	@NotNull(message = "{validation.empty}")
+	private Boolean includeInExport = null;
+
+	@NotNull(message = "{validation.empty}")
+	@Valid
+	private BaseFieldDataPersist data = null;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Integer getOrdinal() {
+		return ordinal;
+	}
+
+	public void setOrdinal(Integer ordinal) {
+		this.ordinal = ordinal;
+	}
+
+	public List<String> getSchematics() {
+		return schematics;
+	}
+
+	public void setSchematics(List<String> schematics) {
+		this.schematics = schematics;
+	}
+
+	public String getDefaultValue() {
+		return defaultValue;
+	}
+
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
+
+	public List<RulePersist> getVisibilityRules() {
+		return visibilityRules;
+	}
+
+	public void setVisibilityRules(List<RulePersist> visibilityRules) {
+		this.visibilityRules = visibilityRules;
+	}
+
+	public List<FieldValidationType> getValidations() {
+		return validations;
+	}
+
+	public void setValidations(List<FieldValidationType> validations) {
+		this.validations = validations;
+	}
+
+	public Boolean getIncludeInExport() {
+		return includeInExport;
+	}
+
+	public void setIncludeInExport(Boolean includeInExport) {
+		this.includeInExport = includeInExport;
+	}
+
+	public BaseFieldDataPersist getData() {
+		return data;
+	}
+
+	public void setData(BaseFieldDataPersist data) {
+		this.data = data;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java
new file mode 100644
index 000000000..f23d9e08d
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/FieldSetPersist.java
@@ -0,0 +1,129 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class FieldSetPersist {
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String id = null;;
+
+	@NotNull(message = "{validation.empty}")
+	private Integer ordinal = null;;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String numbering = null;;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String title = null;;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String description = null;;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String extendedDescription = null;;
+	
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String additionalInformation = null;;
+
+	@NotNull(message = "{validation.empty}")
+	@Valid
+	private MultiplicityPersist multiplicity= null;
+
+
+	@NotNull(message = "{validation.empty}")
+	private Boolean hasCommentField = null;
+
+	@NotNull(message = "{validation.empty}")
+	@Valid
+	private List<FieldPersist> fields = null;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Integer getOrdinal() {
+		return ordinal;
+	}
+
+	public void setOrdinal(Integer ordinal) {
+		this.ordinal = ordinal;
+	}
+
+	public String getNumbering() {
+		return numbering;
+	}
+
+	public void setNumbering(String numbering) {
+		this.numbering = numbering;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getExtendedDescription() {
+		return extendedDescription;
+	}
+
+	public void setExtendedDescription(String extendedDescription) {
+		this.extendedDescription = extendedDescription;
+	}
+
+	public String getAdditionalInformation() {
+		return additionalInformation;
+	}
+
+	public void setAdditionalInformation(String additionalInformation) {
+		this.additionalInformation = additionalInformation;
+	}
+
+	public MultiplicityPersist getMultiplicity() {
+		return multiplicity;
+	}
+
+	public void setMultiplicity(MultiplicityPersist multiplicity) {
+		this.multiplicity = multiplicity;
+	}
+
+	public Boolean getHasCommentField() {
+		return hasCommentField;
+	}
+
+	public void setHasCommentField(Boolean hasCommentField) {
+		this.hasCommentField = hasCommentField;
+	}
+
+	public List<FieldPersist> getFields() {
+		return fields;
+	}
+
+	public void setFields(List<FieldPersist> fields) {
+		this.fields = fields;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/MultiplicityPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/MultiplicityPersist.java
new file mode 100644
index 000000000..9670a1d23
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/MultiplicityPersist.java
@@ -0,0 +1,52 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public abstract class MultiplicityPersist {
+
+	@NotNull(message = "{validation.empty}")
+	private Integer min = null;
+
+	@NotNull(message = "{validation.empty}")
+	private Integer max = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String placeholder = null;
+
+	@NotNull(message = "{validation.empty}")
+	private Boolean tableView = null;
+
+	public Integer getMin() {
+		return min;
+	}
+
+	public void setMin(Integer min) {
+		this.min = min;
+	}
+
+	public Integer getMax() {
+		return max;
+	}
+
+	public void setMax(Integer max) {
+		this.max = max;
+	}
+
+	public String getPlaceholder() {
+		return placeholder;
+	}
+
+	public void setPlaceholder(String placeholder) {
+		this.placeholder = placeholder;
+	}
+
+	public Boolean getTableView() {
+		return tableView;
+	}
+
+	public void setTableView(Boolean tableView) {
+		this.tableView = tableView;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/PagePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/PagePersist.java
new file mode 100644
index 000000000..a7e14e565
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/PagePersist.java
@@ -0,0 +1,44 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition;
+
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class PagePersist {
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String id = null;
+
+	@NotNull(message = "{validation.empty}")
+	private Integer ordinal = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String title = null;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public int getOrdinal() {
+		return ordinal;
+	}
+
+	public void setOrdinal(int ordinal) {
+		this.ordinal = ordinal;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+}
+
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/RulePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/RulePersist.java
new file mode 100644
index 000000000..127786f65
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/RulePersist.java
@@ -0,0 +1,33 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class RulePersist {
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String target = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String value= null;
+
+
+	public String getTarget() {
+		return target;
+	}
+
+	public void setTarget(String target) {
+		this.target = target;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java
new file mode 100644
index 000000000..688a8b653
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java
@@ -0,0 +1,118 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition;
+
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class SectionPersist {
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String id = null;
+
+	@NotNull(message = "{validation.empty}")
+	private Integer ordinal = null;
+
+	@NotNull(message = "{validation.empty}")
+	private Boolean defaultVisibility = null;
+
+	@NotNull(message = "{validation.empty}")
+	private Boolean multiplicity = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String page = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String title = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String description = null;
+
+	@NotNull(message = "{validation.empty}")
+	@Valid
+	private List<SectionPersist> sections = null;
+	
+	@NotNull(message = "{validation.empty}")
+	@Valid
+	private List<FieldSetPersist> fieldSets = null;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public int getOrdinal() {
+		return ordinal;
+	}
+
+	public void setOrdinal(int ordinal) {
+		this.ordinal = ordinal;
+	}
+
+	public Boolean getDefaultVisibility() {
+		return defaultVisibility;
+	}
+
+	public void setDefaultVisibility(Boolean defaultVisibility) {
+		this.defaultVisibility = defaultVisibility;
+	}
+
+	public Boolean getMultiplicity() {
+		return multiplicity;
+	}
+
+	public void setMultiplicity(Boolean multiplicity) {
+		this.multiplicity = multiplicity;
+	}
+
+	public String getPage() {
+		return page;
+	}
+
+	public void setPage(String page) {
+		this.page = page;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public List<SectionPersist> getSections() {
+		return sections;
+	}
+
+	public void setSections(List<SectionPersist> sections) {
+		this.sections = sections;
+	}
+
+	public List<FieldSetPersist> getFieldSets() {
+		return fieldSets;
+	}
+
+	public void setFieldSets(List<FieldSetPersist> fieldSets) {
+		this.fieldSets = fieldSets;
+	}
+}
+
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataPersist.java
new file mode 100644
index 000000000..f075bc094
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataPersist.java
@@ -0,0 +1,66 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class AuthAutoCompleteDataPersist {
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String url = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String method = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String body = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String path = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String type = null;
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+
+	public String getBody() {
+		return body;
+	}
+
+	public void setBody(String body) {
+		this.body = body;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java
new file mode 100644
index 000000000..1ccdc7c1c
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteDataPersist.java
@@ -0,0 +1,27 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class AutoCompleteDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    @NotNull(message = "{validation.empty}")
+    @Valid
+    private List<AutoCompleteSingleDataPersist> autoCompleteSingleDataList = null;
+
+    public Boolean getMultiAutoComplete() { return multiAutoComplete; }
+    public void setMultiAutoComplete(Boolean multiAutoComplete) { this.multiAutoComplete = multiAutoComplete; }
+
+    public List<AutoCompleteSingleDataPersist> getAutoCompleteSingleDataList() {
+        return autoCompleteSingleDataList;
+    }
+
+    public void setAutoCompleteSingleDataList(List<AutoCompleteSingleDataPersist> autoCompleteSingleDataList) {
+        this.autoCompleteSingleDataList = autoCompleteSingleDataList;
+    }
+}
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataPersist.java
new file mode 100644
index 000000000..262083e6c
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataPersist.java
@@ -0,0 +1,88 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
+import eu.eudat.commons.validation.ValidEnum;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class AutoCompleteSingleDataPersist {
+
+	@ValidEnum(message = "{validation.empty}")
+	private AutoCompleteDataEntity.AutocompleteType autocompleteType;
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String url = null;
+	
+	@Valid
+	private ComboBoxOptionPersist autoCompleteOptions;
+	
+	private String optionsRoot;
+
+
+	@NotNull(message = "{validation.empty}")
+	private Boolean hasAuth = null;
+
+	@Valid
+	private AuthAutoCompleteDataPersist auth;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String method = null;
+
+	public AutoCompleteDataEntity.AutocompleteType getAutocompleteType() {
+		return autocompleteType;
+	}
+
+	public void setAutocompleteType(AutoCompleteDataEntity.AutocompleteType autocompleteType) {
+		this.autocompleteType = autocompleteType;
+	}
+
+	public String getOptionsRoot() {
+		return optionsRoot;
+	}
+
+	public void setOptionsRoot(String optionsRoot) {
+		this.optionsRoot = optionsRoot;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public Boolean getHasAuth() {
+		return hasAuth;
+	}
+
+	public void setHasAuth(Boolean hasAuth) {
+		this.hasAuth = hasAuth;
+	}
+
+	public AuthAutoCompleteDataPersist getAuth() {
+		return auth;
+	}
+
+	public void setAuth(AuthAutoCompleteDataPersist auth) {
+		this.auth = auth;
+	}
+
+	public ComboBoxOptionPersist getAutoCompleteOptions() {
+		return autoCompleteOptions;
+	}
+
+	public void setAutoCompleteOptions(ComboBoxOptionPersist autoCompleteOptions) {
+		this.autoCompleteOptions = autoCompleteOptions;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+}
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
new file mode 100644
index 000000000..ce9df1d07
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BaseFieldDataPersist.java
@@ -0,0 +1,71 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.validation.ValidEnum;
+import eu.eudat.model.persist.dmpblueprintdefinition.ExtraFieldPersist;
+import eu.eudat.model.persist.dmpblueprintdefinition.SystemFieldPersist;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+@JsonTypeInfo(
+		use = JsonTypeInfo.Id.NAME,
+		include = JsonTypeInfo.As.PROPERTY,
+		property = "fieldType",
+		visible = true)
+@JsonSubTypes({
+		@JsonSubTypes.Type(value = AutoCompleteDataPersist.class, name = "autocomplete"),
+		@JsonSubTypes.Type(value = BooleanDecisionDataPersist.class, name = "booleanDecision"),
+		@JsonSubTypes.Type(value = DatasetAutoCompleteDataPersist.class, name = "internalDmpDatasets"),
+		@JsonSubTypes.Type(value = DmpAutoCompleteDataPersist.class, name = "internalDmpDmps"),
+		@JsonSubTypes.Type(value = CheckBoxDataPersist.class, name = "checkBox"),
+		@JsonSubTypes.Type(value = DatePickerDataPersist.class, name = "datePicker"),
+		@JsonSubTypes.Type(value = ExternalDatasetDataPersist.class, name = "externalDatasets"),
+		@JsonSubTypes.Type(value = FreeTextDataPersist.class, name = "freetext"),
+		@JsonSubTypes.Type(value = LicenseDataPersist.class, name = "licenses"),
+		@JsonSubTypes.Type(value = OrganizationDataPersist.class, name = "organizations"),
+		@JsonSubTypes.Type(value = PublicationDataPersist.class, name = "publications"),
+		@JsonSubTypes.Type(value = RadioBoxDataPersist.class, name = "radiobox"),
+		@JsonSubTypes.Type(value = RegistryDataPersist.class, name = "registries"),
+		@JsonSubTypes.Type(value = ResearcherAutoCompleteDataPersist.class, name = "internalDmpResearchers"),
+		@JsonSubTypes.Type(value = ResearcherDataPersist.class, name = "researchers"),
+		@JsonSubTypes.Type(value = RichTextAreaDataPersist.class, name = "richTextarea"),
+		@JsonSubTypes.Type(value = ServiceDataPersist.class, name = "services"),
+		@JsonSubTypes.Type(value = TagDataPersist.class, name = "tags"),
+		@JsonSubTypes.Type(value = TaxonomyDataPersist.class, name = "taxonomies"),
+		@JsonSubTypes.Type(value = TextAreaDataPersist.class, name = "textarea"),
+		@JsonSubTypes.Type(value = UploadDataPersist.class, name = "upload"),
+		@JsonSubTypes.Type(value = ValidationDataPersist.class, name = "validation"),
+		@JsonSubTypes.Type(value = DatasetIdentifierDataPersist.class, name = "datasetIdentifier"),
+		@JsonSubTypes.Type(value = CurrencyDataPersist.class, name = "currency"),
+		@JsonSubTypes.Type(value = WordListDataPersist.class, name = "wordlist"),
+		@JsonSubTypes.Type(value = DataRepositoryDataPersist.class, name = "dataRepositories"),
+		@JsonSubTypes.Type(value = JournalRepositoryDataPersist.class, name = "journalRepositories"),
+		@JsonSubTypes.Type(value = PublicationRepositoryDataPersist.class, name = "pubRepositories"),
+})
+public abstract class BaseFieldDataPersist {
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String label = null;
+
+	@ValidEnum(message = "{validation.empty}")
+	private FieldType fieldType;
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public FieldType getFieldType() {
+		return fieldType;
+	}
+
+	public void setFieldType(FieldType fieldType) {
+		this.fieldType = fieldType;
+	}
+}
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
new file mode 100644
index 000000000..2815510f5
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/BooleanDecisionDataPersist.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+public class BooleanDecisionDataPersist extends BaseFieldDataPersist {
+
+}
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/CheckBoxDataPersist.java
new file mode 100644
index 000000000..81885a3c3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CheckBoxDataPersist.java
@@ -0,0 +1,6 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+public class CheckBoxDataPersist extends BaseFieldDataPersist {
+
+    
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ComboBoxOptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ComboBoxOptionPersist.java
new file mode 100644
index 000000000..c4b358a2e
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ComboBoxOptionPersist.java
@@ -0,0 +1,53 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class ComboBoxOptionPersist {
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String label  = null;
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String value  = null;
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String source  = null;
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String uri = null;
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	public String getUri() {
+		return uri;
+	}
+
+	public void setUri(String uri) {
+		this.uri = uri;
+	}
+
+
+}
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
new file mode 100644
index 000000000..1f61c3f43
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/CurrencyDataPersist.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+public class CurrencyDataPersist extends BaseFieldDataPersist {
+    
+}
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
new file mode 100644
index 000000000..04942d7fe
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DataRepositoryDataPersist.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class DataRepositoryDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataPersist.java
new file mode 100644
index 000000000..13003c3c9
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataPersist.java
@@ -0,0 +1,15 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class DatasetAutoCompleteDataPersist extends BaseFieldDataPersist {
+	@NotNull(message = "{validation.empty}")
+	private Boolean multiAutoComplete = null;
+
+	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/persist/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataPersist.java
new file mode 100644
index 000000000..c0d0f6163
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataPersist.java
@@ -0,0 +1,6 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+public class DatasetIdentifierDataPersist extends BaseFieldDataPersist {
+  
+}
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
new file mode 100644
index 000000000..1e3b4ddfb
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DatePickerDataPersist.java
@@ -0,0 +1,4 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+public class DatePickerDataPersist extends BaseFieldDataPersist {
+}
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
new file mode 100644
index 000000000..c7cec3ea4
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataPersist.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class DmpAutoCompleteDataPersist extends BaseFieldDataPersist {
+
+	@NotNull(message = "{validation.empty}")
+	private Boolean multiAutoComplete = null;
+
+	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/persist/descriptiontemplatedefinition/fielddata/ExternalDatasetDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ExternalDatasetDataPersist.java
new file mode 100644
index 000000000..c345a7dab
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ExternalDatasetDataPersist.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import eu.eudat.commons.enums.FieldDataExternalDatasetType;
+import eu.eudat.commons.validation.ValidEnum;
+import jakarta.validation.constraints.NotNull;
+
+public class ExternalDatasetDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+    @ValidEnum(message = "{validation.empty}")
+    private FieldDataExternalDatasetType type;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+    public FieldDataExternalDatasetType getType() {
+        return type;
+    }
+
+    public void setType(FieldDataExternalDatasetType type) {
+        this.type = type;
+    }
+}
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
new file mode 100644
index 000000000..caf84f8af
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/FreeTextDataPersist.java
@@ -0,0 +1,4 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+public class FreeTextDataPersist extends BaseFieldDataPersist {
+}
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
new file mode 100644
index 000000000..de1d7f3b1
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/JournalRepositoryDataPersist.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class JournalRepositoryDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/LicenseDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LicenseDataPersist.java
new file mode 100644
index 000000000..2d33a5f18
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/LicenseDataPersist.java
@@ -0,0 +1,17 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class LicenseDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/OrganizationDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/OrganizationDataPersist.java
new file mode 100644
index 000000000..fc5cde675
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/OrganizationDataPersist.java
@@ -0,0 +1,17 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class OrganizationDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/PublicationDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationDataPersist.java
new file mode 100644
index 000000000..db1854960
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationDataPersist.java
@@ -0,0 +1,18 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import jakarta.validation.constraints.NotNull;
+
+public class PublicationDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    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/persist/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataPersist.java
new file mode 100644
index 000000000..c5055221b
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/PublicationRepositoryDataPersist.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class PublicationRepositoryDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java
new file mode 100644
index 000000000..c50714189
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxDataPersist.java
@@ -0,0 +1,21 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class RadioBoxDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    @Valid
+    private List<RadioBoxOptionPersist> options = null;
+
+    public List<RadioBoxOptionPersist> getOptions() {
+        return options;
+    }
+
+    public void setOptions(List<RadioBoxOptionPersist> options) {
+        this.options = options;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxOptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxOptionPersist.java
new file mode 100644
index 000000000..5fcd6fd47
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RadioBoxOptionPersist.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class RadioBoxOptionPersist {
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String label = null;
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String value = null;
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}
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
new file mode 100644
index 000000000..f985d5619
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RegistryDataPersist.java
@@ -0,0 +1,18 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import jakarta.validation.constraints.NotNull;
+
+public class RegistryDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataPersist.java
new file mode 100644
index 000000000..6badb3b84
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataPersist.java
@@ -0,0 +1,15 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotNull;
+
+public class ResearcherAutoCompleteDataPersist extends BaseFieldDataPersist {
+	@NotNull(message = "{validation.empty}")
+	private Boolean multiAutoComplete = null;
+
+	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/persist/descriptiontemplatedefinition/fielddata/ResearcherDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherDataPersist.java
new file mode 100644
index 000000000..15f63835e
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ResearcherDataPersist.java
@@ -0,0 +1,18 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import jakarta.validation.constraints.NotNull;
+
+public class ResearcherDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/RichTextAreaDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RichTextAreaDataPersist.java
new file mode 100644
index 000000000..e0ec93581
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/RichTextAreaDataPersist.java
@@ -0,0 +1,6 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+public class RichTextAreaDataPersist extends BaseFieldDataPersist {
+    
+}
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
new file mode 100644
index 000000000..8831e617e
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ServiceDataPersist.java
@@ -0,0 +1,17 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import jakarta.validation.constraints.NotNull;
+
+public class ServiceDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/TagDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TagDataPersist.java
new file mode 100644
index 000000000..c3754bfa4
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TagDataPersist.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+public class TagDataPersist extends BaseFieldDataPersist {
+}
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
new file mode 100644
index 000000000..81135f613
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TaxonomyDataPersist.java
@@ -0,0 +1,18 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import jakarta.validation.constraints.NotNull;
+
+public class TaxonomyDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiAutoComplete = null;
+
+    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/persist/descriptiontemplatedefinition/fielddata/TextAreaDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TextAreaDataPersist.java
new file mode 100644
index 000000000..2ca56871c
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/TextAreaDataPersist.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+public class TextAreaDataPersist extends BaseFieldDataPersist {
+    
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java
new file mode 100644
index 000000000..2810249e6
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadDataPersist.java
@@ -0,0 +1,34 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class UploadDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    @Valid
+    private List<UploadOptionPersist> types = null;
+
+    public List<UploadOptionPersist> getTypes() {
+        return types;
+    }
+
+    public void setTypes(List<UploadOptionPersist> types) {
+        this.types = types;
+    }
+
+    private Integer maxFileSizeInMB;
+
+    public Integer getMaxFileSizeInMB() {
+        return maxFileSizeInMB;
+    }
+
+    public void setMaxFileSizeInMB(Integer maxFileSizeInMB) {
+        this.maxFileSizeInMB = maxFileSizeInMB;
+    }
+
+    
+}
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadOptionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadOptionPersist.java
new file mode 100644
index 000000000..8731d91f9
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/UploadOptionPersist.java
@@ -0,0 +1,31 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class UploadOptionPersist {
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String label = null;
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String value = null;
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}
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
new file mode 100644
index 000000000..383899149
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/ValidationDataPersist.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+public class ValidationDataPersist extends BaseFieldDataPersist {
+  
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java
new file mode 100644
index 000000000..b4f85572c
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/fielddata/WordListDataPersist.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.persist.descriptiontemplatedefinition.fielddata;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public class WordListDataPersist extends BaseFieldDataPersist {
+    @NotNull(message = "{validation.empty}")
+    @Valid
+    private List<ComboBoxOptionPersist> options = null;
+    @NotNull(message = "{validation.empty}")
+    private Boolean multiList = null;
+
+    public List<ComboBoxOptionPersist> getOptions() {
+        return options;
+    }
+
+    public void setOptions(List<ComboBoxOptionPersist> options) {
+        this.options = options;
+    }
+
+    public Boolean getMultiList() {
+        return multiList;
+    }
+
+    public void setMultiList(Boolean multiList) {
+        this.multiList = multiList;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateService.java b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateService.java
new file mode 100644
index 000000000..0dcd84068
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateService.java
@@ -0,0 +1,20 @@
+package eu.eudat.service.descriptiontemplate;
+
+import eu.eudat.model.DescriptionTemplate;
+import eu.eudat.model.persist.DescriptionTemplatePersist;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.exception.MyForbiddenException;
+import gr.cite.tools.exception.MyNotFoundException;
+import gr.cite.tools.exception.MyValidationException;
+import gr.cite.tools.fieldset.FieldSet;
+
+import javax.management.InvalidApplicationException;
+import java.util.UUID;
+
+public interface DescriptionTemplateService {
+
+    DescriptionTemplate persist(DescriptionTemplatePersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException;
+
+    void deleteAndSave(UUID id) throws MyForbiddenException, InvalidApplicationException;
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java
new file mode 100644
index 000000000..00f63a026
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java
@@ -0,0 +1,121 @@
+package eu.eudat.service.descriptiontemplate;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.authorization.Permission;
+import eu.eudat.commons.JsonHandlingService;
+import eu.eudat.commons.enums.IsActive;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.data.DescriptionTemplateEntity;
+import eu.eudat.errorcode.ErrorThesaurusProperties;
+import eu.eudat.event.EventBroker;
+import eu.eudat.model.DescriptionTemplate;
+import eu.eudat.model.builder.DescriptionTemplateBuilder;
+import eu.eudat.model.deleter.DescriptionTemplateDeleter;
+import eu.eudat.model.persist.DescriptionTemplatePersist;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.data.deleter.DeleterFactory;
+import gr.cite.tools.data.query.QueryFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.exception.MyForbiddenException;
+import gr.cite.tools.exception.MyNotFoundException;
+import gr.cite.tools.exception.MyValidationException;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import gr.cite.tools.logging.MapLogEntry;
+import jakarta.persistence.EntityManager;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.stereotype.Service;
+
+import javax.management.InvalidApplicationException;
+import java.time.Instant;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class DescriptionTemplateServiceImpl implements DescriptionTemplateService {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(DescriptionTemplateServiceImpl.class));
+
+    private final EntityManager entityManager;
+
+    private final AuthorizationService authorizationService;
+
+    private final DeleterFactory deleterFactory;
+
+    private final BuilderFactory builderFactory;
+
+    private final ConventionService conventionService;
+
+
+    private final MessageSource messageSource;
+
+
+
+    @Autowired
+    public DescriptionTemplateServiceImpl(
+            EntityManager entityManager,
+            AuthorizationService authorizationService,
+            DeleterFactory deleterFactory,
+            BuilderFactory builderFactory,
+            ConventionService conventionService,
+            MessageSource messageSource) {
+        this.entityManager = entityManager;
+        this.authorizationService = authorizationService;
+        this.deleterFactory = deleterFactory;
+        this.builderFactory = builderFactory;
+        this.conventionService = conventionService;
+        this.messageSource = messageSource;
+    }
+
+    public DescriptionTemplate persist(DescriptionTemplatePersist model, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException, InvalidApplicationException {
+        logger.debug(new MapLogEntry("persisting data descriptionTemplateType").And("model", model).And("fields", fields));
+
+        this.authorizationService.authorizeForce(Permission.EditDescriptionTemplate);
+
+        Boolean isUpdate = this.conventionService.isValidGuid(model.getId());
+
+        DescriptionTemplateEntity data;
+        if (isUpdate) {
+            data = this.entityManager.find(DescriptionTemplateEntity.class, model.getId());
+            if (data == null)
+                throw new MyNotFoundException(messageSource.getMessage("General_ItemNotFound", new Object[]{model.getId(), DescriptionTemplate.class.getSimpleName()}, LocaleContextHolder.getLocale()));
+        } else {
+            data = new DescriptionTemplateEntity();
+            data.setId(UUID.randomUUID());
+            data.setIsActive(IsActive.Active);
+            data.setCreatedAt(Instant.now());
+        }
+
+        data.setDescription(model.getDescription());
+        data.setLabel(model.getLabel());
+        data.setGroupId(model.getGroupId());
+        data.setVersion(model.getVersion());
+        data.setType(model.getType());
+        data.setLanguage(model.getLanguage());
+        data.setStatus(model.getStatus());
+        data.setUpdatedAt(Instant.now());
+        if (isUpdate)
+            this.entityManager.merge(data);
+        else
+            this.entityManager.persist(data);
+
+        this.entityManager.flush();
+
+        return this.builderFactory.builder(DescriptionTemplateBuilder.class).authorize(AuthorizationFlags.OwnerOrPermission).build(BaseFieldSet.build(fields, DescriptionTemplate._id), data);
+    }
+
+    public void deleteAndSave(UUID id) throws MyForbiddenException, InvalidApplicationException {
+        logger.debug("deleting dataset: {}", id);
+
+        this.authorizationService.authorizeForce(Permission.DeleteDescriptionTemplate);
+
+        this.deleterFactory.deleter(DescriptionTemplateDeleter.class).deleteAndSaveByIds(List.of(id));
+    }
+
+}
+
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
new file mode 100644
index 000000000..82055030e
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/AutoCompleteFieldDataHelperService.java
@@ -0,0 +1,59 @@
+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.AutoCompleteDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.AutoCompleteDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.AutoCompleteData;
+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
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+
+public class AutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<AutoCompleteData, AutoCompleteDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public AutoCompleteFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.AUTO_COMPLETE;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new AutoCompleteDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new AutoCompleteData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return AutoCompleteDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return AutoCompleteData.class;
+	}
+
+	@Override
+	public List<AutoCompleteData> buildInternal(FieldSet fieldSet, List<AutoCompleteDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(AutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ComboBoxFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ComboBoxFieldDataHelperService.java
deleted file mode 100644
index 9c7b329a7..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ComboBoxFieldDataHelperService.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldDataComboBoxType;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.*;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.AutoCompleteDataBuilder;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.WordListDataBuilder;
-import eu.eudat.model.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.EnumSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public abstract class ComboBoxFieldDataHelperService extends BaseFieldDataHelperService<ComboBoxData, ComboBoxDataEntity<?>> {
-
-	private final BuilderFactory builderFactory;
-	private final ConventionService conventionService;
-	
-	public ComboBoxFieldDataHelperService(BuilderFactory builderFactory, ConventionService conventionService) {
-		this.builderFactory = builderFactory;
-		this.conventionService = conventionService;
-	}
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.COMBO_BOX;
-	}
-
-	@Override
-	public BaseFieldDataEntity<?> newDataInstance() {
-		switch (this.getComboBoxType()){
-			case Wordlist: return new WordListDataEntity();
-			case Autocomplete: return new AutoCompleteDataEntity();
-			default: throw new RuntimeException("Invalid type " + this.getComboBoxType());
-		}
-	}
-
-	@Override
-	public BaseFieldData newModelInstance() {
-		switch (this.getComboBoxType()){
-			case Wordlist: return new WordListData();
-			case Autocomplete: return new AutoCompleteData();
-			default: throw new RuntimeException("Invalid type " + this.getComboBoxType());
-		}
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		switch (this.getComboBoxType()){
-			case Wordlist: return WordListDataEntity.class;
-			case Autocomplete: return AutoCompleteDataEntity.class;
-			default: throw new RuntimeException("Invalid type " + this.getComboBoxType());
-		}
-	}
-	@Override
-	public Class<?> getModelClass() {
-		switch (this.getComboBoxType()){
-			case Wordlist: return WordListData.class;
-			case Autocomplete: return AutoCompleteData.class;
-			default: throw new RuntimeException("Invalid type " + this.getComboBoxType());
-		}
-	}
-
-	@Override
-	public final boolean requireSubType(){
-		return false;
-	}
-	
-	private FieldDataComboBoxType getComboBoxType(){
-		if (!this.conventionService.isNullOrEmpty(this.subType)){
-			throw new RuntimeException("Sub type required");
-		}
-		FieldDataComboBoxType fieldDataComboBoxType = FieldDataComboBoxType.of(this.subType);
-		if (fieldDataComboBoxType == null){
-			throw new RuntimeException("Sub type required");
-		}
-		return fieldDataComboBoxType;
-	}
-	
-	public List<ComboBoxData> buildInternal(FieldSet fieldSet, List<ComboBoxDataEntity<?>> datas, EnumSet<AuthorizationFlags> authorizationFlags){
-		switch (this.getComboBoxType()){
-			case Wordlist: return this.builderFactory.builder(WordListDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas.stream().map(x-> (WordListDataEntity)x).collect(Collectors.toList()));
-			case Autocomplete: return this.builderFactory.builder(AutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas.stream().map(x-> (AutoCompleteDataEntity)x).collect(Collectors.toList()));
-			default: throw new RuntimeException("Invalid type " + this.getComboBoxType());
-		}
-	}
-}
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
new file mode 100644
index 000000000..d8eca07b6
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetAutoCompleteFieldDataHelperService.java
@@ -0,0 +1,59 @@
+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.DatasetAutoCompleteDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DatasetAutoCompleteDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetAutoCompleteData;
+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
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+
+public class DatasetAutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<DatasetAutoCompleteData, DatasetAutoCompleteDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public DatasetAutoCompleteFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.INTERNAL_DMP_ENTRIES_DATASETS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new DatasetAutoCompleteDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new DatasetAutoCompleteData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return DatasetAutoCompleteDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return DatasetAutoCompleteData.class;
+	}
+
+	@Override
+	public List<DatasetAutoCompleteData> buildInternal(FieldSet fieldSet, List<DatasetAutoCompleteDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(DatasetAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
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
new file mode 100644
index 000000000..620cb15ce
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DmpAutoCompleteFieldDataHelperService.java
@@ -0,0 +1,59 @@
+package eu.eudat.service.fielddatahelper;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.DmpAutoCompleteDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DmpAutoCompleteDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DmpAutoCompleteData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+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
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+
+public class DmpAutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<DmpAutoCompleteData, DmpAutoCompleteDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public DmpAutoCompleteFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.INTERNAL_DMP_ENTRIES_DMPS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new DmpAutoCompleteDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new DmpAutoCompleteData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return DmpAutoCompleteDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return DmpAutoCompleteData.class;
+	}
+
+	@Override
+	public List<DmpAutoCompleteData> buildInternal(FieldSet fieldSet, List<DmpAutoCompleteDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(DmpAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
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 636ef2023..82fc0fff6 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
@@ -14,14 +14,6 @@ public class FieldDataHelperServiceProvider {
 		FieldDataHelperService item = null;
 		
 		switch (type) {
-			case COMBO_BOX: { 
-				item = this.applicationContext.getBean(ComboBoxFieldDataHelperService.class);
-				break;
-			}
-			case INTERNAL_DMP_ENTRIES: {
-				item = this.applicationContext.getBean(InternalDmpBaseFieldDataHelperService.class);
-				break;
-			}
 			case BOOLEAN_DECISION:  {
 				item = this.applicationContext.getBean(BooleanDecisionFieldDataHelperService.class);
 				break;
@@ -58,12 +50,18 @@ public class FieldDataHelperServiceProvider {
 				item = this.applicationContext.getBean(ExternalDatasetFieldDataHelperService.class);
 				break;
 			}
-			case DATA_REPOSITORIES: 
-			case PUB_REPOSITORIES:
-			case JOURNAL_REPOSITORIES:  {
+			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;
@@ -108,9 +106,29 @@ public class FieldDataHelperServiceProvider {
 				item = this.applicationContext.getBean(ValidationFieldDataHelperService.class);
 				break;
 			}
+			case WORD_LIST: {
+				item = this.applicationContext.getBean(ValidationFieldDataHelperService.class);
+				break;
+			}
+			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 Builder) {
+		if (item != null && item instanceof FieldDataHelperService) {
 			return item;
 		} else {
 			throw new RuntimeException("unrecognized builder " + type.getValue());
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/InternalDmpBaseFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/InternalDmpBaseFieldDataHelperService.java
deleted file mode 100644
index a6b9347f6..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/InternalDmpBaseFieldDataHelperService.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package eu.eudat.service.fielddatahelper;
-
-import eu.eudat.authorization.AuthorizationFlags;
-import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
-import eu.eudat.commons.enums.FieldType;
-import eu.eudat.commons.types.descriptiontemplate.fielddata.*;
-import eu.eudat.convention.ConventionService;
-import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.*;
-import eu.eudat.model.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.EnumSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Component
-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-public class InternalDmpBaseFieldDataHelperService extends BaseFieldDataHelperService<InternalDmpBaseData, InternalDmpBaseDataEntity<?>> {
-
-	private final BuilderFactory builderFactory;
-	private final ConventionService conventionService;
-	
-	public InternalDmpBaseFieldDataHelperService(BuilderFactory builderFactory, ConventionService conventionService) {
-		this.builderFactory = builderFactory;
-		this.conventionService = conventionService;
-	}
-
-	@Override
-	public FieldType getFormType() {
-		return FieldType.INTERNAL_DMP_ENTRIES;
-	}
-
-	@Override
-	public BaseFieldDataEntity<?> newDataInstance() {
-		switch (this.getInternalDmpType()){
-			case Dmps: return new DmpAutoCompleteDataEntity();
-			case Datasets: return new DatasetAutoCompleteDataEntity();
-			case Researchers: return new ResearcherAutoCompleteDataEntity();
-			default: throw new RuntimeException("Invalid type " + this.getInternalDmpType());
-		}
-	}
-
-	@Override
-	public BaseFieldData newModelInstance() {
-		switch (this.getInternalDmpType()){
-			case Dmps: return new DmpAutoCompleteData();
-			case Datasets: return new DatasetAutoCompleteData();
-			case Researchers: return new ResearcherAutoCompleteData();
-			default: throw new RuntimeException("Invalid type " + this.getInternalDmpType());
-		}
-	}
-
-	@Override
-	public Class<?> getDataClass() {
-		switch (this.getInternalDmpType()){
-			case Dmps: return DmpAutoCompleteDataEntity.class;
-			case Datasets: return DatasetAutoCompleteDataEntity.class;
-			case Researchers: return ResearcherAutoCompleteDataEntity.class;
-			default: throw new RuntimeException("Invalid type " + this.getInternalDmpType());
-		}
-	}
-	@Override
-	public Class<?> getModelClass() {
-		switch (this.getInternalDmpType()){
-			case Dmps: return DmpAutoCompleteData.class;
-			case Datasets: return DatasetAutoCompleteData.class;
-			case Researchers: return ResearcherAutoCompleteData.class;
-			default: throw new RuntimeException("Invalid type " + this.getInternalDmpType());
-		}
-	}
-
-	@Override
-	public final boolean requireSubType(){
-		return false;
-	}
-	
-	private FieldDataInternalDmpEntryType getInternalDmpType(){
-		if (!this.conventionService.isNullOrEmpty(this.subType)){
-			throw new RuntimeException("Sub type required");
-		}
-		FieldDataInternalDmpEntryType fieldDataComboBoxType = FieldDataInternalDmpEntryType.of(this.subType);
-		if (fieldDataComboBoxType == null){
-			throw new RuntimeException("Sub type required");
-		}
-		return fieldDataComboBoxType;
-	}
-	
-	public List<InternalDmpBaseData> buildInternal(FieldSet fieldSet, List<InternalDmpBaseDataEntity<?>> datas, EnumSet<AuthorizationFlags> authorizationFlags){
-		switch (this.getInternalDmpType()){
-			case Dmps: return this.builderFactory.builder(DmpAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas.stream().map(x-> (DmpAutoCompleteDataEntity)x).collect(Collectors.toList()));
-			case Datasets: return this.builderFactory.builder(DatasetAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas.stream().map(x-> (DatasetAutoCompleteDataEntity)x).collect(Collectors.toList()));
-			case Researchers: return this.builderFactory.builder(ResearcherAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas.stream().map(x-> (ResearcherAutoCompleteDataEntity)x).collect(Collectors.toList()));
-			default: throw new RuntimeException("Invalid type " + this.getInternalDmpType());
-		}
-	}
-}
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
new file mode 100644
index 000000000..4982263e6
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/JournalRepositoryFieldDataHelperService.java
@@ -0,0 +1,62 @@
+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.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 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
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+
+public class JournalRepositoryFieldDataHelperService extends BaseFieldDataHelperService<JournalRepositoryData, JournalRepositoryDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public JournalRepositoryFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.JOURNAL_REPOSITORIES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new JournalRepositoryDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new JournalRepositoryData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return JournalRepositoryDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return JournalRepositoryData.class;
+	}
+
+	@Override
+	public List<JournalRepositoryData> buildInternal(FieldSet fieldSet, List<JournalRepositoryDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(JournalRepositoryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
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
new file mode 100644
index 000000000..e7f738262
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationRepositoryFieldDataHelperService.java
@@ -0,0 +1,62 @@
+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.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 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
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+
+public class PublicationRepositoryFieldDataHelperService extends BaseFieldDataHelperService<PublicationRepositoryData, PublicationRepositoryDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public PublicationRepositoryFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.PUB_REPOSITORIES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new PublicationRepositoryDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new PublicationRepositoryData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return PublicationRepositoryDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return PublicationRepositoryData.class;
+	}
+
+	@Override
+	public List<PublicationRepositoryData> buildInternal(FieldSet fieldSet, List<PublicationRepositoryDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(PublicationRepositoryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
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
new file mode 100644
index 000000000..c7ba1fce0
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherAutoCompleteFieldDataHelperService.java
@@ -0,0 +1,59 @@
+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.ResearcherAutoCompleteDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ResearcherAutoCompleteDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherAutoCompleteData;
+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
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+
+public class ResearcherAutoCompleteFieldDataHelperService extends BaseFieldDataHelperService<ResearcherAutoCompleteData, ResearcherAutoCompleteDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public ResearcherAutoCompleteFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.INTERNAL_DMP_ENTRIES_RESEARCHERS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new ResearcherAutoCompleteDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new ResearcherAutoCompleteData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return ResearcherAutoCompleteDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return ResearcherAutoCompleteData.class;
+	}
+
+	@Override
+	public List<ResearcherAutoCompleteData> buildInternal(FieldSet fieldSet, List<ResearcherAutoCompleteDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(ResearcherAutoCompleteDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
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
new file mode 100644
index 000000000..3cec0c8f5
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/WordListFieldDataHelperService.java
@@ -0,0 +1,62 @@
+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.WordListDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.WordListDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.WordListDataBuilder;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.WordListDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.WordListData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.WordListData;
+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
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+
+public class WordListFieldDataHelperService extends BaseFieldDataHelperService<WordListData, WordListDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public WordListFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.WORD_LIST;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new WordListDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new WordListData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return WordListDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return WordListData.class;
+	}
+
+	@Override
+	public List<WordListData> buildInternal(FieldSet fieldSet, List<WordListDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(WordListDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
index a264f30fc..ecfc624b9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
@@ -168,19 +168,19 @@ public class Admin extends BaseController {
 		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().payload(datasetprofile));
 	}
 
-	@Transactional
-	@RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, consumes = "application/json", produces = "application/json")
-	public @ResponseBody
-	ResponseEntity<ResponseItem<DatasetProfile>> inactivate(@PathVariable String id) {
-		this.authorizationService.authorizeForce(Permission.AdminRole, Permission.DatasetProfileManagerRole);
-
-		try {
-			DescriptionTemplateEntity ret = AdminManager.inactivate(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao(), this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id);
-			return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.SUCCESS_MESSAGE));
-		} catch (DatasetProfileWithDatasetsExeption | InvalidApplicationException exception) {
-			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.UNSUCCESS_DELETE).message(exception.getMessage()));
-		}
-	}
+//	@Transactional
+//	@RequestMapping(method = RequestMethod.DELETE, value = {"{id}"}, consumes = "application/json", produces = "application/json")
+//	public @ResponseBody
+//	ResponseEntity<ResponseItem<DatasetProfile>> inactivate(@PathVariable String id) {
+//		this.authorizationService.authorizeForce(Permission.AdminRole, Permission.DatasetProfileManagerRole);
+//
+//		try {
+//			DescriptionTemplateEntity ret = AdminManager.inactivate(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao(), this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id);
+//			return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.SUCCESS_MESSAGE));
+//		} catch (DatasetProfileWithDatasetsExeption | InvalidApplicationException exception) {
+//			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.UNSUCCESS_DELETE).message(exception.getMessage()));
+//		}
+//	}
 
 	@Transactional
 	@RequestMapping(method = RequestMethod.GET, value = {"/getXml/{id}"}, produces = "application/json")
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java
index d0b81d22b..700cb4170 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java
@@ -6,9 +6,11 @@ import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.model.DescriptionTemplate;
 import eu.eudat.model.builder.DescriptionTemplateBuilder;
 import eu.eudat.model.censorship.DescriptionTemplateCensor;
+import eu.eudat.model.persist.DescriptionTemplatePersist;
 import eu.eudat.model.result.QueryResult;
 import eu.eudat.query.DescriptionTemplateQuery;
 import eu.eudat.query.lookup.DescriptionTemplateLookup;
+import eu.eudat.service.descriptiontemplate.DescriptionTemplateService;
 import gr.cite.tools.auditing.AuditService;
 import gr.cite.tools.data.builder.BuilderFactory;
 import gr.cite.tools.data.censor.CensorFactory;
@@ -19,10 +21,12 @@ import gr.cite.tools.exception.MyNotFoundException;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.LoggerService;
 import gr.cite.tools.logging.MapLogEntry;
+import gr.cite.tools.validation.MyValidate;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.management.InvalidApplicationException;
 import java.util.*;
@@ -37,7 +41,7 @@ public class DescriptionTemplateController {
 
     private final AuditService auditService;
 
-//    private final DescriptionTemplateService descriptionTemplateTypeService;
+    private final DescriptionTemplateService descriptionTemplateTypeService;
 
     private final CensorFactory censorFactory;
 
@@ -48,13 +52,13 @@ public class DescriptionTemplateController {
     public DescriptionTemplateController(
             BuilderFactory builderFactory,
             AuditService auditService,
-//            DescriptionTemplateService descriptionTemplateTypeService,
+            DescriptionTemplateService descriptionTemplateTypeService,
             CensorFactory censorFactory,
             QueryFactory queryFactory,
             MessageSource messageSource) {
         this.builderFactory = builderFactory;
         this.auditService = auditService;
-//        this.descriptionTemplateTypeService = descriptionTemplateTypeService;
+        this.descriptionTemplateTypeService = descriptionTemplateTypeService;
         this.censorFactory = censorFactory;
         this.queryFactory = queryFactory;
         this.messageSource = messageSource;
@@ -98,28 +102,28 @@ public class DescriptionTemplateController {
         return model;
     }
 
-//    @PostMapping("persist")
-//    @Transactional
-//    public DescriptionTemplate Persist(@MyValidate @RequestBody DescriptionTemplatePersist model, FieldSet fieldSet) throws MyApplicationException, MyForbiddenException, MyNotFoundException, InvalidApplicationException {
-//        logger.debug(new MapLogEntry("persisting" + DescriptionTemplate.class.getSimpleName()).And("model", model).And("fieldSet", fieldSet));
-//        DescriptionTemplate persisted = this.descriptionTemplateTypeService.persist(model, fieldSet);
-//
-//        this.auditService.track(AuditableAction.DescriptionTemplate_Persist, Map.ofEntries(
-//                new AbstractMap.SimpleEntry<String, Object>("model", model),
-//                new AbstractMap.SimpleEntry<String, Object>("fields", fieldSet)
-//        ));
-//        //this.auditService.trackIdentity(AuditableAction.IdentityTracking_Action);
-//        return persisted;
-//    }
-//
-//    @DeleteMapping("{id}")
-//    @Transactional
-//    public void Delete(@PathVariable("id") UUID id) throws MyForbiddenException, InvalidApplicationException {
-//        logger.debug(new MapLogEntry("retrieving" + DescriptionTemplate.class.getSimpleName()).And("id", id));
-//
-//        this.descriptionTemplateTypeService.deleteAndSave(id);
-//
-//        this.auditService.track(AuditableAction.DescriptionTemplate_Delete, "id", id);
-//        //this.auditService.trackIdentity(AuditableAction.IdentityTracking_Action);
-//    }
+    @PostMapping("persist")
+    @Transactional
+    public DescriptionTemplate Persist(@MyValidate @RequestBody DescriptionTemplatePersist model, FieldSet fieldSet) throws MyApplicationException, MyForbiddenException, MyNotFoundException, InvalidApplicationException {
+        logger.debug(new MapLogEntry("persisting" + DescriptionTemplate.class.getSimpleName()).And("model", model).And("fieldSet", fieldSet));
+        DescriptionTemplate persisted = this.descriptionTemplateTypeService.persist(model, fieldSet);
+
+        this.auditService.track(AuditableAction.DescriptionTemplate_Persist, Map.ofEntries(
+                new AbstractMap.SimpleEntry<String, Object>("model", model),
+                new AbstractMap.SimpleEntry<String, Object>("fields", fieldSet)
+        ));
+        //this.auditService.trackIdentity(AuditableAction.IdentityTracking_Action);
+        return persisted;
+    }
+
+    @DeleteMapping("{id}")
+    @Transactional
+    public void Delete(@PathVariable("id") UUID id) throws MyForbiddenException, InvalidApplicationException {
+        logger.debug(new MapLogEntry("retrieving" + DescriptionTemplate.class.getSimpleName()).And("id", id));
+
+        this.descriptionTemplateTypeService.deleteAndSave(id);
+
+        this.auditService.track(AuditableAction.DescriptionTemplate_Delete, "id", id);
+        //this.auditService.trackIdentity(AuditableAction.IdentityTracking_Action);
+    }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java
index 1d5719ec3..8d91c44ad 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java
@@ -75,18 +75,4 @@ public class AdminManager {
         datasetprofile.buildProfile(viewstyle);
         return datasetprofile;
     }
-
-
-    public static DescriptionTemplateEntity inactivate(DatasetProfileDao datasetProfileRepository, DatasetDao datasetDao, String id) throws InvalidApplicationException {
-        eu.eudat.data.dao.criteria.DatasetCriteria datasetsForThatDatasetProfile = new eu.eudat.data.dao.criteria.DatasetCriteria();
-        datasetsForThatDatasetProfile.setProfileDatasetId(UUID.fromString(id));
-        if (datasetDao.getWithCriteria(datasetsForThatDatasetProfile).count() == 0) {
-            DescriptionTemplateEntity detasetProfile = datasetProfileRepository.find(UUID.fromString(id));
-            detasetProfile.setIsActive(IsActive.Inactive);
-            detasetProfile = datasetProfileRepository.createOrUpdate(detasetProfile);
-            return detasetProfile;
-        } else {
-            throw new DatasetProfileWithDatasetsExeption("This profile can not deleted, because Datasets are associated with it");
-        }
-    }
 }
\ No newline at end of file
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 5b5385a60..92ae8e04a 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
@@ -890,7 +890,7 @@ public class WordBuilder {
                 comboboxType = FieldDataComboBoxType.Autocomplete;
             case COMBO_BOX: {
                 if (comboboxType == null) {
-                    comboboxType = ((ComboBoxDataEntity) field.getData()).getType();
+                    comboboxType = ((ComboBoxDataEntity) field.getData()).getFieldSubType();
                 }
                 if (comboboxType.equals(FieldDataComboBoxType.Autocomplete)) {
                     mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
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 72d1e9f5f..6e7cd26bc 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
@@ -214,10 +214,10 @@ public class ExportXmlBuilderDatasetProfile {
                 switch (field.getViewStyle().getFieldType()) {
                     case COMBO_BOX:
                         ComboBoxDataEntity comboBoxDataEntityObject = (ComboBoxDataEntity) field.getData();
-                        if (comboBoxDataEntityObject.getType().equals("wordlist")) {
+                        if (comboBoxDataEntityObject.getFieldType().equals("wordlist")) {
                             WordListDataEntity wordListDataEntityObject = (WordListDataEntity) field.getData();
                             dataOut.setAttribute("label", wordListDataEntityObject.getLabel());
-                            dataOut.setAttribute("type", wordListDataEntityObject.getType().getValue());
+                            dataOut.setAttribute("type", wordListDataEntityObject.getFieldType().getValue());
                             dataOut.setAttribute("multiList", wordListDataEntityObject.getMultiList().toString());
                             Element options = element.createElement("options");
                             wordListDataEntityObject.getOptions().forEach(optionChildFor -> {
@@ -227,10 +227,10 @@ public class ExportXmlBuilderDatasetProfile {
                                 options.appendChild(optionChild);
                             });
                             dataOut.appendChild(options);
-                        } else if (comboBoxDataEntityObject.getType().equals("autocomplete")) {
+                        } else if (comboBoxDataEntityObject.getFieldType().equals("autocomplete")) {
                             AutoCompleteDataEntity autoCompleteDataEntityObject = (AutoCompleteDataEntity) field.getData();
                             dataOut.setAttribute("label", autoCompleteDataEntityObject.getLabel());
-                            dataOut.setAttribute("type", autoCompleteDataEntityObject.getType().getValue());
+                            dataOut.setAttribute("type", autoCompleteDataEntityObject.getFieldType().getValue());
                             dataOut.setAttribute("multiAutoComplete", autoCompleteDataEntityObject.getMultiAutoComplete().toString());
                             for (AutoCompleteDataEntity.AutoCompleteSingleData singleData: autoCompleteDataEntityObject.getAutoCompleteSingleDataList()) {
                                 Element singleItem = element.createElement("autocompleteSingle");
@@ -291,8 +291,8 @@ public class ExportXmlBuilderDatasetProfile {
                     case INTERNAL_DMP_ENTRIES:
                         InternalDmpBaseDataEntity internalDmpEntitiesData = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", internalDmpEntitiesData.getLabel());
-                        dataOut.setAttribute("type", internalDmpEntitiesData.getType().getValue());
-                        switch (internalDmpEntitiesData.getType()) {
+                        dataOut.setAttribute("type", internalDmpEntitiesData.getFieldType().getValue());
+                        switch (internalDmpEntitiesData.getFieldSubType()) {
                             case Researchers:
                                 ResearcherAutoCompleteDataEntity researchersAutoCompleteData = (ResearcherAutoCompleteDataEntity) internalDmpEntitiesData;
                                 dataOut.setAttribute("multiAutocomplete", researchersAutoCompleteData.getMultiAutoComplete().toString());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java
index 4d3ab475e..f3b611721 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java
@@ -120,7 +120,6 @@ public class Field implements DatabaseViewStyleDefinition, ViewStyleDefinition<F
 
         fieldEntity.setId(this.id);
         fieldEntity.setOrdinal(this.ordinal);
-        fieldEntity.setFieldType(this.viewStyle.getFieldType());
         fieldEntity.setData(new FieldDataHelper().toFieldData(data, this.viewStyle.getFieldType()));
         fieldEntity.setVisibilityRules(this.visible.getRules());
         fieldEntity.setDefaultValue(this.defaultValue.getValue());
@@ -135,7 +134,7 @@ public class Field implements DatabaseViewStyleDefinition, ViewStyleDefinition<F
         this.id = item.getId();
         this.ordinal = item.getOrdinal();
         FieldDescriptionEntity fieldDescription = new FieldDescriptionEntity();
-        fieldDescription.setFieldType(item.getFieldType());
+        fieldDescription.setFieldType(item.getData().getFieldType());
         this.viewStyle =  fieldDescription;
         this.data = item.getData();
         VisibilityEntity visibilityEntity = new VisibilityEntity();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java
index 7ba848536..efd7bf689 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java
@@ -191,7 +191,6 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
     public FieldEntity toDatabaseDefinition(FieldEntity fieldEntity) {
         fieldEntity.setId(this.id);
         fieldEntity.setOrdinal(this.ordinal);
-        fieldEntity.setFieldType(this.viewStyle.getFieldType());
         fieldEntity.setData(new FieldDataHelper().toFieldData(data, this.viewStyle.getFieldType()));
         fieldEntity.setDefaultValue(this.defaultValue.getValue());
         fieldEntity.setVisibilityRules(this.visible.getRules());
@@ -206,7 +205,7 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
         this.id = item.getId();
         this.ordinal = item.getOrdinal();
         FieldDescriptionEntity fieldDescription = new FieldDescriptionEntity();
-        fieldDescription.setFieldType(item.getFieldType());
+        fieldDescription.setFieldType(item.getData().getFieldType());
         this.viewStyle =  fieldDescription;
         this.numbering = item.getNumbering();
         this.data = item.getData();
diff --git a/dmp-backend/web/src/main/resources/config/permissions.yml b/dmp-backend/web/src/main/resources/config/permissions.yml
index 6e519048f..74c116e8b 100644
--- a/dmp-backend/web/src/main/resources/config/permissions.yml
+++ b/dmp-backend/web/src/main/resources/config/permissions.yml
@@ -112,18 +112,21 @@ permissions:
     BrowseDescriptionTemplate:
       roles:
         - Admin
+        - DatasetProfileManager
       clients: [ ]
       allowAnonymous: false
       allowAuthenticated: false
     EditDescriptionTemplate:
       roles:
         - Admin
+        - DatasetProfileManager
       clients: [ ]
       allowAnonymous: false
       allowAuthenticated: false
     DeleteDescriptionTemplate:
       roles:
         - Admin
+        - DatasetProfileManager
       claims: [ ]
       clients: [ ]
       allowAnonymous: false