diff --git a/dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java b/dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
index bc17a621b..9bb65aee2 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java
@@ -31,4 +31,9 @@ public class AuditableAction {
     public static final EventId Dmp_Persist = new EventId(5002, "Dmp_Persist");
     public static final EventId Dmp_Delete = new EventId(5003, "Dmp_Delete");
 
+    public static final EventId DescriptionTemplate_Query = new EventId(6000, "DescriptionTemplate_Query");
+    public static final EventId DescriptionTemplate_Lookup = new EventId(6001, "DescriptionTemplate_Lookup");
+    public static final EventId DescriptionTemplate_Persist = new EventId(6002, "DescriptionTemplate_Persist");
+    public static final EventId DescriptionTemplate_Delete = new EventId(6003, "DescriptionTemplate_Delete");
+
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java b/dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java
index 5937257bf..0e2c78393 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java
@@ -22,6 +22,11 @@ public final class Permission {
 	//Language
 	public static String BrowseStatistics = "BrowseStatistics";
 	public static String BrowsePublicStatistics = "BrowsePublicStatistics";
+
+	//DescriptionTemplate
+	public static String BrowseDescriptionTemplate = "BrowseDescriptionTemplate";
+	public static String EditDescriptionTemplate = "EditDescriptionTemplate";
+	public static String DeleteDescriptionTemplate = "DeleteDescriptionTemplate";
 	
 	//DescriptionTemplateType
 	public static String BrowseDescriptionTemplateType = "BrowseDescriptionTemplateType";
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/XmlHandlingService.java b/dmp-backend/core/src/main/java/eu/eudat/commons/XmlHandlingService.java
index a808c9ff7..b87b52851 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/XmlHandlingService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/XmlHandlingService.java
@@ -32,22 +32,6 @@ import java.io.StringWriter;
 @Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
 public class XmlHandlingService {
 
-    public String xmlSerializableToXml(XmlSerializable<?> item) throws InvalidApplicationException, TransformerException, ParserConfigurationException {
-        Document document = this.getDocument();
-        if (document == null) throw new InvalidApplicationException("Can not create document");
-        document.appendChild(item.toXml(document));
-        return this.generateXml(document);
-    }
-
-    public String xmlSerializableToXmlSafe(XmlSerializable<?> item) {
-        if (item == null) return null;
-        try {
-            return this.xmlSerializableToXml(item);
-        } catch (Exception ex) {
-            return null;
-        }
-    }
-
     public String generateXml(Document doc) throws TransformerException {
         TransformerFactory tFact = TransformerFactory.newInstance();
         Transformer trans = tFact.newTransformer();
@@ -60,7 +44,14 @@ public class XmlHandlingService {
         return writer.toString();
     }
     
-    public String toXml(Object item) throws JsonProcessingException, JAXBException {
+    public String toXml(Object item) throws JsonProcessingException, JAXBException, ParserConfigurationException, InvalidApplicationException, TransformerException {
+        if (XmlSerializable.class.isAssignableFrom(item.getClass())){
+            Document document = this.getDocument();
+            if (document == null) throw new InvalidApplicationException("Can not create document");
+            document.appendChild(((XmlSerializable)item).toXml(document));
+            return this.generateXml(document);
+        }
+        
         JAXBContext context = JAXBContext.newInstance(item.getClass());
         Marshaller marshaller = context.createMarshaller();
         StringWriter out = new StringWriter();
@@ -77,11 +68,16 @@ public class XmlHandlingService {
         }
     }
 
-    public <T> T fromXml(Class<T> type, String xmlString) throws JAXBException {
-        JAXBContext jaxbContext = JAXBContext.newInstance(type);
-        Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
+    public <T> T fromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
+        if (XmlSerializable.class.isAssignableFrom(type)){
+            XmlSerializable<T> object = (XmlSerializable<T>)type.newInstance();
+            return (T) object.fromXml(this.getDocument(xmlString).getDocumentElement());
+        } else {
+            JAXBContext jaxbContext = JAXBContext.newInstance(type);
+            Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
 
-        return (T) jaxbUnmarshaller.unmarshal(new StringReader(xmlString));
+            return (T) jaxbUnmarshaller.unmarshal(new StringReader(xmlString));
+        }
     }
 
     public <T> T fromXmlSafe(Class<T> type, String xmlString) {
@@ -93,19 +89,19 @@ public class XmlHandlingService {
         }
     }
 
-    public <T extends XmlSerializable<T>> T xmlSerializableFromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
-        T object = type.newInstance();
-        return (T) object.fromXml(this.getDocument(xmlString).getDocumentElement());
-    }
-    
-    public <T extends XmlSerializable<T>> T xmlSerializableFromXmlSafe(Class<T> type, String xmlString) {
-        if (xmlString == null) return null;
-        try {
-            return this.xmlSerializableFromXml(type, xmlString);
-        } catch (Exception ex) {
-            return null;
-        }
-    }
+//    public <T extends XmlSerializable<T>> T xmlSerializableFromXml(Class<T> type, String xmlString) throws JAXBException, InstantiationException, IllegalAccessException, ParserConfigurationException, IOException, SAXException {
+//        T object = type.newInstance();
+//        return (T) object.fromXml(this.getDocument(xmlString).getDocumentElement());
+//    }
+//    
+//    public <T extends XmlSerializable<T>> T xmlSerializableFromXmlSafe(Class<T> type, String xmlString) {
+//        if (xmlString == null) return null;
+//        try {
+//            return this.xmlSerializableFromXml(type, xmlString);
+//        } catch (Exception ex) {
+//            return null;
+//        }
+//    }
 
     public Document getDocument(String xml) throws ParserConfigurationException, IOException, SAXException {
         DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/DescriptionTemplateStatus.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/DescriptionTemplateStatus.java
new file mode 100644
index 000000000..fbecc1018
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/DescriptionTemplateStatus.java
@@ -0,0 +1,30 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum DescriptionTemplateStatus implements DatabaseEnum<Short> {
+
+    Draft((short) 0), 
+    Finalized((short) 1);
+
+    private final Short value;
+
+    DescriptionTemplateStatus(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, DescriptionTemplateStatus> map = EnumUtils.getEnumValueMap(DescriptionTemplateStatus.class);
+
+    public static DescriptionTemplateStatus of(Short i) {
+        return map.get(i);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataComboBoxType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataComboBoxType.java
new file mode 100644
index 000000000..d60621343
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataComboBoxType.java
@@ -0,0 +1,27 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldDataComboBoxType implements DatabaseEnum<String> {
+	Autocomplete("autocomplete"),
+	Wordlist("wordlist");
+	private final String value;
+
+	FieldDataComboBoxType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldDataComboBoxType> map = EnumUtils.getEnumValueMap(FieldDataComboBoxType.class);
+
+	public static FieldDataComboBoxType of(String i) {
+		return map.get(i);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataExternalDatasetType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataExternalDatasetType.java
new file mode 100644
index 000000000..d2b75a913
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataExternalDatasetType.java
@@ -0,0 +1,28 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldDataExternalDatasetType implements DatabaseEnum<String> {
+	ReusedDataset("reused_dataset"),
+	ProducedDataset("produced_dataset"),
+	Other("other");
+	private final String value;
+
+	FieldDataExternalDatasetType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldDataExternalDatasetType> map = EnumUtils.getEnumValueMap(FieldDataExternalDatasetType.class);
+
+	public static FieldDataExternalDatasetType of(String i) {
+		return map.get(i);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataInternalDmpEntryType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataInternalDmpEntryType.java
new file mode 100644
index 000000000..2281f0eb6
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldDataInternalDmpEntryType.java
@@ -0,0 +1,28 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldDataInternalDmpEntryType implements DatabaseEnum<String> {
+	Researchers("researchers"),
+	Dmps("dmps"),
+	Datasets("datasets");
+	private final String value;
+
+	FieldDataInternalDmpEntryType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldDataInternalDmpEntryType> map = EnumUtils.getEnumValueMap(FieldDataInternalDmpEntryType.class);
+
+	public static FieldDataInternalDmpEntryType of(String i) {
+		return map.get(i);
+	}
+}
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
new file mode 100644
index 000000000..04efa40c0
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldType.java
@@ -0,0 +1,50 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.Map;
+
+public enum FieldType implements DatabaseEnum<String> {
+	COMBO_BOX("combobox"),
+	BOOLEAN_DECISION("booleanDecision"),
+	RADIO_BOX("radiobox"),
+	INTERNAL_DMP_ENTRIES("internalDmpEntities"),
+	CHECK_BOX("checkBox"),
+	FREE_TEXT("freetext"),
+	TEXT_AREA("textarea"),
+	RICH_TEXT_AREA("richTextarea"),
+	UPLOAD("upload"),
+	DATE_PICKER("datePicker"),
+	EXTERNAL_DATASETS("externalDatasets"),
+	DATA_REPOSITORIES("dataRepositories"),
+	JOURNAL_REPOSITORIES("journalRepositories"),
+	PUB_REPOSITORIES("pubRepositories"),
+	LICENSES("licenses"),
+	TAXONOMIES("taxonomies"),
+	PUBLICATIONS("publications"),
+	REGISTRIES("registries"),
+	SERVICES("services"),
+	TAGS("tags"),
+	RESEARCHERS("researchers"),
+	ORGANIZATIONS("organizations"),
+	DATASET_IDENTIFIER("datasetIdentifier"),
+	CURRENCY("currency"),
+	VALIDATION("validation");;
+	private final String value;
+
+	FieldType(String value) {
+		this.value = value;
+	}
+
+	@JsonValue
+	public String getValue() {
+		return value;
+	}
+
+	private static final Map<String, FieldType> map = EnumUtils.getEnumValueMap(FieldType.class);
+
+	public static FieldType of(String i) {
+		return map.get(i);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldValidationType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldValidationType.java
new file mode 100644
index 000000000..fb74fb142
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/FieldValidationType.java
@@ -0,0 +1,33 @@
+package eu.eudat.commons.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.data.converters.enums.DatabaseEnum;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public enum FieldValidationType implements DatabaseEnum<Short> {
+
+    None((short) 0), 
+    Required((short) 1), 
+    Url((short) 2);
+
+    private final Short value;
+
+    FieldValidationType(Short value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public Short getValue() {
+        return value;
+    }
+
+    private static final Map<Short, FieldValidationType> map = EnumUtils.getEnumValueMap(FieldValidationType.class);
+
+    public static FieldValidationType of(Short i) {
+        return map.get(i);
+    }
+
+}
\ No newline at end of file
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseDefinition.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseDefinition.java
new file mode 100644
index 000000000..10d336fd0
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseDefinition.java
@@ -0,0 +1,5 @@
+package eu.eudat.commons.types.common;
+
+
+public interface DatabaseDefinition {
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseModelDefinition.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseModelDefinition.java
new file mode 100644
index 000000000..f8d64308f
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseModelDefinition.java
@@ -0,0 +1,7 @@
+package eu.eudat.commons.types.common;
+
+import eu.eudat.commons.types.common.DatabaseDefinition;
+
+public interface DatabaseModelDefinition extends DatabaseDefinition {
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseViewStyleDefinition.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseViewStyleDefinition.java
new file mode 100644
index 000000000..7aa75c2d8
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/common/DatabaseViewStyleDefinition.java
@@ -0,0 +1,7 @@
+package eu.eudat.commons.types.common;
+
+import eu.eudat.commons.types.common.DatabaseDefinition;
+
+public interface DatabaseViewStyleDefinition extends DatabaseDefinition {
+
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/DefinitionEntity.java
similarity index 63%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/DefinitionEntity.java
index cc98dbbb2..8d4a8b12f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/DefinitionEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition;
+package eu.eudat.commons.types.descriptiontemplate;
 
 import eu.eudat.commons.types.xml.XmlBuilder;
 import eu.eudat.commons.types.xml.XmlSerializable;
@@ -10,24 +10,24 @@ import org.w3c.dom.NodeList;
 import java.util.LinkedList;
 import java.util.List;
 
-public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
-    private List<Section> sections;
-    private List<Page> pages;
+public class DefinitionEntity implements XmlSerializable<DefinitionEntity> {
+    private List<SectionEntity> sections;
+    private List<PageEntity> pages;
 
-    public List<Section> getSections() {
+    public List<SectionEntity> getSections() {
         return sections;
     }
 
-    public void setSections(List<Section> sections) {
+    public void setSections(List<SectionEntity> sections) {
         this.sections = sections;
     }
 
-    public List<Page> getPages() {
+    public List<PageEntity> getPages() {
         return pages;
     }
 
-    public void setPages(List<Page> pages) {
-        this.pages = pages;
+    public void setPages(List<PageEntity> pageEntities) {
+        this.pages = pageEntities;
     }
 
     @Override
@@ -35,13 +35,13 @@ public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
         Element root = doc.createElement("root");
         Element sections = doc.createElement("sections");
         Element pages = doc.createElement("pages");
-        for (Section section : this.sections) {
-            section.setNumbering("" + (this.sections.indexOf(section) + 1));
-            sections.appendChild(section.toXml(doc));
+        for (SectionEntity sectionEntity : this.sections) {
+            sectionEntity.setNumbering("" + (this.sections.indexOf(sectionEntity) + 1));
+            sections.appendChild(sectionEntity.toXml(doc));
         }
 
-        for (Page page : this.pages) {
-            pages.appendChild(page.toXml(doc));
+        for (PageEntity pageEntity : this.pages) {
+            pages.appendChild(pageEntity.toXml(doc));
         }
 
         root.appendChild(pages);
@@ -50,7 +50,7 @@ public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
     }
 
     @Override
-    public ViewStyleModel fromXml(Element element) {
+    public DefinitionEntity fromXml(Element element) {
 
         this.sections = new LinkedList();
         Element sections = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "sections");
@@ -59,7 +59,7 @@ public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
             for (int temp = 0; temp < sectionElements.getLength(); temp++) {
                 Node sectionElement = sectionElements.item(temp);
                 if (sectionElement.getNodeType() == Node.ELEMENT_NODE) {
-                    this.sections.add(new Section().fromXml((Element) sectionElement));
+                    this.sections.add(new SectionEntity().fromXml((Element) sectionElement));
                 }
             }
         }
@@ -70,7 +70,7 @@ public class ViewStyleModel implements XmlSerializable<ViewStyleModel> {
             for (int temp = 0; temp < pagesElements.getLength(); temp++) {
                 Node pageElement = pagesElements.item(temp);
                 if (pageElement.getNodeType() == Node.ELEMENT_NODE) {
-                    this.pages.add(new Page().fromXml((Element) pageElement));
+                    this.pages.add(new PageEntity().fromXml((Element) pageElement));
                 }
             }
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Field.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java
similarity index 59%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Field.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java
index 271f78e35..9f3ec2064 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Field.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldEntity.java
@@ -1,11 +1,11 @@
-package eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition;
+package eu.eudat.commons.types.descriptiontemplate;
 
-import eu.eudat.models.data.components.commons.DefaultValue;
-import eu.eudat.models.data.components.commons.ViewStyle;
-import eu.eudat.models.data.components.commons.Visibility;
-import eu.eudat.models.data.components.commons.datafield.FieldData;
+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.xml.XmlSerializable;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.commons.types.xml.XmlBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -15,18 +15,17 @@ import org.w3c.dom.NodeList;
 import java.util.LinkedList;
 import java.util.List;
 
-public class Field implements DatabaseViewStyleDefinition, XmlSerializable<Field> {
+public class FieldEntity implements DatabaseViewStyleDefinition, XmlSerializable<FieldEntity> {
     private String id;
     private int ordinal;
     private List<String> schematics;
     private String numbering;
-    private ViewStyle viewStyle;
-    private DefaultValue defaultValue;
-    private Visibility visible;
-    private FieldData data;
-    private List<eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType> validations;
-
-    private Boolean export;
+    private String defaultValue;
+    private List<RuleEntity> visibilityRules;
+    private BaseFieldDataEntity<?> data;
+    private List<FieldValidationType> validations;
+    private FieldType fieldType;
+    private Boolean includeInExport;
 
     public String getId() {
         return id;
@@ -49,38 +48,33 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable<Field
         this.schematics = schematics;
     }
 
-    public ViewStyle getViewStyle() {
-        return viewStyle;
-    }
-    public void setViewStyle(ViewStyle viewStyle) {
-        this.viewStyle = viewStyle;
-    }
-
-    public FieldData getData() {
+    public BaseFieldDataEntity<?> getData() {
         return data;
     }
-    public void setData(FieldData data) {
+    public void setData(BaseFieldDataEntity<?> data) {
         this.data = data;
     }
 
-    public DefaultValue getDefaultValue() {
+    public FieldType getFieldType() {
+        return fieldType;
+    }
+
+    public void setFieldType(FieldType fieldType) {
+        this.fieldType = fieldType;
+    }
+
+    public String getDefaultValue() {
         return defaultValue;
     }
-    public void setDefaultValue(DefaultValue defaultValue) {
+    public void setDefaultValue(String defaultValue) {
         this.defaultValue = defaultValue;
     }
 
-    public Visibility getVisible() {
-        return visible;
-    }
-    public void setVisible(Visibility visible) {
-        this.visible = visible;
-    }
 
-    public List<eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType> getValidations() {
+    public List<FieldValidationType> getValidations() {
         return validations;
     }
-    public void setValidations(List<eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType> validations) {
+    public void setValidations(List<FieldValidationType> validations) {
         this.validations = validations;
     }
 
@@ -91,12 +85,20 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable<Field
         this.numbering = numbering;
     }
 
-    public Boolean getExport() {
-        return export;
+    public Boolean getIncludeInExport() {
+        return includeInExport;
     }
 
-    public void setExport(Boolean export) {
-        this.export = export;
+    public void setIncludeInExport(Boolean includeInExport) {
+        this.includeInExport = includeInExport;
+    }
+
+    public List<RuleEntity> getVisibilityRules() {
+        return visibilityRules;
+    }
+
+    public void setVisibilityRules(List<RuleEntity> visibilityRules) {
+        this.visibilityRules = visibilityRules;
     }
 
     @Override
@@ -115,17 +117,19 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable<Field
         }
 
         Element viewStyle = doc.createElement("viewStyle");
-        viewStyle.setAttribute("renderstyle", this.viewStyle.getRenderStyle());
-        viewStyle.setAttribute("cssClass", this.viewStyle.getCssClass());
-
-        Element visibility = this.visible.toXml(doc);
+        viewStyle.setAttribute("renderstyle", this.getFieldType().getValue());
 
+        Element visibilityRulesElement = doc.createElement("visible");
+        if (this.visibilityRules != null && !this.visibilityRules.isEmpty()) {
+            for (RuleEntity rule : this.visibilityRules) {
+                visibilityRulesElement.appendChild(rule.toXml(doc));
+            }
+        }
         Element defaultValue = doc.createElement("defaultValue");
-        defaultValue.setAttribute("type", this.defaultValue.getType());
-        defaultValue.setAttribute("value", this.defaultValue.getValue());
+        defaultValue.setAttribute("value", this.getDefaultValue());
 
         Element validations = doc.createElement("validations");
-        for (eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType validationType : this.validations) {
+        for (FieldValidationType validationType : this.validations) {
             Element validation = doc.createElement("validation");
             validation.setAttribute("type", "" + validationType.getValue());
             validations.appendChild(validation);
@@ -138,28 +142,32 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable<Field
         rootElement.appendChild(numbering);
         rootElement.appendChild(validations);
         rootElement.appendChild(defaultValue);
-        rootElement.appendChild(visibility);
+        rootElement.appendChild(visibilityRulesElement);
         rootElement.appendChild(viewStyle);
         if (this.data != null) rootElement.appendChild(this.data.toXml(doc));
-        rootElement.setAttribute("export", this.export == null || this.export ? "true" : "false");
+        rootElement.setAttribute("export", this.includeInExport == null || this.includeInExport ? "true" : "false");
         return rootElement;
     }
 
     @Override
-    public Field fromXml(Element element) {
+    public FieldEntity fromXml(Element element) {
         this.id = element.getAttribute("id");
         this.ordinal = Integer.parseInt(element.getAttribute("ordinal"));
 
 
-        this.viewStyle = new ViewStyle();
         Element viewStyle = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "viewStyle");
 
-        this.viewStyle.setRenderStyle(viewStyle.getAttribute("renderstyle"));
-        this.viewStyle.setCssClass(viewStyle.getAttribute("cssClass"));
+        this.fieldType = FieldType.of(viewStyle.getAttribute("renderstyle"));
 
         Element visibility = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "visible");
-
-        this.visible = new Visibility().fromXml(visibility);
+        NodeList rulesElements = visibility.getChildNodes();
+        this.visibilityRules = new LinkedList();
+        for (int temp = 0; temp < rulesElements.getLength(); temp++) {
+            Node ruleElement = rulesElements.item(temp);
+            if (ruleElement.getNodeType() == Node.ELEMENT_NODE) {
+                this.visibilityRules.add(new RuleEntity().fromXml((Element) ruleElement));
+            }
+        }
 
         Element numbering = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "numbering");
         if (numbering != null) this.numbering = numbering.getTextContent();
@@ -180,10 +188,8 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable<Field
 
         Element defaultValue = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "defaultValue");
 
-        this.defaultValue = new DefaultValue();
-        this.defaultValue.setType(defaultValue.getAttribute("type"));
-        this.defaultValue.setValue(defaultValue.getAttribute("value"));
-        this.data = new ModelBuilder().toFieldData(null, this.viewStyle.getRenderStyle(), dataElement);
+        this.defaultValue = defaultValue.getAttribute("value");
+        this.data = new FieldDataHelper().toFieldData(null, this.getFieldType(), dataElement);
         if (this.data != null) this.data.fromXml(dataElement);
 
         this.validations = new LinkedList<>();
@@ -193,16 +199,16 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable<Field
             for (int temp = 0; temp < validationElements.getLength(); temp++) {
                 Node validationElement = validationElements.item(temp);
                 if (validationElement.getNodeType() == Node.ELEMENT_NODE) {
-                    int enumValue = Integer.parseInt(((Element) validationElement).getAttribute("type"));
-                    eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType validationType = eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType.fromInteger(enumValue);
+                    Short enumValue = Short.parseShort(((Element) validationElement).getAttribute("type"));
+                    FieldValidationType validationType = FieldValidationType.of(enumValue);
                     this.validations.add(validationType);
                 }
             }
         }
         if (element.hasAttribute("export")) {
-            this.export = Boolean.parseBoolean(element.getAttribute("export"));
+            this.includeInExport = Boolean.parseBoolean(element.getAttribute("export"));
         } else {
-            this.export = true;
+            this.includeInExport = true;
         }
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/FieldSet.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java
similarity index 81%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/FieldSet.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java
index c2705e461..49ebbb054 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/FieldSet.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/FieldSetEntity.java
@@ -1,6 +1,6 @@
-package eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition;
+package eu.eudat.commons.types.descriptiontemplate;
 
-import eu.eudat.models.data.components.commons.Multiplicity;
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import eu.eudat.commons.types.xml.XmlBuilder;
 import org.w3c.dom.Document;
@@ -11,24 +11,24 @@ import org.w3c.dom.NodeList;
 import java.util.LinkedList;
 import java.util.List;
 
-public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable<FieldSet> {
+public class FieldSetEntity implements DatabaseViewStyleDefinition, XmlSerializable<FieldSetEntity> {
     private String id;
     private int ordinal;
-    private List<Field> fields;
+    private List<FieldEntity> fields;
     private String numbering;
     private String title;
     private String description;
     private String extendedDescription;
     private String additionalInformation;
-    private Multiplicity multiplicity;
+    private MultiplicityEntity multiplicity;
     private boolean hasCommentField;
-    private String commentFieldValue;
+    private String commentFieldValue; //TODO: DescriptionTemplate
 
-    public List<Field> getFields() {
+    public List<FieldEntity> getFields() {
         return fields;
     }
-    public void setFields(List<Field> fields) {
-        this.fields = fields;
+    public void setFields(List<FieldEntity> fieldEntities) {
+        this.fields = fieldEntities;
     }
 
     public String getId() {
@@ -66,10 +66,10 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable<Fi
         this.extendedDescription = extendedDescription;
     }
 
-    public Multiplicity getMultiplicity() {
+    public MultiplicityEntity getMultiplicity() {
         return multiplicity;
     }
-    public void setMultiplicity(Multiplicity multiplicity) {
+    public void setMultiplicity(MultiplicityEntity multiplicity) {
         this.multiplicity = multiplicity;
     }
 
@@ -80,12 +80,12 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable<Fi
         this.hasCommentField = hasCommentField;
     }
 
-    public String getCommentFieldValue() {
-        return commentFieldValue;
-    }
-    public void setCommentFieldValue(String commentFieldValue) {
-        this.commentFieldValue = commentFieldValue;
-    }
+//    public String getCommentFieldValue() {
+//        return commentFieldValue;
+//    }
+//    public void setCommentFieldValue(String commentFieldValue) {
+//        this.commentFieldValue = commentFieldValue;
+//    }
 
     public String getNumbering() {
         return numbering;
@@ -126,15 +126,15 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable<Fi
 
         Element commentField = doc.createElement("commentField");
         commentField.setAttribute("hasCommentField", "" + this.hasCommentField);
-        commentField.setAttribute("commentFieldValue", this.commentFieldValue);
+//        commentField.setAttribute("commentFieldValue", this.commentFieldValue);
 
         Element numbering = doc.createElement("numbering");
         numbering.setTextContent(this.numbering);
 
         Element fieldsElement = doc.createElement("fields");
-        for (Field field : fields) {
-            field.setNumbering(this.numbering + "." + (this.fields.indexOf(field) + 1));
-            fieldsElement.appendChild(field.toXml(doc));
+        for (FieldEntity fieldEntity : fields) {
+            fieldEntity.setNumbering(this.numbering + "." + (this.fields.indexOf(fieldEntity) + 1));
+            fieldsElement.appendChild(fieldEntity.toXml(doc));
         }
 
         fieldSet.appendChild(numbering);
@@ -149,7 +149,7 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable<Fi
     }
 
     @Override
-    public FieldSet fromXml(Element element) {
+    public FieldSetEntity fromXml(Element element) {
         this.id = element.getAttribute("id");
         this.ordinal = Integer.parseInt(element.getAttribute("ordinal"));
         this.fields = new LinkedList();
@@ -164,7 +164,7 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable<Fi
             this.additionalInformation = additionalInformation.getTextContent();
         Element commentField = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "commentField");
         this.hasCommentField = Boolean.parseBoolean(commentField.getAttribute("hasCommentField"));
-        this.commentFieldValue = commentField.getAttribute("commentFieldValue");
+//        this.commentFieldValue = commentField.getAttribute("commentFieldValue");
         Element fields = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fields");
 
         Element numbering = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "numbering");
@@ -175,12 +175,12 @@ public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable<Fi
             for (int temp = 0; temp < fieldElements.getLength(); temp++) {
                 Node fieldElement = fieldElements.item(temp);
                 if (fieldElement.getNodeType() == Node.ELEMENT_NODE) {
-                    this.fields.add(new Field().fromXml((Element) fieldElement));
+                    this.fields.add(new FieldEntity().fromXml((Element) fieldElement));
                 }
             }
         }
 
-        this.multiplicity = new Multiplicity();
+        this.multiplicity = new MultiplicityEntity();
         Element multiplicity = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "multiplicity");
 
         this.multiplicity.setMin(Integer.parseInt(multiplicity.getAttribute("min")));
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Multiplicity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/MultiplicityEntity.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Multiplicity.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/MultiplicityEntity.java
index 2ad99dec3..9d9d20b2f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Multiplicity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/MultiplicityEntity.java
@@ -1,6 +1,6 @@
-package eu.eudat.models.data.components.commons;
+package eu.eudat.commons.types.descriptiontemplate;
 
-public class Multiplicity {
+public class MultiplicityEntity {
 
     private int min;
     private int max;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Page.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/PageEntity.java
similarity index 80%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Page.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/PageEntity.java
index ee5726d39..77abfb4ce 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Page.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/PageEntity.java
@@ -1,11 +1,12 @@
-package eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition;
+package eu.eudat.commons.types.descriptiontemplate;
 
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 
-public class Page implements DatabaseViewStyleDefinition, XmlSerializable<Page> {
+public class PageEntity implements DatabaseViewStyleDefinition, XmlSerializable<PageEntity> {
     private String id;
     private int ordinal;
     private String title;
@@ -44,7 +45,7 @@ public class Page implements DatabaseViewStyleDefinition, XmlSerializable<Page>
     }
 
     @Override
-    public Page fromXml(Element item) {
+    public PageEntity fromXml(Element item) {
         this.ordinal = Integer.parseInt(item.getAttribute("ordinal"));
         this.id = item.getAttribute("id");
         this.title = item.getAttribute("title");
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/RuleEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/RuleEntity.java
new file mode 100644
index 000000000..6740f18ad
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/RuleEntity.java
@@ -0,0 +1,52 @@
+package eu.eudat.commons.types.descriptiontemplate;
+
+import eu.eudat.commons.types.xml.XmlSerializable;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+public class RuleEntity implements XmlSerializable<RuleEntity> {
+    private String target;
+    private String value;
+
+    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;
+    }
+
+    @Override
+    public Element toXml(Document doc) {
+        Element rule = doc.createElement("rule");
+        rule.setAttribute("target", this.target);
+
+        Element value = doc.createElement("value");
+        value.setTextContent(this.value);
+
+        rule.appendChild(value);
+        return rule;
+    }
+
+    @Override
+    public RuleEntity fromXml(Element item) {
+        this.target = item.getAttribute("target");
+
+        Element value = (Element) item.getElementsByTagName("value").item(0);
+        if (value != null) {
+            this.value = value.getTextContent();
+        }
+
+        return this;
+    }
+
+
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Section.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java
similarity index 80%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Section.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java
index 6e4b28a9f..a38831b5b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/Section.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java
@@ -1,5 +1,6 @@
-package eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition;
+package eu.eudat.commons.types.descriptiontemplate;
 
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
 import eu.eudat.commons.types.xml.XmlBuilder;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
@@ -10,7 +11,7 @@ import org.w3c.dom.NodeList;
 import java.util.LinkedList;
 import java.util.List;
 
-public class Section implements DatabaseViewStyleDefinition, XmlSerializable<Section> {
+public class SectionEntity implements DatabaseViewStyleDefinition, XmlSerializable<SectionEntity> {
     private String id;
     private int ordinal;
     private boolean defaultVisibility;
@@ -19,8 +20,8 @@ public class Section implements DatabaseViewStyleDefinition, XmlSerializable<Sec
     private String title;
     private String description;
     private String extendedDescription;
-    private List<Section> sections;
-    private List<FieldSet> fieldSets;
+    private List<SectionEntity> sections;
+    private List<FieldSetEntity> fieldSets;
     private Boolean multiplicity;
 
     public String getId() {
@@ -71,20 +72,20 @@ public class Section implements DatabaseViewStyleDefinition, XmlSerializable<Sec
         this.description = description;
     }
 
-    public List<Section> getSections() {
+    public List<SectionEntity> getSections() {
         return sections;
     }
 
-    public void setSections(List<Section> sections) {
+    public void setSections(List<SectionEntity> sections) {
         this.sections = sections;
     }
 
-    public List<FieldSet> getFieldSets() {
+    public List<FieldSetEntity> getFieldSets() {
         return fieldSets;
     }
 
-    public void setFieldSets(List<FieldSet> fieldSets) {
-        this.fieldSets = fieldSets;
+    public void setFieldSets(List<FieldSetEntity> fieldSetEntities) {
+        this.fieldSets = fieldSetEntities;
     }
 
     public String getExtendedDescription() {
@@ -134,18 +135,18 @@ public class Section implements DatabaseViewStyleDefinition, XmlSerializable<Sec
 
         if (sections != null) {
             Element sections = doc.createElement("sections");
-            for (Section section : this.sections) {
-                section.setNumbering(this.numbering + "." + (this.sections.indexOf(section) + 1));
-                sections.appendChild(section.toXml(doc));
+            for (SectionEntity sectionEntity : this.sections) {
+                sectionEntity.setNumbering(this.numbering + "." + (this.sections.indexOf(sectionEntity) + 1));
+                sections.appendChild(sectionEntity.toXml(doc));
             }
             rootElement.appendChild(sections);
         }
 
         if (this.fieldSets != null) {
             Element formGroups = doc.createElement("fieldSets");
-            for (FieldSet fieldSet : this.fieldSets) {
-                fieldSet.setNumbering(this.numbering + "." + (this.fieldSets.indexOf(fieldSet) + 1));
-                formGroups.appendChild(fieldSet.toXml(doc));
+            for (FieldSetEntity fieldSetEntity : this.fieldSets) {
+                fieldSetEntity.setNumbering(this.numbering + "." + (this.fieldSets.indexOf(fieldSetEntity) + 1));
+                formGroups.appendChild(fieldSetEntity.toXml(doc));
             }
             rootElement.appendChild(formGroups);
         }
@@ -159,7 +160,7 @@ public class Section implements DatabaseViewStyleDefinition, XmlSerializable<Sec
     }
 
     @Override
-    public Section fromXml(Element element) {
+    public SectionEntity fromXml(Element element) {
 
         this.id = element.getAttribute("id");
         this.ordinal = Integer.parseInt(element.getAttribute("ordinal"));
@@ -179,19 +180,19 @@ public class Section implements DatabaseViewStyleDefinition, XmlSerializable<Sec
         Element title = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title");
         if (title != null) this.title = title.getTextContent();
 
-        this.sections = new LinkedList<Section>();
+        this.sections = new LinkedList<SectionEntity>();
         Element sections = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "sections");
         if (sections != null) {
             NodeList sectionElements = sections.getChildNodes();
             for (int temp = 0; temp < sectionElements.getLength(); temp++) {
                 Node sectionElement = sectionElements.item(temp);
                 if (sectionElement.getNodeType() == Node.ELEMENT_NODE) {
-                    this.sections.add(new Section().fromXml((Element) sectionElement));
+                    this.sections.add(new SectionEntity().fromXml((Element) sectionElement));
                 }
             }
         }
 
-        this.fieldSets = new LinkedList<FieldSet>();
+        this.fieldSets = new LinkedList<FieldSetEntity>();
         Element fieldGroups = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fieldSets");
 
         if (fieldGroups != null) {
@@ -199,7 +200,7 @@ public class Section implements DatabaseViewStyleDefinition, XmlSerializable<Sec
             for (int temp = 0; temp < fieldGroupElements.getLength(); temp++) {
                 Node fieldGroupElement = fieldGroupElements.item(temp);
                 if (fieldGroupElement.getNodeType() == Node.ELEMENT_NODE) {
-                    this.fieldSets.add(new FieldSet().fromXml((Element) fieldGroupElement));
+                    this.fieldSets.add(new FieldSetEntity().fromXml((Element) fieldGroupElement));
                 }
             }
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java
similarity index 90%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java
index 98ce37926..ae7213b8f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/AutoCompleteDataEntity.java
@@ -1,5 +1,8 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import com.fasterxml.jackson.annotation.JsonValue;
+import eu.eudat.commons.enums.EnumUtils;
+import eu.eudat.data.converters.enums.DatabaseEnum;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -9,7 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
+public class AutoCompleteDataEntity extends ComboBoxDataEntity<AutoCompleteDataEntity> {
 
     public static class AuthAutoCompleteData {
         private String url;
@@ -59,19 +62,19 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
         }
     }
     public static class AutoCompleteSingleData {
-        private int autocompleteType;
+        private AutocompleteType autocompleteType;
         private String url;
-        private ComboBoxData.Option autoCompleteOptions;
+        private ComboBoxDataEntity.Option autoCompleteOptions;
         private String optionsRoot;
         private Boolean hasAuth;
         private AuthAutoCompleteData auth;
         private String method;
 
-        public int getAutocompleteType() {
+        public AutocompleteType getAutocompleteType() {
             return autocompleteType;
         }
 
-        public void setAutocompleteType(int autocompleteType) {
+        public void setAutocompleteType(AutocompleteType autocompleteType) {
             this.autocompleteType = autocompleteType;
         }
 
@@ -105,10 +108,10 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
             this.auth = auth;
         }
 
-        public ComboBoxData.Option getAutoCompleteOptions() {
+        public ComboBoxDataEntity.Option getAutoCompleteOptions() {
             return autoCompleteOptions;
         }
-        public void setAutoCompleteOptions(ComboBoxData.Option autoCompleteOptions) {
+        public void setAutoCompleteOptions(ComboBoxDataEntity.Option autoCompleteOptions) {
             this.autoCompleteOptions = autoCompleteOptions;
         }
 
@@ -144,7 +147,7 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
             Element parent = doc.createElement("autocompleteSingle");
             parent.setAttribute("url", singleData.url);
             parent.setAttribute("optionsRoot", singleData.optionsRoot);
-            parent.setAttribute("autoCompleteType", Integer.toString(singleData.autocompleteType));
+            parent.setAttribute("autoCompleteType", Integer.toString(singleData.autocompleteType.getValue()));
             parent.setAttribute("hasAuth", Boolean.toString(singleData.hasAuth));
             parent.setAttribute("method", singleData.method);
             Element element = doc.createElement("option");
@@ -167,7 +170,7 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
     }
 
     @Override
-    public AutoCompleteData fromXml(Element item) {
+    public AutoCompleteDataEntity fromXml(Element item) {
         super.fromXml(item);
         this.autoCompleteSingleDataList = new ArrayList<>();
         NodeList items = item.getElementsByTagName("autocompleteSingle");
@@ -190,9 +193,9 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
         singleData.optionsRoot = item.getAttribute("optionsRoot");
         this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
         if (item.getAttribute("autoCompleteType") == null || item.getAttribute("autoCompleteType").equals("") ) {
-            singleData.autocompleteType = AutocompleteType.UNCACHED.getValue();
+            singleData.autocompleteType = AutocompleteType.UNCACHED;
         } else {
-            singleData.autocompleteType = AutocompleteType.fromValue(Integer.parseInt(item.getAttribute("autoCompleteType"))).getValue();
+            singleData.autocompleteType = AutocompleteType.of(Integer.parseInt(item.getAttribute("autoCompleteType")));
         }
         singleData.hasAuth = Boolean.parseBoolean(item.getAttribute("hasAuth"));
         singleData.method = item.hasAttribute("method") ? item.getAttribute("method") : "GET";
@@ -218,7 +221,7 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
     }
 
     @Override
-    public AutoCompleteData fromData(Object data) {
+    public AutoCompleteDataEntity fromData(Object data) {
         super.fromData(data);
         this.autoCompleteSingleDataList = new ArrayList<>();
 
@@ -244,9 +247,9 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
                 this.autoCompleteSingleDataList.get(i).method = singleData.containsKey("method") ? (String) singleData.get("method") : "GET";
 
                 if (singleData.get("autoCompleteType") == null) {
-                    this.autoCompleteSingleDataList.get(i).autocompleteType = AutocompleteType.UNCACHED.getValue();
+                    this.autoCompleteSingleDataList.get(i).autocompleteType = AutocompleteType.UNCACHED;
                 } else {
-                    this.autoCompleteSingleDataList.get(i).autocompleteType = AutocompleteType.fromValue((Integer) singleData.get("autoCompleteType")).getValue();
+                    this.autoCompleteSingleDataList.get(i).autocompleteType = AutocompleteType.of((Integer) singleData.get("autoCompleteType"));
                 }
                 Map<String, String> options = (Map<String, String>) singleData.get("autoCompleteOptions");
                 if (options != null) {
@@ -354,26 +357,25 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
         return dataMap;
     }
 
-    public enum AutocompleteType {
-        UNCACHED(0), CACHED(1);
+    public enum AutocompleteType implements DatabaseEnum<Integer> {
+        UNCACHED(0),
+        CACHED(1);
 
-        int value;
+        private final int value;
 
         AutocompleteType(int value) {
             this.value = value;
         }
 
-        public int getValue() {
-            return this.value;
+        @JsonValue
+        public Integer getValue() {
+            return value;
         }
 
-        public static AutocompleteType fromValue(int value) {
-            for (AutocompleteType type: AutocompleteType.values()) {
-                if (type.getValue() == value) {
-                    return type;
-                }
-            }
-            return UNCACHED;
+        private static final Map<Integer, AutocompleteType> map = EnumUtils.getEnumValueMap(AutocompleteType.class);
+
+        public static AutocompleteType of(int i) {
+            return map.get(i);
         }
     }
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/FieldData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java
similarity index 64%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/FieldData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java
index eafde3782..e0ead5a54 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/FieldData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BaseFieldDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
@@ -6,8 +6,9 @@ import org.w3c.dom.Element;
 
 import java.util.Map;
 
-public abstract class FieldData<T> implements XmlSerializable<T> {
+public abstract class BaseFieldDataEntity<T> implements XmlSerializable<T> {
     private String label;
+    private String subType;
 
     public String getLabel() {
         return label;
@@ -17,6 +18,14 @@ public abstract class FieldData<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;
     }
@@ -29,9 +38,5 @@ public abstract class FieldData<T> implements XmlSerializable<T> {
         return null;
     }
 
-    public T fromXml(Element item) {
-        return null;
-    }
-
     public abstract Map<String, Object> toMap(Element item);
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/BooleanDecisionData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BooleanDecisionDataEntity.java
similarity index 75%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/BooleanDecisionData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BooleanDecisionDataEntity.java
index 1f0f24cf5..ee37fbcd9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/BooleanDecisionData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/BooleanDecisionDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,10 +6,10 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class BooleanDecisionData extends FieldData<BooleanDecisionData> {
+public class BooleanDecisionDataEntity extends BaseFieldDataEntity<BooleanDecisionDataEntity> {
 
     @Override
-    public BooleanDecisionData fromData(Object data) {
+    public BooleanDecisionDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
@@ -29,7 +29,7 @@ public class BooleanDecisionData extends FieldData<BooleanDecisionData> {
     }
 
     @Override
-    public BooleanDecisionData fromXml(Element item) {
+    public BooleanDecisionDataEntity fromXml(Element item) {
         this.setLabel(item.getAttribute("label"));
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/CheckBoxData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CheckBoxDataEntity.java
similarity index 78%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/CheckBoxData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CheckBoxDataEntity.java
index ca00ecf5b..b6cdb3c04 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/CheckBoxData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CheckBoxDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class CheckBoxData extends FieldData<CheckBoxData> {
+public class CheckBoxDataEntity extends BaseFieldDataEntity<CheckBoxDataEntity> {
 
     @Override
     public Element toXml(Document doc) {
@@ -16,13 +16,13 @@ public class CheckBoxData extends FieldData<CheckBoxData> {
     }
 
     @Override
-    public CheckBoxData fromXml(Element item) {
+    public CheckBoxDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         return this;
     }
 
     @Override
-    public CheckBoxData fromData(Object data) {
+    public CheckBoxDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ComboBoxData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java
similarity index 79%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ComboBoxData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java
index 4d6e2cb3f..3695a68c9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ComboBoxData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ComboBoxDataEntity.java
@@ -1,5 +1,6 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldDataComboBoxType;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -7,7 +8,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class ComboBoxData<T> extends FieldData<T> {
+public abstract class ComboBoxDataEntity<T> extends BaseFieldDataEntity<T> {
     public static class Option implements XmlSerializable<Option> {
         private String label;
         private String value;
@@ -54,7 +55,7 @@ public abstract class ComboBoxData<T> extends FieldData<T> {
         }
 
         @Override
-        public ComboBoxData.Option fromXml(Element item) {
+        public ComboBoxDataEntity.Option fromXml(Element item) {
             this.label = item.getAttribute("label");
             this.value = item.getAttribute("value");
             this.source = item.getAttribute("source");
@@ -64,20 +65,18 @@ public abstract class ComboBoxData<T> extends FieldData<T> {
 
     }
 
-    private String type;
-
-    public String getType() {
-        return type;
+    public FieldDataComboBoxType getType() {
+        return FieldDataComboBoxType.of(this.getSubType());
     }
 
-    public void setType(String type) {
-        this.type = type;
+    public void setType(FieldDataComboBoxType type) {
+        this.setSubType(type.getValue());
     }
 
     @Override
     public Element toXml(Document doc) {
         Element root = doc.createElement("data");
-        root.setAttribute("type", this.type);
+        root.setAttribute("type", this.getSubType());
         root.setAttribute("label", this.getLabel());
         return root;
     }
@@ -85,7 +84,7 @@ public abstract class ComboBoxData<T> extends FieldData<T> {
     @Override
     public T fromXml(Element item) {
         this.setLabel(item.getAttribute("label"));
-        this.type = item.getAttribute("type");
+        this.setSubType(item.getAttribute("type"));
         return (T) this;
     }
 
@@ -93,7 +92,7 @@ public abstract class ComboBoxData<T> extends FieldData<T> {
     public T fromData(Object data) {
 
         if (data != null) {
-            this.type = (String) ((Map<String, Object>) data).get("type");
+            this.setSubType((String) ((Map<String, Object>) data).get("type"));
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatePickerData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CurrencyDataEntity.java
similarity index 77%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatePickerData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CurrencyDataEntity.java
index f4497c234..3907d9025 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatePickerData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/CurrencyDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,9 +6,9 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class DatePickerData extends FieldData<DatePickerData> {
+public class CurrencyDataEntity extends BaseFieldDataEntity<CurrencyDataEntity> {
     @Override
-    public DatePickerData fromData(Object data) {
+    public CurrencyDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
@@ -28,7 +28,7 @@ public class DatePickerData extends FieldData<DatePickerData> {
     }
 
     @Override
-    public DatePickerData fromXml(Element item) {
+    public CurrencyDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/LicensesData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DataRepositoryDataEntity.java
similarity index 86%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/LicensesData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DataRepositoryDataEntity.java
index ccfe38a20..a4a570c19 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/LicensesData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DataRepositoryDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class LicensesData extends FieldData<LicensesData> {
+public class DataRepositoryDataEntity extends BaseFieldDataEntity<DataRepositoryDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class LicensesData extends FieldData<LicensesData> {
     }
 
     @Override
-    public LicensesData fromData(Object data) {
+    public DataRepositoryDataEntity 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);
@@ -42,7 +42,7 @@ public class LicensesData extends FieldData<LicensesData> {
     }
 
     @Override
-    public LicensesData fromXml(Element item) {
+    public DataRepositoryDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetsAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetAutoCompleteDataEntity.java
similarity index 81%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetsAutoCompleteData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetAutoCompleteDataEntity.java
index 67eba665f..e66aeffb2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetsAutoCompleteData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetAutoCompleteDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class DatasetsAutoCompleteData extends InternalDmpEntitiesData<DatasetsAutoCompleteData> {
+public class DatasetAutoCompleteDataEntity extends InternalDmpBaseDataEntity<DatasetAutoCompleteDataEntity> {
 	private Boolean multiAutoComplete;
 
 	public Boolean getMultiAutoComplete() {
@@ -25,7 +25,7 @@ public class DatasetsAutoCompleteData extends InternalDmpEntitiesData<DatasetsAu
 	}
 
 	@Override
-	public DatasetsAutoCompleteData fromXml(Element item) {
+	public DatasetAutoCompleteDataEntity fromXml(Element item) {
 		super.fromXml(item);
 		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
 
@@ -33,7 +33,7 @@ public class DatasetsAutoCompleteData extends InternalDmpEntitiesData<DatasetsAu
 	}
 
 	@Override
-	public DatasetsAutoCompleteData fromData(Object data) {
+	public DatasetAutoCompleteDataEntity fromData(Object data) {
 		super.fromData(data);
 		if (data != null) {
 			this.multiAutoComplete = (Boolean) ((Map<Boolean, Object>) data).get("multiAutoComplete");
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
new file mode 100644
index 000000000..2e31e8c0b
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatasetIdentifierDataEntity.java
@@ -0,0 +1,42 @@
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DatasetIdentifierDataEntity extends BaseFieldDataEntity<DatasetIdentifierDataEntity> {
+    @Override
+    public DatasetIdentifierDataEntity fromData(Object data) {
+        if (data != null) {
+            this.setLabel((String) ((Map<String, Object>) data).get("label"));
+        }
+        return this;
+    }
+
+    @Override
+    public Object toData() {
+        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();
+        dataMap.put("label", item != null ? item.getAttribute("label") : "");
+        return dataMap;
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/CurrencyData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatePickerDataEntity.java
similarity index 76%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/CurrencyData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatePickerDataEntity.java
index 2bf7ca475..58b8fff50 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/CurrencyData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DatePickerDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,9 +6,9 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class CurrencyData extends FieldData<CurrencyData> {
+public class DatePickerDataEntity extends BaseFieldDataEntity<DatePickerDataEntity> {
     @Override
-    public CurrencyData fromData(Object data) {
+    public DatePickerDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
@@ -28,7 +28,7 @@ public class CurrencyData extends FieldData<CurrencyData> {
     }
 
     @Override
-    public CurrencyData fromXml(Element item) {
+    public DatePickerDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DMPsAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DmpAutoCompleteDataEntity.java
similarity index 82%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DMPsAutoCompleteData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DmpAutoCompleteDataEntity.java
index 025a8c036..37033d4b3 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DMPsAutoCompleteData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/DmpAutoCompleteDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class DMPsAutoCompleteData extends InternalDmpEntitiesData<DMPsAutoCompleteData>{
+public class DmpAutoCompleteDataEntity extends InternalDmpBaseDataEntity<DmpAutoCompleteDataEntity> {
 	private Boolean multiAutoComplete;
 
 	public Boolean getMultiAutoComplete() {
@@ -25,7 +25,7 @@ public class DMPsAutoCompleteData extends InternalDmpEntitiesData<DMPsAutoComple
 	}
 
 	@Override
-	public DMPsAutoCompleteData fromXml(Element item) {
+	public DmpAutoCompleteDataEntity fromXml(Element item) {
 		super.fromXml(item);
 		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
 
@@ -33,7 +33,7 @@ public class DMPsAutoCompleteData extends InternalDmpEntitiesData<DMPsAutoComple
 	}
 
 	@Override
-	public DMPsAutoCompleteData fromData(Object data) {
+	public DmpAutoCompleteDataEntity fromData(Object data) {
 		super.fromData(data);
 		if (data != null) {
 			this.multiAutoComplete = (Boolean) ((Map<Boolean, Object>) data).get("multiAutoComplete");
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java
similarity index 71%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java
index cad4e4f19..3705b41da 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ExternalDatasetDataEntity.java
@@ -1,14 +1,15 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldDataExternalDatasetType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class ExternalDatasetsData extends FieldData<ExternalDatasetsData> {
+public class ExternalDatasetDataEntity extends BaseFieldDataEntity<ExternalDatasetDataEntity> {
     private Boolean multiAutoComplete;
-    private String type;
+    private FieldDataExternalDatasetType type;
 
     public Boolean getMultiAutoComplete() {
         return multiAutoComplete;
@@ -18,20 +19,20 @@ public class ExternalDatasetsData extends FieldData<ExternalDatasetsData> {
         this.multiAutoComplete = multiAutoComplete;
     }
 
-    public String getType() {
+    public FieldDataExternalDatasetType getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(FieldDataExternalDatasetType type) {
         this.type = type;
     }
 
     @Override
-    public ExternalDatasetsData fromData(Object data) {
+    public ExternalDatasetDataEntity 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);
-            this.setType(((Map<String, Object>) data).get("type") != null && !((Map<String, Object>) data).get("type").toString().isEmpty()? ((Map<String, Object>) data).get("type").toString() : "other");
+            this.setType(((Map<String, Object>) data).get("type") != null && !((Map<String, Object>) data).get("type").toString().isEmpty()? FieldDataExternalDatasetType.of(((Map<String, Object>) data).get("type").toString()) : FieldDataExternalDatasetType.Other);
         }
         return this;
     }
@@ -49,16 +50,16 @@ public class ExternalDatasetsData extends FieldData<ExternalDatasetsData> {
             root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString());
         }
         if (this.getType() != null) {
-            root.setAttribute("type", this.getType());
+            root.setAttribute("type", this.getType().getValue());
         }
         return root;
     }
 
     @Override
-    public ExternalDatasetsData fromXml(Element item) {
+    public ExternalDatasetDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
-        this.setType(item.getAttribute("type") != null ? item.getAttribute("type"): "other");
+        this.setType(item.getAttribute("type") != null ? FieldDataExternalDatasetType.of(item.getAttribute("type")): FieldDataExternalDatasetType.Other);
         return this;
     }
 
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
new file mode 100644
index 000000000..f3d01f299
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FieldDataHelper.java
@@ -0,0 +1,84 @@
+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.Element;
+import java.util.Map;
+
+public class FieldDataHelper {
+    public BaseFieldDataEntity<?> create(FieldType type, String subType) {
+        switch (type) {
+            case COMBO_BOX: {
+                if (subType != null && !subType.isBlank()) {
+                    switch (FieldDataComboBoxType.of(subType)) {
+                        case Wordlist: {
+                            return new WordListDataEntity();
+                        }
+                        case Autocomplete: {
+                            return new AutoCompleteDataEntity();
+                        }
+                    }
+                }
+                break;
+            }
+            case INTERNAL_DMP_ENTRIES: {
+                if (subType != null && !subType.isBlank()) {
+                    switch (FieldDataInternalDmpEntryType.of(subType)){
+                        case Dmps: {
+                            return new DmpAutoCompleteDataEntity();
+                        }
+                        case Datasets: {
+                            return new DatasetAutoCompleteDataEntity();
+                        }
+                        case Researchers : {
+                            return new ResearcherAutoCompleteDataEntity();
+                        }
+                    }
+                }
+                break;
+            }
+            case BOOLEAN_DECISION: return new BooleanDecisionDataEntity();
+            case RADIO_BOX: return new RadioBoxDataEntity();
+            case CHECK_BOX: return new CheckBoxDataEntity();
+            case FREE_TEXT: return new FreeTextDataEntity();
+            case TEXT_AREA: return new TextAreaDataEntity();
+            case RICH_TEXT_AREA: return new RichTextAreaDataEntity();
+            case UPLOAD: return new UploadDataEntity();
+            case DATE_PICKER: return new DatePickerDataEntity();
+            case EXTERNAL_DATASETS: return new ExternalDatasetDataEntity();
+            case DATA_REPOSITORIES:
+            case PUB_REPOSITORIES:
+            case JOURNAL_REPOSITORIES: return new DataRepositoryDataEntity();
+            case TAXONOMIES: return new TaxonomyDataEntity();
+            case LICENSES: return new LicenseDataEntity();
+            case PUBLICATIONS: return new PublicationDataEntity();
+            case REGISTRIES: return new RegistryDataEntity();
+            case SERVICES: return new ServiceDataEntity();
+            case TAGS: return new TagDataEntity();
+            case RESEARCHERS: return new ResearcherDataEntity();
+            case ORGANIZATIONS: return new OrganizationDataEntity();
+            case DATASET_IDENTIFIER:  return new DatasetIdentifierDataEntity();
+            case CURRENCY:  return new CurrencyDataEntity();
+            case VALIDATION:  return new ValidationDataEntity();
+            default: return null;
+        }
+
+        return null;
+    }
+    
+    public BaseFieldDataEntity<?> toFieldData(Object data, FieldType type, Element dataElement) {
+        String subType = dataElement != null ? dataElement.getAttribute("type") : null;
+        BaseFieldDataEntity<?> baseFieldData = this.create(type, subType); 
+        if (baseFieldData == null) return baseFieldData;
+        return (BaseFieldDataEntity<?>) baseFieldData.fromData(data);
+    }
+
+    public BaseFieldDataEntity<?> toFieldData(Object data, FieldType type) {
+        Map<String, Object> dataAsMap = (Map<String, Object>) data;
+        String subType = dataAsMap != null ? (String) dataAsMap.getOrDefault("type", null) : null;
+        BaseFieldDataEntity<?> baseFieldData = this.create(type, subType);
+        if (baseFieldData == null) return baseFieldData;
+        return (BaseFieldDataEntity<?>) baseFieldData.fromData(data);
+    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/FreeTextData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FreeTextDataEntity.java
similarity index 76%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/FreeTextData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FreeTextDataEntity.java
index 927194db9..923354765 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/FreeTextData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/FreeTextDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -7,10 +7,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-public class FreeTextData extends FieldData<FreeTextData> {
+public class FreeTextDataEntity extends BaseFieldDataEntity<FreeTextDataEntity> {
 
     @Override
-    public FreeTextData fromData(Object data) {
+    public FreeTextDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel(((Map<String, String>) data).get("label"));
         }
@@ -30,7 +30,7 @@ public class FreeTextData extends FieldData<FreeTextData> {
     }
 
     @Override
-    public FreeTextData fromXml(Element item) {
+    public FreeTextDataEntity fromXml(Element item) {
         this.setLabel(item.getAttribute("label"));
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/InternalDmpEntitiesData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java
similarity index 60%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/InternalDmpEntitiesData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java
index 63fbc6ea9..f859326c6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/InternalDmpEntitiesData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/InternalDmpBaseDataEntity.java
@@ -1,25 +1,24 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
+import eu.eudat.commons.enums.FieldDataInternalDmpEntryType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class InternalDmpEntitiesData<T> extends FieldData<T> {
-	private String type;
-
-	public String getType() {
-		return type;
+public abstract class InternalDmpBaseDataEntity<T> extends BaseFieldDataEntity<T> {
+	public FieldDataInternalDmpEntryType getType() {
+		return FieldDataInternalDmpEntryType.of(this.getSubType());
 	}
-	public void setType(String type) {
-		this.type = type;
+	public void setType(FieldDataInternalDmpEntryType type) {
+		this.setSubType(type.getValue());
 	}
 
 	@Override
 	public Element toXml(Document doc) {
 		Element root = doc.createElement("data");
-		root.setAttribute("type", this.type);
+		root.setAttribute("type", this.getType().getValue());
 		root.setAttribute("label", this.getLabel());
 		return root;
 	}
@@ -27,7 +26,7 @@ public abstract class InternalDmpEntitiesData<T> extends FieldData<T> {
 	@Override
 	public T fromXml(Element item) {
 		this.setLabel(item.getAttribute("label"));
-		this.type = item.getAttribute("type");
+		this.setType(FieldDataInternalDmpEntryType.of(item.getAttribute("type")));
 		return (T) this;
 	}
 
@@ -35,7 +34,7 @@ public abstract class InternalDmpEntitiesData<T> extends FieldData<T> {
 	public T fromData(Object data) {
 
 		if (data != null) {
-			this.type = (String) ((Map<String, Object>) data).get("type");
+			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/web/src/main/java/eu/eudat/models/data/components/commons/datafield/PublicationsData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LicenseDataEntity.java
similarity index 87%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/PublicationsData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LicenseDataEntity.java
index 491b6d00a..ada34559c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/PublicationsData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/LicenseDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class PublicationsData extends FieldData<PublicationsData> {
+public class LicenseDataEntity extends BaseFieldDataEntity<LicenseDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class PublicationsData extends FieldData<PublicationsData> {
     }
 
     @Override
-    public PublicationsData fromData(Object data) {
+    public LicenseDataEntity 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);
@@ -42,7 +42,7 @@ public class PublicationsData extends FieldData<PublicationsData> {
     }
 
     @Override
-    public PublicationsData fromXml(Element item) {
+    public LicenseDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/OrganizationDataEntity.java
similarity index 87%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/OrganizationDataEntity.java
index 897f7586e..5ee596ace 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/OrganizationDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ServicesData extends FieldData<ServicesData> {
+public class OrganizationDataEntity extends BaseFieldDataEntity<OrganizationDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class ServicesData extends FieldData<ServicesData> {
     }
 
     @Override
-    public ServicesData fromData(Object data) {
+    public OrganizationDataEntity 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);
@@ -42,7 +42,7 @@ public class ServicesData extends FieldData<ServicesData> {
     }
 
     @Override
-    public ServicesData fromXml(Element item) {
+    public OrganizationDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TaxonomiesData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationDataEntity.java
similarity index 87%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TaxonomiesData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationDataEntity.java
index e568b284f..65daa9654 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TaxonomiesData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/PublicationDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class TaxonomiesData extends FieldData<TaxonomiesData> {
+public class PublicationDataEntity extends BaseFieldDataEntity<PublicationDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class TaxonomiesData extends FieldData<TaxonomiesData> {
     }
 
     @Override
-    public TaxonomiesData fromData(Object data) {
+    public PublicationDataEntity 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);
@@ -42,7 +42,7 @@ public class TaxonomiesData extends FieldData<TaxonomiesData> {
     }
 
     @Override
-    public TaxonomiesData fromXml(Element item) {
+    public PublicationDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RadioBoxData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java
similarity index 94%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RadioBoxData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java
index f5389510b..fac8b5c3f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RadioBoxData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RadioBoxDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
@@ -11,7 +11,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-public class RadioBoxData extends FieldData<RadioBoxData> {
+public class RadioBoxDataEntity extends BaseFieldDataEntity<RadioBoxDataEntity> {
 
     public class Option implements XmlSerializable<Option> {
         private String label;
@@ -62,7 +62,7 @@ public class RadioBoxData extends FieldData<RadioBoxData> {
     }
 
     @Override
-    public RadioBoxData fromData(Object data) {
+    public RadioBoxDataEntity fromData(Object data) {
         this.options = new LinkedList();
         if (data != null) {
             List<Map<String, String>> options = ((Map<String, List<Map<String, String>>>) data).get("options");
@@ -96,7 +96,7 @@ public class RadioBoxData extends FieldData<RadioBoxData> {
     }
 
     @Override
-    public RadioBoxData fromXml(Element item) {
+    public RadioBoxDataEntity fromXml(Element item) {
 
         this.options = new LinkedList<>();
         Element optionsElement = (Element) item.getElementsByTagName("options").item(0);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RegistryDataEntity.java
similarity index 87%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RegistryDataEntity.java
index 2de478246..5bd11ace7 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RegistryDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class RegistriesData extends FieldData<RegistriesData> {
+public class RegistryDataEntity extends BaseFieldDataEntity<RegistryDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class RegistriesData extends FieldData<RegistriesData> {
     }
 
     @Override
-    public RegistriesData fromData(Object data) {
+    public RegistryDataEntity 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);
@@ -42,7 +42,7 @@ public class RegistriesData extends FieldData<RegistriesData> {
     }
 
     @Override
-    public RegistriesData fromXml(Element item) {
+    public RegistryDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearchersAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherAutoCompleteDataEntity.java
similarity index 81%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearchersAutoCompleteData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherAutoCompleteDataEntity.java
index 03ddb717f..13e0b09e9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearchersAutoCompleteData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherAutoCompleteDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ResearchersAutoCompleteData extends InternalDmpEntitiesData<ResearchersAutoCompleteData> {
+public class ResearcherAutoCompleteDataEntity extends InternalDmpBaseDataEntity<ResearcherAutoCompleteDataEntity> {
 	private Boolean multiAutoComplete;
 
 	public Boolean getMultiAutoComplete() {
@@ -25,7 +25,7 @@ public class ResearchersAutoCompleteData extends InternalDmpEntitiesData<Researc
 	}
 
 	@Override
-	public ResearchersAutoCompleteData fromXml(Element item) {
+	public ResearcherAutoCompleteDataEntity fromXml(Element item) {
 		super.fromXml(item);
 		this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
 
@@ -33,7 +33,7 @@ public class ResearchersAutoCompleteData extends InternalDmpEntitiesData<Researc
 	}
 
 	@Override
-	public ResearchersAutoCompleteData fromData(Object data) {
+	public ResearcherAutoCompleteDataEntity fromData(Object data) {
 		super.fromData(data);
 		if (data != null) {
 			this.multiAutoComplete = Boolean.parseBoolean(((Map<Boolean, Object>) data).get("multiAutoComplete").toString());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherDataEntity.java
similarity index 87%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherDataEntity.java
index c76260736..d1d30216c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ResearcherDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ResearcherData extends FieldData<ResearcherData> {
+public class ResearcherDataEntity extends BaseFieldDataEntity<ResearcherDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class ResearcherData extends FieldData<ResearcherData> {
     }
 
     @Override
-    public ResearcherData fromData(Object data) {
+    public ResearcherDataEntity 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);
@@ -42,7 +42,7 @@ public class ResearcherData extends FieldData<ResearcherData> {
     }
 
     @Override
-    public ResearcherData fromXml(Element item) {
+    public ResearcherDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RichTextAreaData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RichTextAreaDataEntity.java
similarity index 75%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RichTextAreaData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RichTextAreaDataEntity.java
index f787079e9..8dbfe5337 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RichTextAreaData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/RichTextAreaDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -7,9 +7,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-public class RichTextAreaData extends FieldData<RichTextAreaData> {
+public class RichTextAreaDataEntity extends BaseFieldDataEntity<RichTextAreaDataEntity> {
     @Override
-    public RichTextAreaData fromData(Object data) {
+    public RichTextAreaDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel(((Map<String, String>) data).get("label"));
         }
@@ -29,7 +29,7 @@ public class RichTextAreaData extends FieldData<RichTextAreaData> {
     }
 
     @Override
-    public RichTextAreaData fromXml(Element item) {
+    public RichTextAreaDataEntity fromXml(Element item) {
         this.setLabel(item.getAttribute("label"));
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ServiceDataEntity.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ServiceDataEntity.java
index 0ae171e38..33938233b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ServiceDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class OrganizationsData extends FieldData<OrganizationsData> {
+public class ServiceDataEntity extends BaseFieldDataEntity<ServiceDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class OrganizationsData extends FieldData<OrganizationsData> {
     }
 
     @Override
-    public OrganizationsData fromData(Object data) {
+    public ServiceDataEntity 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);
@@ -42,7 +42,7 @@ public class OrganizationsData extends FieldData<OrganizationsData> {
     }
 
     @Override
-    public OrganizationsData fromXml(Element item) {
+    public ServiceDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TagsData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TagDataEntity.java
similarity index 78%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TagsData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TagDataEntity.java
index 588d57f65..20fcdb63e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TagsData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TagDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,9 +6,9 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class TagsData extends FieldData<TagsData> {
+public class TagDataEntity extends BaseFieldDataEntity<TagDataEntity> {
     @Override
-    public TagsData fromData(Object data) {
+    public TagDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
@@ -28,7 +28,7 @@ public class TagsData extends FieldData<TagsData> {
     }
 
     @Override
-    public TagsData fromXml(Element item) {
+    public TagDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TaxonomyDataEntity.java
similarity index 87%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TaxonomyDataEntity.java
index e4b3dc384..4c11a9155 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TaxonomyDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,7 +6,7 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class DataRepositoriesData extends FieldData<DataRepositoriesData> {
+public class TaxonomyDataEntity extends BaseFieldDataEntity<TaxonomyDataEntity> {
     private Boolean multiAutoComplete;
 
     public Boolean getMultiAutoComplete() {
@@ -18,7 +18,7 @@ public class DataRepositoriesData extends FieldData<DataRepositoriesData> {
     }
 
     @Override
-    public DataRepositoriesData fromData(Object data) {
+    public TaxonomyDataEntity 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);
@@ -42,7 +42,7 @@ public class DataRepositoriesData extends FieldData<DataRepositoriesData> {
     }
 
     @Override
-    public DataRepositoriesData fromXml(Element item) {
+    public TaxonomyDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete")));
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TextAreaData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TextAreaDataEntity.java
similarity index 76%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TextAreaData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TextAreaDataEntity.java
index bddc6a897..c92767f3a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/TextAreaData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/TextAreaDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -7,9 +7,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-public class TextAreaData extends FieldData<TextAreaData> {
+public class TextAreaDataEntity extends BaseFieldDataEntity<TextAreaDataEntity> {
     @Override
-    public TextAreaData fromData(Object data) {
+    public TextAreaDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel(((Map<String, String>) data).get("label"));
         }
@@ -29,7 +29,7 @@ public class TextAreaData extends FieldData<TextAreaData> {
     }
 
     @Override
-    public TextAreaData fromXml(Element item) {
+    public TextAreaDataEntity fromXml(Element item) {
         this.setLabel(item.getAttribute("label"));
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/UploadData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/UploadDataEntity.java
similarity index 85%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/UploadData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/UploadDataEntity.java
index f7821dc3a..cb8a6718b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/UploadData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/UploadDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
@@ -12,8 +12,8 @@ import java.util.List;
 import java.util.Map;
 
 
-public class UploadData extends FieldData<UploadData> {
-    public class Option implements XmlSerializable<UploadData.Option> {
+public class UploadDataEntity extends BaseFieldDataEntity<UploadDataEntity> {
+    public class Option implements XmlSerializable<UploadDataEntity.Option> {
         private String label;
         private String value;
 
@@ -42,7 +42,7 @@ public class UploadData extends FieldData<UploadData> {
         }
 
         @Override
-        public UploadData.Option fromXml(Element item) {
+        public UploadDataEntity.Option fromXml(Element item) {
             this.label = item.getAttribute("label");
             this.value = item.getAttribute("value");
             return this;
@@ -51,13 +51,13 @@ public class UploadData extends FieldData<UploadData> {
 
     }
 
-    private List<UploadData.Option> types;
+    private List<UploadDataEntity.Option> types;
 
-    public List<UploadData.Option> getTypes() {
+    public List<UploadDataEntity.Option> getTypes() {
         return types;
     }
 
-    public void setTypes(List<UploadData.Option> types) {
+    public void setTypes(List<UploadDataEntity.Option> types) {
         this.types = types;
     }
 
@@ -72,12 +72,12 @@ public class UploadData extends FieldData<UploadData> {
     }
 
     @Override
-    public UploadData fromData(Object data) {
+    public UploadDataEntity fromData(Object data) {
         this.types = new LinkedList();
         if (data != null) {
             List<Map<String, String>> types = ((Map<String, List<Map<String, String>>>) data).get("types");
             for (Map<String, String> map : types) {
-                UploadData.Option newOption = new UploadData.Option();
+                UploadDataEntity.Option newOption = new UploadDataEntity.Option();
                 newOption.setLabel(map.get("label"));
                 newOption.setValue(map.get("value"));
                 this.types.add(newOption);
@@ -104,7 +104,7 @@ public class UploadData extends FieldData<UploadData> {
     public Element toXml(Document doc) {
         Element root = doc.createElement("data");
         Element element = doc.createElement("types");
-        for (UploadData.Option type : this.types) {
+        for (UploadDataEntity.Option type : this.types) {
             element.appendChild(type.toXml(doc));
         }
         root.setAttribute("label", this.getLabel());
@@ -114,7 +114,7 @@ public class UploadData extends FieldData<UploadData> {
     }
 
     @Override
-    public UploadData fromXml(Element item) {
+    public UploadDataEntity fromXml(Element item) {
         this.types = new LinkedList<>();
         Element optionsElement = (Element) item.getElementsByTagName("types").item(0);
         this.setLabel(item.getAttribute("label"));
@@ -126,7 +126,7 @@ public class UploadData extends FieldData<UploadData> {
             for (int temp = 0; temp < optionElements.getLength(); temp++) {
                 Node optionElement = optionElements.item(temp);
                 if (optionElement.getNodeType() == Node.ELEMENT_NODE) {
-                    this.types.add(new UploadData.Option().fromXml((Element) optionElement));
+                    this.types.add(new UploadDataEntity.Option().fromXml((Element) optionElement));
                 }
             }
         }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetIdentifierData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ValidationDataEntity.java
similarity index 76%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetIdentifierData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ValidationDataEntity.java
index ed3f9bda6..b390a84d0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DatasetIdentifierData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/ValidationDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -6,9 +6,9 @@ import org.w3c.dom.Element;
 import java.util.HashMap;
 import java.util.Map;
 
-public class DatasetIdentifierData extends FieldData<DatasetIdentifierData> {
+public class ValidationDataEntity extends BaseFieldDataEntity<ValidationDataEntity> {
     @Override
-    public DatasetIdentifierData fromData(Object data) {
+    public ValidationDataEntity fromData(Object data) {
         if (data != null) {
             this.setLabel((String) ((Map<String, Object>) data).get("label"));
         }
@@ -28,7 +28,7 @@ public class DatasetIdentifierData extends FieldData<DatasetIdentifierData> {
     }
 
     @Override
-    public DatasetIdentifierData fromXml(Element item) {
+    public ValidationDataEntity fromXml(Element item) {
         this.setLabel(item != null ? item.getAttribute("label") : "");
         return this;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/WordListData.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/WordListDataEntity.java
similarity index 94%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/WordListData.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/WordListDataEntity.java
index d8fdebca4..d931e40bb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/WordListData.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/fielddata/WordListDataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.models.data.components.commons.datafield;
+package eu.eudat.commons.types.descriptiontemplate.fielddata;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -10,8 +10,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-public class WordListData extends ComboBoxData<WordListData> {
+public class WordListDataEntity extends ComboBoxDataEntity<WordListDataEntity> {
     private List<Option> options;
+    
     private Boolean multiList;
 
     public List<Option> getOptions() {
@@ -45,7 +46,7 @@ public class WordListData extends ComboBoxData<WordListData> {
     }
 
     @Override
-    public WordListData fromXml(Element item) {
+    public WordListDataEntity fromXml(Element item) {
         super.fromXml(item);
         this.options = new LinkedList<>();
         Element optionsElement = (Element) item.getElementsByTagName("options").item(0);
@@ -65,7 +66,7 @@ public class WordListData extends ComboBoxData<WordListData> {
     }
 
     @Override
-    public WordListData fromData(Object data) {
+    public WordListDataEntity fromData(Object data) {
         super.fromData(data);
         this.options = new LinkedList();
         if (data != null) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/DefaultValue.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/DefaultValueEntity.java
similarity index 77%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/DefaultValue.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/DefaultValueEntity.java
index 01b6b2071..044ce7b7c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/DefaultValue.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/DefaultValueEntity.java
@@ -1,6 +1,6 @@
-package eu.eudat.models.data.components.commons;
+package eu.eudat.commons.types.descriptiontemplate.todelete;
 
-public class DefaultValue {
+public class DefaultValueEntity {
     private String type;
     private String value;
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/FieldDescriptionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/FieldDescriptionEntity.java
new file mode 100644
index 000000000..90aa7f566
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/FieldDescriptionEntity.java
@@ -0,0 +1,26 @@
+package eu.eudat.commons.types.descriptiontemplate.todelete;
+
+import eu.eudat.commons.enums.FieldType;
+
+public class FieldDescriptionEntity {
+    private FieldType fieldType;
+    private String cssClass;
+
+    public FieldType getFieldType() {
+        return fieldType;
+    }
+
+    public void setFieldType(FieldType fieldType) {
+        this.fieldType = fieldType;
+    }
+
+    public String getCssClass() {
+        return cssClass;
+    }
+
+    public void setCssClass(String cssClass) {
+        this.cssClass = cssClass;
+    }
+
+
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Visibility.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/VisibilityEntity.java
similarity index 69%
rename from dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Visibility.java
rename to dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/VisibilityEntity.java
index 5e627f302..43b63976c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Visibility.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/todelete/VisibilityEntity.java
@@ -1,5 +1,6 @@
-package eu.eudat.models.data.components.commons;
+package eu.eudat.commons.types.descriptiontemplate.todelete;
 
+import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -9,15 +10,15 @@ import org.w3c.dom.NodeList;
 import java.util.LinkedList;
 import java.util.List;
 
-public class Visibility implements XmlSerializable<Visibility> {
-    private List<Rule> rules;
+public class VisibilityEntity implements XmlSerializable<VisibilityEntity> {
+    private List<RuleEntity> rules;
     private String style;
 
-    public List<Rule> getRules() {
+    public List<RuleEntity> getRules() {
         return rules;
     }
 
-    public void setRules(List<Rule> rules) {
+    public void setRules(List<RuleEntity> rules) {
         this.rules = rules;
     }
 
@@ -34,7 +35,7 @@ public class Visibility implements XmlSerializable<Visibility> {
         Element root = doc.createElement("visible");
         root.setAttribute("style", this.style);
         if (rules != null && !rules.isEmpty()) {
-            for (Rule rule : rules) {
+            for (RuleEntity rule : rules) {
                 root.appendChild(rule.toXml(doc));
             }
         }
@@ -42,14 +43,14 @@ public class Visibility implements XmlSerializable<Visibility> {
     }
 
     @Override
-    public Visibility fromXml(Element item) {
+    public VisibilityEntity fromXml(Element item) {
         this.style = item.getAttribute("style");
         this.rules = new LinkedList();
         NodeList rulesElements = item.getChildNodes();
         for (int temp = 0; temp < rulesElements.getLength(); temp++) {
             Node ruleElement = rulesElements.item(temp);
             if (ruleElement.getNodeType() == Node.ELEMENT_NODE) {
-                this.rules.add(new Rule().fromXml((Element) ruleElement));
+                this.rules.add(new RuleEntity().fromXml((Element) ruleElement));
             }
         }
         return this;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DefinitionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DefinitionEntity.java
index a9e2f013f..7525006bf 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DefinitionEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DefinitionEntity.java
@@ -2,6 +2,7 @@ package eu.eudat.commons.types.dmpblueprint;
 
 import eu.eudat.commons.types.xml.XmlBuilder;
 import eu.eudat.commons.types.xml.XmlSerializable;
+import jakarta.xml.bind.annotation.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -10,7 +11,11 @@ import org.w3c.dom.NodeList;
 import java.util.LinkedList;
 import java.util.List;
 
+@XmlRootElement(name = "root")
+@XmlAccessorType(XmlAccessType.FIELD)
 public class DefinitionEntity implements XmlSerializable<DefinitionEntity> {
+	@XmlElementWrapper(name = "sections")
+	@XmlElement(name = "section")
 	private List<SectionEntity> sections;
 
 	public List<SectionEntity> getSections() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DescriptionTemplateEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DescriptionTemplateEntity.java
index 52447f328..4b2407e12 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DescriptionTemplateEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/DescriptionTemplateEntity.java
@@ -1,17 +1,26 @@
 package eu.eudat.commons.types.dmpblueprint;
 
 import eu.eudat.commons.types.xml.XmlSerializable;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.util.UUID;
 
+@XmlAccessorType(XmlAccessType.FIELD)
 public class DescriptionTemplateEntity implements XmlSerializable<DescriptionTemplateEntity> {
 
+    @XmlAttribute(name="id")
     private UUID id;
+    @XmlAttribute(name="descriptionTemplateId")
     private UUID descriptionTemplateId;
+    @XmlAttribute(name="label")
     private String label;
+    @XmlAttribute(name="minMultiplicity")
     private Integer minMultiplicity;
+    @XmlAttribute(name="maxMultiplicity")
     private Integer maxMultiplicity;
 
     public UUID getId() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/ExternalAutoCompleteEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/ExternalAutoCompleteEntity.java
deleted file mode 100644
index 23f217552..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/ExternalAutoCompleteEntity.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package eu.eudat.commons.types.dmpblueprint;
-
-import eu.eudat.commons.types.xml.XmlSerializable;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class ExternalAutoCompleteEntity implements XmlSerializable<ExternalAutoCompleteEntity> {
-	private String url;
-	private String optionsRoot;
-	private Boolean multiAutoComplete;
-	private String label;
-	private String value;
-
-	public String getUrl() {
-		return url;
-	}
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getOptionsRoot() {
-		return optionsRoot;
-	}
-	public void setOptionsRoot(String optionsRoot) {
-		this.optionsRoot = optionsRoot;
-	}
-
-	public Boolean getMultiAutoComplete() { return multiAutoComplete; }
-	public void setMultiAutoComplete(Boolean multiAutoComplete) { this.multiAutoComplete = multiAutoComplete; }
-
-	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;
-	}
-
-	@Override
-	public Element toXml(Document doc) {
-		Element root = doc.createElement("externalAutocomplete");
-		root.setAttribute("url", this.url);
-		root.setAttribute("optionsRoot", this.optionsRoot);
-		if (this.multiAutoComplete == null) this.multiAutoComplete = false;
-		root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
-		root.setAttribute("label", this.label);
-		root.setAttribute("value", this.value);
-
-		return root;
-	}
-
-	@Override
-	public ExternalAutoCompleteEntity fromXml(Element item) {
-		this.url = item.getAttribute("url");
-		this.optionsRoot = item.getAttribute("optionsRoot");
-		this.multiAutoComplete = Boolean.valueOf(item.getAttribute("multiAutoComplete"));
-		this.label = item.getAttribute("label");
-		this.value = item.getAttribute("value");
-
-		return this;
-	}
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/ExtraFieldEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/ExtraFieldEntity.java
index 0417f550b..ef68c2f94 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/ExtraFieldEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/ExtraFieldEntity.java
@@ -2,10 +2,15 @@ package eu.eudat.commons.types.dmpblueprint;
 
 import eu.eudat.commons.enums.DmpBlueprintExtraFieldDataType;
 import eu.eudat.commons.enums.DmpBlueprintFieldCategory;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
 import org.w3c.dom.Element;
 
+@XmlAccessorType(XmlAccessType.FIELD)
 public class ExtraFieldEntity extends FieldEntity {
 
+    @XmlAttribute(name="type")
     private DmpBlueprintExtraFieldDataType type;
 
     public DmpBlueprintExtraFieldDataType getType() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/FieldEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/FieldEntity.java
index 1f83590dc..de1cc6c98 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/FieldEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/FieldEntity.java
@@ -3,18 +3,36 @@ package eu.eudat.commons.types.dmpblueprint;
 import eu.eudat.commons.enums.DmpBlueprintExtraFieldDataType;
 import eu.eudat.commons.enums.DmpBlueprintFieldCategory;
 import eu.eudat.commons.types.xml.XmlSerializable;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlTransient;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.util.UUID;
 
+@XmlAccessorType(XmlAccessType.FIELD)
 public abstract class FieldEntity implements XmlSerializable<FieldEntity> {
+	@XmlAttribute(name="id")
 	private UUID id;
+
+	@XmlTransient
 	private DmpBlueprintFieldCategory category;
+
+	@XmlAttribute(name="label")
 	private String label;
+
+	@XmlAttribute(name="placeholder")
 	private String placeholder;
+
+	@XmlAttribute(name="description")
 	private String description;
+
+	@XmlAttribute(name="ordinal")
 	private Integer ordinal;
+
+	@XmlAttribute(name="required")
 	private boolean required;
 
 	public UUID getId() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java
index e91ecaacf..4a60018bc 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java
@@ -3,6 +3,7 @@ package eu.eudat.commons.types.dmpblueprint;
 import eu.eudat.commons.enums.DmpBlueprintFieldCategory;
 import eu.eudat.commons.types.xml.XmlBuilder;
 import eu.eudat.commons.types.xml.XmlSerializable;
+import jakarta.xml.bind.annotation.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -13,14 +14,29 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+@XmlAccessorType(XmlAccessType.FIELD)
 public class SectionEntity implements XmlSerializable<SectionEntity> {
 
+    @XmlAttribute(name="id")
     private UUID id;
+
+    @XmlAttribute(name="label")
     private String label;
+
+    @XmlAttribute(name="description")
     private String description;
+
+    @XmlAttribute(name="ordinal")
     private Integer ordinal;
+
+    @XmlTransient
     private List<FieldEntity> fields;
+
+    @XmlAttribute(name="hasTemplates")
     private Boolean hasTemplates;
+    
+    @XmlElementWrapper(name = "descriptionTemplates")
+    @XmlElement(name = "descriptionTemplate")
     private List<DescriptionTemplateEntity> descriptionTemplates;
 
     public UUID getId() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SystemFieldEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SystemFieldEntity.java
index 4bc8dac61..6787af8d2 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SystemFieldEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SystemFieldEntity.java
@@ -3,13 +3,18 @@ package eu.eudat.commons.types.dmpblueprint;
 import eu.eudat.commons.enums.DmpBlueprintFieldCategory;
 import eu.eudat.commons.enums.DmpBlueprintSystemFieldType;
 import eu.eudat.commons.types.xml.XmlSerializable;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import java.util.UUID;
 
+@XmlAccessorType(XmlAccessType.FIELD)
 public class SystemFieldEntity extends FieldEntity {
 
+    @XmlAttribute(name="type")
     private DmpBlueprintSystemFieldType type;
 
     public DmpBlueprintSystemFieldType getType() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java
new file mode 100644
index 000000000..855dfddf8
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java
@@ -0,0 +1,174 @@
+package eu.eudat.data;
+
+
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.enums.IsActive;
+import eu.eudat.data.converters.enums.DescriptionTemplateStatusConverter;
+import eu.eudat.data.converters.enums.IsActiveConverter;
+import eu.eudat.data.old.UserDatasetProfile;
+import eu.eudat.queryable.queryableentity.DataEntity;
+import jakarta.persistence.*;
+import org.hibernate.annotations.Type;
+
+import java.time.Instant;
+import java.util.*;
+
+
+@Entity
+@Table(name = "\"DescriptionTemplate\"")
+public class DescriptionTemplateEntity implements DataEntity<DescriptionTemplateEntity,UUID>{
+    @Id
+    @Column(name = "id", columnDefinition = "uuid", updatable = false, nullable = false)
+    private UUID id;
+    public static final String _id = "id";
+
+    @Column(name = "\"label\"", length = DescriptionTemplateEntity._labelLength, nullable = false)
+    private String label;
+    public static final String _label = "label";
+    public static final int _labelLength = 250;
+
+    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
+    @Column(name = "\"definition\"", columnDefinition = "xml", nullable = false)
+    private String definition;
+    public static final String _definition = "definition";
+
+    @Column(name = "\"status\"", nullable = false)
+    @Convert(converter = DescriptionTemplateStatusConverter.class)
+    private DescriptionTemplateStatus status;
+    public static final String _status = "status";
+
+    @Column(name = "is_active", nullable = false)
+    @Convert(converter = IsActiveConverter.class)
+    private IsActive isActive;
+    public static final String _isActive = "isActive";
+
+
+    @Column(name = "\"created_at\"", nullable = false)
+    private Instant createdAt = null;
+    public static final String _createdAt = "createdAt";
+
+    @Column(name = "\"updated_at\"", nullable = false)
+    private Instant updatedAt;
+    public static final String _updatedAt = "updatedAt";
+
+    @Column(name = "\"description\"", nullable = false)
+    private String description;
+    public static final String _description = "description";
+
+    @Column(name = "\"group_id\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
+    private UUID groupId;
+    public static final String _groupId = "groupId";
+
+    @Column(name = "\"version\"", nullable = false)
+    private Short version;
+    public static final String _version = "version";
+    
+    @Column(name = "\"language\"", nullable = false)
+    private String language;
+    public static final String _language = "language";
+
+    @Column(name = "\"type\"", nullable = false)
+    private UUID type;
+    public static final String _type = "type";
+
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    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 getDefinition() {
+        return definition;
+    }
+    public void setDefinition(String definition) {
+        this.definition = definition;
+    }
+
+    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 DescriptionTemplateStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(DescriptionTemplateStatus status) {
+        this.status = status;
+    }
+
+    public IsActive getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(IsActive isActive) {
+        this.isActive = isActive;
+    }
+
+    public Instant getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Instant createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Instant getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Instant updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public UUID getType() {
+        return type;
+    }
+
+    public void setType(UUID type) {
+        this.type = type;
+    }
+
+    public Set<UserDatasetProfile> getUsers() {
+        return new HashSet<>();
+    }
+    public void setUsers(Set<UserDatasetProfile> users) {
+        //this.users = users;
+    }
+
+    @Override
+    public void update(DescriptionTemplateEntity entity) {
+    }
+
+    @Override
+    public UUID getKeys() {
+        return this.id;
+    }
+
+    @Override
+    public DescriptionTemplateEntity buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
+        this.id = UUID.fromString((String) tuple.get(0).get(base.isEmpty() ? base + "." + "id" : "id"));
+        return this;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java
index 487f07775..6f59a7e4e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateTypeEntity.java
@@ -19,8 +19,9 @@ public class DescriptionTemplateTypeEntity {
 
     public static final String _id = "id";
 
-    @Column(name = "name", length = 500, nullable = false)
+    @Column(name = "name", length = DescriptionTemplateTypeEntity._nameLength, nullable = false)
     private String name;
+    public static final int _nameLength = 500;
 
     public static final String _name = "name";
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java
index cc62a0a2f..cb04e4271 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/DmpBlueprintEntity.java
@@ -24,7 +24,7 @@ import java.util.UUID;
 
 @Entity
 @Table(name = "\"DmpBlueprint\"")
-public class DmpBlueprintEntity implements DataEntity<DmpBlueprintEntity, UUID> {
+public class DmpBlueprintEntity {
     @Id
     @Column(name = "id", columnDefinition = "uuid", updatable = false, nullable = false)
     private UUID id;
@@ -115,24 +115,4 @@ public class DmpBlueprintEntity implements DataEntity<DmpBlueprintEntity, UUID>
     public void setUpdatedAt(Instant updatedAt) {
         this.updatedAt = updatedAt;
     }
-
-    @Override
-    public void update(DmpBlueprintEntity entity) {
-        this.updatedAt = Instant.now();
-        this.definition = entity.getDefinition();
-        this.label = entity.getLabel();
-        this.status= entity.getStatus();
-    }
-
-    @Override
-    public UUID getKeys() {
-        return this.id;
-    }
-
-    @Override
-    public DmpBlueprintEntity buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
-        String currentBase = base.isEmpty() ? "" : base + ".";
-        if (fields.contains(currentBase + "id")) this.id = EntityBinder.fromTuple(tuple, currentBase + "id");
-        return this;
-    }
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DescriptionTemplateStatusConverter.java b/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DescriptionTemplateStatusConverter.java
new file mode 100644
index 000000000..3cd595685
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/converters/enums/DescriptionTemplateStatusConverter.java
@@ -0,0 +1,11 @@
+package eu.eudat.data.converters.enums;
+
+import eu.eudat.commons.enums.DescriptionTemplateTypeStatus;
+import jakarta.persistence.Converter;
+
+@Converter
+public class DescriptionTemplateStatusConverter extends DatabaseEnumConverter<DescriptionTemplateTypeStatus, Short> {
+    public DescriptionTemplateTypeStatus of(Short i) {
+        return DescriptionTemplateTypeStatus.of(i);
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java
index 85a799c56..744a62927 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java
@@ -1,5 +1,6 @@
 package eu.eudat.data.old;
 
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
@@ -23,7 +24,7 @@ public class DMPDatasetProfile implements DataEntity<DMPDatasetProfile, UUID> {
 
     @ManyToOne
     @JoinColumn(name = "\"datasetprofile\"")
-    private DescriptionTemplate datasetprofile;
+    private DescriptionTemplateEntity datasetprofile;
 
     @Column(name = "\"data\"")
     private String data;
@@ -42,10 +43,10 @@ public class DMPDatasetProfile implements DataEntity<DMPDatasetProfile, UUID> {
         this.dmp = dmp;
     }
 
-    public DescriptionTemplate getDatasetprofile() {
+    public DescriptionTemplateEntity getDatasetprofile() {
         return datasetprofile;
     }
-    public void setDatasetprofile(DescriptionTemplate datasetprofile) {
+    public void setDatasetprofile(DescriptionTemplateEntity datasetprofile) {
         this.datasetprofile = datasetprofile;
     }
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Dataset.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Dataset.java
index 64f2db9df..cbca307f7 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Dataset.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Dataset.java
@@ -1,6 +1,7 @@
 package eu.eudat.data.old;
 
 
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
@@ -113,7 +114,7 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	@ManyToOne(fetch = FetchType.LAZY)
 	//@Cascade(value=org.hibernate.annotations.CascadeType.ALL)
 	@JoinColumn(name = "\"Profile\"")
-	private DescriptionTemplate profile;
+	private DescriptionTemplateEntity profile;
 
 	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Reference\"", columnDefinition = "xml")
@@ -258,10 +259,10 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	}
 
 
-	public DescriptionTemplate getProfile() {
+	public DescriptionTemplateEntity getProfile() {
 		return profile;
 	}
-	public void setProfile(DescriptionTemplate profile) {
+	public void setProfile(DescriptionTemplateEntity profile) {
 		this.profile = profile;
 	}
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/DescriptionTemplate.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DescriptionTemplate.java
deleted file mode 100644
index 275f9b827..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/DescriptionTemplate.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package eu.eudat.data.old;
-
-
-import eu.eudat.data.DescriptionTemplateTypeEntity;
-import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
-
-import jakarta.persistence.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-
-@Entity
-@Table(name = "\"DescriptionTemplate\"")
-public class DescriptionTemplate implements DataEntity<DescriptionTemplate,UUID>{
-
-    public enum Status {
-        SAVED((short) 0), FINALIZED((short) 1), DELETED((short) 99);
-
-        private short value;
-
-        private Status(short value) {
-            this.value = value;
-        }
-        public short getValue() {
-            return value;
-        }
-
-        public static Status fromInteger(int value) {
-            switch (value) {
-                case 0:
-                    return SAVED;
-                case 1:
-                    return FINALIZED;
-                case 99:
-                    return DELETED;
-                default:
-                    throw new RuntimeException("Unsupported Dataset Profile Status");
-            }
-        }
-    }
-
-    @Id
-    @GeneratedValue
-    @GenericGenerator(name = "uuid2", strategy = "uuid2")
-    @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
-    private UUID id;
-
-    @Column(name = "\"Label\"", nullable = false)
-    private String label;
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "profile")
-    private Set<Dataset> dataset;
-
-    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
-    @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false)
-    private String definition;
-
-    @Column(name = "\"Status\"", nullable = false)
-    private Short status;
-
-    @Column(name = "\"Created\"")
-    @Convert(converter = DateToUTCConverter.class)
-    private Date created;
-
-    @Column(name = "\"Modified\"")
-    @Convert(converter = DateToUTCConverter.class)
-    private Date modified = new Date();
-
-    @Column(name = "\"Description\"")
-    private String description;
-
-    @Column(name = "\"GroupId\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
-    private UUID groupId;
-
-    @Column(name = "\"Version\"", nullable = false)
-    private Short version;
-
-    @OneToMany(fetch = FetchType.LAZY)
-    private Set<DMP> dmps;
-
-    @Column(name = "\"Language\"", nullable = false)
-    private String language;
-
-    @OneToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "\"Type\"", nullable = false)
-    private DescriptionTemplateTypeEntity type;
-
-    @OneToMany(mappedBy = "descriptionTemplate", fetch = FetchType.LAZY)
-    private Set<UserDatasetProfile> users;
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "datasetprofile")
-    private Set<DMPDatasetProfile> associatedDmps;
-
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Short getStatus() {
-        return status;
-    }
-    public void setStatus(Short status) {
-        this.status = status;
-    }
-
-    public Date getCreated() {
-        return created;
-    }
-    public void setCreated(Date created) {
-        this.created = created;
-    }
-
-    public Date getModified() {
-        return modified;
-    }
-    public void setModified(Date modified) {
-        this.modified = modified;
-    }
-
-    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 getDefinition() {
-        return definition;
-    }
-    public void setDefinition(String definition) {
-        this.definition = definition;
-    }
-
-    public Set<Dataset> getDataset() {
-        return dataset;
-    }
-    public void setDataset(Set<Dataset> dataset) {
-        this.dataset = dataset;
-    }
-
-    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 DescriptionTemplateTypeEntity getType() {
-        return type;
-    }
-    public void setType(DescriptionTemplateTypeEntity type) {
-        this.type = type;
-    }
-
-    public Set<UserDatasetProfile> getUsers() {
-        return users;
-    }
-    public void setUsers(Set<UserDatasetProfile> users) {
-        this.users = users;
-    }
-
-    @Override
-    public String toString() {
-        return "DatasetProfileListingModel [id=" + id + ", label=" + label + ", dataset=" + dataset + ", definition=" + definition + ", version=" + version + ", language=" + language + ", type=" + type +"]";
-    }
-
-    @Override
-    public void update(DescriptionTemplate entity) {
-    }
-
-    @Override
-    public UUID getKeys() {
-        return this.id;
-    }
-
-    @Override
-    public DescriptionTemplate buildFromTuple(List<Tuple> tuple, List<String> fields, String base) {
-        this.id = UUID.fromString((String) tuple.get(0).get(base.isEmpty() ? base + "." + "id" : "id"));
-        return this;
-    }
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java
index 1ca55a3a4..c853f9a33 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java
@@ -1,5 +1,6 @@
 package eu.eudat.data.old;
 
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
@@ -23,7 +24,7 @@ public class UserDatasetProfile implements DataEntity<UserDatasetProfile, UUID>
 
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "\"descriptionTemplate\"")
-    private DescriptionTemplate descriptionTemplate;
+    private DescriptionTemplateEntity descriptionTemplate;
 
     @Column(name = "role")
     private Integer role;
@@ -44,12 +45,12 @@ public class UserDatasetProfile implements DataEntity<UserDatasetProfile, UUID>
         this.user = user;
     }
 
-    public DescriptionTemplate getDatasetProfile() {
+    public DescriptionTemplateEntity getDatasetProfile() {
         return descriptionTemplate;
     }
 
-    public void setDatasetProfile(DescriptionTemplate descriptionTemplate) {
-        this.descriptionTemplate = descriptionTemplate;
+    public void setDatasetProfile(DescriptionTemplateEntity descriptionTemplateEntity) {
+        this.descriptionTemplate = descriptionTemplateEntity;
     }
 
     public Integer getRole() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/DescriptionTemplate.java b/dmp-backend/core/src/main/java/eu/eudat/model/DescriptionTemplate.java
new file mode 100644
index 000000000..921ea4a03
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/DescriptionTemplate.java
@@ -0,0 +1,155 @@
+package eu.eudat.model;
+
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.enums.DescriptionTemplateTypeStatus;
+import eu.eudat.commons.enums.IsActive;
+import eu.eudat.model.descriptiontemplatedefinition.Definition;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public class DescriptionTemplate {
+
+    public final static String _id = "id";
+    private UUID id;
+
+    public final static String _label = "label";
+    private String label;
+
+    public final static String _description = "description";
+    private String description;
+
+    public final static String _groupId = "groupId";
+    private UUID groupId;
+
+    public final static String _version = "version";
+    private Short version;
+
+    public final static String _language = "language";
+    private String language;
+
+    public final static String _type = "type";
+    private DescriptionTemplateType type;
+
+    public final static String _definition = "definition";
+    private Definition definition;
+
+    public final static String _createdAt = "createdAt";
+    private Instant createdAt;
+
+    public final static String _updatedAt = "updatedAt";
+    private Instant updatedAt;
+
+    public final static String _isActive = "isActive";
+    private IsActive isActive;
+
+    public final static String _status = "status";
+    private DescriptionTemplateStatus status;
+
+    public final static String _hash = "hash";
+    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 DescriptionTemplateType getType() {
+        return type;
+    }
+
+    public void setType(DescriptionTemplateType type) {
+        this.type = type;
+    }
+
+    public Definition getDefinition() {
+        return definition;
+    }
+
+    public void setDefinition(Definition definition) {
+        this.definition = definition;
+    }
+
+    public Instant getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Instant createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Instant getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Instant updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public IsActive getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(IsActive isActive) {
+        this.isActive = isActive;
+    }
+
+    public DescriptionTemplateStatus getStatus() {
+        return status;
+    }
+
+    public void setStatus(DescriptionTemplateStatus status) {
+        this.status = status;
+    }
+
+    public String getHash() {
+        return hash;
+    }
+
+    public void setHash(String hash) {
+        this.hash = hash;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/DescriptionTemplateType.java b/dmp-backend/core/src/main/java/eu/eudat/model/DescriptionTemplateType.java
index e2a1d92b3..240266cc2 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/DescriptionTemplateType.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/DescriptionTemplateType.java
@@ -2,6 +2,7 @@ package eu.eudat.model;
 
 import eu.eudat.commons.enums.DescriptionTemplateTypeStatus;
 import eu.eudat.commons.enums.IsActive;
+import eu.eudat.model.descriptiontemplatedefinition.Definition;
 
 import java.time.Instant;
 import java.util.UUID;
@@ -26,6 +27,9 @@ public class DescriptionTemplateType {
     public final static String _status = "status";
     private DescriptionTemplateTypeStatus status;
 
+    public final static String _definition = "definition";
+    private Definition definition;
+
     public final static String _hash = "hash";
     private String hash;
 
@@ -84,4 +88,12 @@ public class DescriptionTemplateType {
     public void setHash(String hash) {
         this.hash = hash;
     }
+
+    public Definition getDefinition() {
+        return definition;
+    }
+
+    public void setDefinition(Definition definition) {
+        this.definition = definition;
+    }
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DescriptionTemplateBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DescriptionTemplateBuilder.java
new file mode 100644
index 000000000..cf093735a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DescriptionTemplateBuilder.java
@@ -0,0 +1,118 @@
+package eu.eudat.model.builder;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.XmlHandlingService;
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.data.DescriptionTemplateEntity;
+import eu.eudat.model.DescriptionTemplate;
+import eu.eudat.model.DescriptionTemplateType;
+import eu.eudat.model.builder.descriptiontemplatedefinition.DefinitionBuilder;
+import eu.eudat.query.DescriptionTemplateTypeQuery;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.data.query.QueryFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DescriptionTemplateBuilder extends BaseBuilder<DescriptionTemplate, DescriptionTemplateEntity> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+    private final QueryFactory queryFactory;
+    private final BuilderFactory builderFactory;
+    private final XmlHandlingService xmlHandlingService;
+    
+    @Autowired
+    public DescriptionTemplateBuilder(
+            ConventionService conventionService, QueryFactory queryFactory, BuilderFactory builderFactory, XmlHandlingService xmlHandlingService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(DescriptionTemplateBuilder.class)));
+        this.queryFactory = queryFactory;
+        this.builderFactory = builderFactory;
+        this.xmlHandlingService = xmlHandlingService;
+    }
+
+    public DescriptionTemplateBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<DescriptionTemplate> build(FieldSet fields, List<DescriptionTemplateEntity> datas) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(datas).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || datas == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        FieldSet descriptionTemplateTypeFields = fields.extractPrefixed(this.asPrefix(DescriptionTemplate._type));
+        Map<UUID, DescriptionTemplateType> descriptionTemplateTypeMap = this.collectDescriptionTemplateTypes(descriptionTemplateTypeFields, datas);
+
+
+        FieldSet definitionFields = fields.extractPrefixed(this.asPrefix(DescriptionTemplate._definition));
+        List<DescriptionTemplate> models = new ArrayList<>();
+        for (DescriptionTemplateEntity d : datas) {
+            DescriptionTemplate m = new DescriptionTemplate();
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._id)))  m.setId(d.getId());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._label)))  m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._description)))  m.setDescription(d.getDescription());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._groupId)))  m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._version)))  m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._language)))  m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._type)))  m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._definition)))  m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._createdAt))) m.setCreatedAt(d.getCreatedAt());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._updatedAt))) m.setUpdatedAt(d.getUpdatedAt());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._isActive))) m.setIsActive(d.getIsActive());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._status))) m.setStatus(d.getStatus());
+            if (fields.hasField(this.asIndexer(DescriptionTemplate._hash))) m.setHash(this.hashValue(d.getUpdatedAt()));
+            if (!definitionFields.isEmpty() && d.getDefinition() != null){
+                DefinitionEntity definition = this.xmlHandlingService.fromXmlSafe(DefinitionEntity.class, d.getDefinition());
+                m.setDefinition(this.builderFactory.builder(DefinitionBuilder.class).authorize(this.authorize).build(definitionFields, definition));
+            }
+            if (!descriptionTemplateTypeFields.isEmpty() && descriptionTemplateTypeMap != null && descriptionTemplateTypeMap.containsKey(d.getType())) m.setType(descriptionTemplateTypeMap.get(d.getType()));
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+
+    private Map<UUID, DescriptionTemplateType> collectDescriptionTemplateTypes(FieldSet fields, List<DescriptionTemplateEntity> datas) throws MyApplicationException {
+        if (fields.isEmpty() || datas.isEmpty()) return null;
+        this.logger.debug("checking related - {}", DescriptionTemplateType.class.getSimpleName());
+
+        Map<UUID, DescriptionTemplateType> itemMap = null;
+        if (!fields.hasOtherField(this.asIndexer(DescriptionTemplateType._id))) {
+            itemMap = this.asEmpty(
+                    datas.stream().map(DescriptionTemplateEntity::getType).distinct().collect(Collectors.toList()),
+                    x -> {
+                        DescriptionTemplateType item = new DescriptionTemplateType();
+                        item.setId(x);
+                        return item;
+                    },
+                    x -> x.getId());
+        } else {
+            FieldSet clone = new BaseFieldSet(fields.getFields()).ensure(DescriptionTemplateType._id);
+            DescriptionTemplateTypeQuery q = this.queryFactory.query(DescriptionTemplateTypeQuery.class).ids(datas.stream().map(DescriptionTemplateEntity::getType).distinct().collect(Collectors.toList()));
+            itemMap = this.builderFactory.builder(DescriptionTemplateTypeBuilder.class).asForeignKey(q, clone, DescriptionTemplateType::getId);
+        }
+        if (!fields.hasField(DescriptionTemplateType._id)) {
+            itemMap.values().stream().filter(x -> x != null).map(x -> {
+                x.setId(null);
+                return x;
+            }).collect(Collectors.toList());
+        }
+
+        return itemMap;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java
index 46194e84c..8e2ad34e3 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBlueprintBuilder.java
@@ -48,6 +48,7 @@ public class DmpBlueprintBuilder extends BaseBuilder<DmpBlueprint, DmpBlueprintE
         this.logger.trace(new DataLogEntry("requested fields", fields));
         if (fields == null || data == null || fields.isEmpty())
             return new ArrayList<>();
+        
         FieldSet definitionFields = fields.extractPrefixed(this.asPrefix(DmpBlueprint._definition));
         List<DmpBlueprint> models = new ArrayList<>();
         for (DmpBlueprintEntity d : data) {
@@ -60,7 +61,7 @@ public class DmpBlueprintBuilder extends BaseBuilder<DmpBlueprint, DmpBlueprintE
             if (fields.hasField(this.asIndexer(DmpBlueprint._status))) m.setStatus(d.getStatus());
             if (fields.hasField(this.asIndexer(DmpBlueprint._hash))) m.setHash(this.hashValue(d.getUpdatedAt()));
             if (!definitionFields.isEmpty() && d.getDefinition() != null){
-                DefinitionEntity definition = this.xmlHandlingService.xmlSerializableFromXmlSafe(DefinitionEntity.class, d.getDefinition());
+                DefinitionEntity definition = this.xmlHandlingService.fromXmlSafe(DefinitionEntity.class, d.getDefinition());
                 m.setDefinition(this.builderFactory.builder(DefinitionBuilder.class).authorize(this.authorize).build(definitionFields, definition));
             }
             models.add(m);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/DefinitionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/DefinitionBuilder.java
new file mode 100644
index 000000000..51b055910
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/DefinitionBuilder.java
@@ -0,0 +1,61 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.Definition;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component("descriptiontemplatedefinitionbuilder")
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DefinitionBuilder extends BaseBuilder<Definition, DefinitionEntity> {
+
+    private final BuilderFactory builderFactory;
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public DefinitionBuilder(
+            ConventionService conventionService, BuilderFactory builderFactory) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(DefinitionBuilder.class)));
+        this.builderFactory = builderFactory;
+    }
+
+    public DefinitionBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<Definition> build(FieldSet fields, List<DefinitionEntity> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        //Not Bulk Build because is XML no interaction with db
+        FieldSet sectionsFields = fields.extractPrefixed(this.asPrefix(Definition._sections));
+        FieldSet pagesFields = fields.extractPrefixed(this.asPrefix(Definition._pages));
+        
+        List<Definition> models = new ArrayList<>();
+        for (DefinitionEntity d : data) {
+            Definition m = new Definition();
+            if (!sectionsFields.isEmpty() && d.getSections() != null) m.setSections(this.builderFactory.builder(SectionBuilder.class).authorize(this.authorize).build(sectionsFields, d.getSections()));
+            if (!pagesFields.isEmpty() && d.getPages() != null) m.setPages(this.builderFactory.builder(PageBuilder.class).authorize(this.authorize).build(pagesFields, d.getPages()));
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
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
new file mode 100644
index 000000000..00d77997d
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/FieldBuilder.java
@@ -0,0 +1,79 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.service.fielddatahelper.FieldDataHelperService;
+import eu.eudat.service.fielddatahelper.FieldDataHelperServiceProvider;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+import eu.eudat.model.descriptiontemplatedefinition.Field;
+import java.util.*;
+
+@Component("descriptiontemplatedefinitionfieldbuilder")
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class FieldBuilder extends BaseBuilder<Field, FieldEntity> {
+
+    private final BuilderFactory builderFactory;
+    private final FieldDataHelperServiceProvider fieldDataHelperServiceProvider;
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public FieldBuilder(
+            ConventionService conventionService, BuilderFactory builderFactory, FieldDataHelperServiceProvider fieldDataHelperServiceProvider) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(FieldBuilder.class)));
+        this.builderFactory = builderFactory;
+        this.fieldDataHelperServiceProvider = fieldDataHelperServiceProvider;
+    }
+
+    public FieldBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<Field> build(FieldSet fields, List<FieldEntity> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        //Not Bulk Build because is XML no interaction with db
+        FieldSet visibilityRulesFields = fields.extractPrefixed(this.asPrefix(Field._visibilityRules));
+        FieldSet dataFields = fields.extractPrefixed(this.asPrefix(Field._data));
+
+        List<Field> models = new ArrayList<>();
+        for (FieldEntity d : data) {
+            Field m = new Field();
+            if (fields.hasField(this.asIndexer(Field._id))) m.setId(d.getId());
+            if (fields.hasField(this.asIndexer(Field._ordinal))) m.setOrdinal(d.getOrdinal());
+            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());
+                m.setData(fieldDataHelperService.buildOne(dataFields, d.getData(), this.authorize));
+            }
+            
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/FieldSetBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/FieldSetBuilder.java
new file mode 100644
index 000000000..3a873e184
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/FieldSetBuilder.java
@@ -0,0 +1,65 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.FieldSetEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.Field;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class FieldSetBuilder extends BaseBuilder<eu.eudat.model.descriptiontemplatedefinition.FieldSet, FieldSetEntity> {
+
+    private final BuilderFactory builderFactory;
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public FieldSetBuilder(
+            ConventionService conventionService, BuilderFactory builderFactory) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(FieldSetBuilder.class)));
+        this.builderFactory = builderFactory;
+    }
+
+    public FieldSetBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<eu.eudat.model.descriptiontemplatedefinition.FieldSet> build(FieldSet fields, List<FieldSetEntity> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+        FieldSet fieldsFields = fields.extractPrefixed(this.asPrefix(eu.eudat.model.descriptiontemplatedefinition.FieldSet._fields));
+
+        List<eu.eudat.model.descriptiontemplatedefinition.FieldSet> models = new ArrayList<>();
+        for (FieldSetEntity d : data) {
+            eu.eudat.model.descriptiontemplatedefinition.FieldSet m = new eu.eudat.model.descriptiontemplatedefinition.FieldSet();
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._id))) m.setId(d.getId());
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._ordinal))) m.setOrdinal(d.getOrdinal());
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._title))) m.setTitle(d.getTitle());
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._numbering))) m.setNumbering(d.getNumbering());
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._description))) m.setDescription(d.getDescription());
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._extendedDescription))) m.setExtendedDescription(d.getExtendedDescription());
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._additionalInformation))) m.setAdditionalInformation(d.getAdditionalInformation());
+            if (fields.hasField(this.asIndexer(eu.eudat.model.descriptiontemplatedefinition.FieldSet._hasCommentField))) m.setHasCommentField(d.getHasCommentField());
+            if (!fieldsFields.isEmpty() && d.getFields() != null) m.setFields(this.builderFactory.builder(FieldBuilder.class).authorize(this.authorize).build(fieldsFields, d.getFields()));
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/PageBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/PageBuilder.java
new file mode 100644
index 000000000..e81d1f4af
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/PageBuilder.java
@@ -0,0 +1,55 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.PageEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.Page;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class PageBuilder extends BaseBuilder<Page, PageEntity> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public PageBuilder(
+            ConventionService conventionService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(PageBuilder.class)));
+    }
+
+    public PageBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<Page> build(FieldSet fields, List<PageEntity> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        List<Page> models = new ArrayList<>();
+        for (PageEntity d : data) {
+            Page m = new Page();
+            if (fields.hasField(this.asIndexer(Page._id))) m.setId(d.getId());
+            if (fields.hasField(this.asIndexer(Page._ordinal))) m.setOrdinal(d.getOrdinal());
+            if (fields.hasField(this.asIndexer(Page._title))) m.setTitle(d.getTitle());
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/RuleBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/RuleBuilder.java
new file mode 100644
index 000000000..4b226eb3f
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/RuleBuilder.java
@@ -0,0 +1,54 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.Rule;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class RuleBuilder extends BaseBuilder<Rule, RuleEntity> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public RuleBuilder(
+            ConventionService conventionService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(RuleBuilder.class)));
+    }
+
+    public RuleBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<Rule> build(FieldSet fields, List<RuleEntity> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        List<Rule> models = new ArrayList<>();
+        for (RuleEntity d : data) {
+            Rule m = new Rule();
+            if (fields.hasField(this.asIndexer(Rule._target))) m.setTarget(d.getTarget());
+            if (fields.hasField(this.asIndexer(Rule._value))) m.setValue(d.getValue());
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/SectionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/SectionBuilder.java
new file mode 100644
index 000000000..0aed03ab3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/SectionBuilder.java
@@ -0,0 +1,69 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.SectionEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.Section;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component("descriptiontemplatedefinitionsectionbuilder")
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class SectionBuilder extends BaseBuilder<Section, SectionEntity> {
+
+    private final BuilderFactory builderFactory;
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public SectionBuilder(
+            ConventionService conventionService, BuilderFactory builderFactory) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(SectionBuilder.class)));
+        this.builderFactory = builderFactory;
+    }
+
+    public SectionBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<Section> build(FieldSet fields, List<SectionEntity> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        //Not Bulk Build because is XML no interaction with db
+        FieldSet fieldSetsFields = fields.extractPrefixed(this.asPrefix(Section._fieldSets));
+
+        List<Section> models = new ArrayList<>();
+        for (SectionEntity d : data) {
+            Section m = new Section();
+            if (fields.hasField(this.asIndexer(Section._id))) m.setId(d.getId());
+            if (fields.hasField(this.asIndexer(Section._description))) m.setDescription(d.getDescription());
+            if (fields.hasField(this.asIndexer(Section._ordinal))) m.setOrdinal(d.getOrdinal());
+            if (fields.hasField(this.asIndexer(Section._defaultVisibility))) m.setDefaultVisibility(d.isDefaultVisibility());
+            if (fields.hasField(this.asIndexer(Section._multiplicity))) m.setMultiplicity(d.getMultiplicity());
+            if (fields.hasField(this.asIndexer(Section._numbering))) m.setNumbering(d.getNumbering());
+            if (fields.hasField(this.asIndexer(Section._page))) m.setPage(d.getPage());
+            if (fields.hasField(this.asIndexer(Section._title))) m.setTitle(d.getTitle());
+            if (fields.hasField(this.asIndexer(Section._extendedDescription))) m.setExtendedDescription(d.getExtendedDescription());
+            if (d.getSections() != null) m.setSections(this.builderFactory.builder(SectionBuilder.class).authorize(this.authorize).build(fields, d.getSections()));
+            if (!fieldSetsFields.isEmpty() && d.getFieldSets() != null) m.setFieldSets(this.builderFactory.builder(FieldSetBuilder.class).authorize(this.authorize).build(fieldSetsFields, d.getFieldSets()));
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataBuilder.java
new file mode 100644
index 000000000..892caa1ce
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AuthAutoCompleteDataBuilder.java
@@ -0,0 +1,57 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.AuthAutoCompleteData;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class AuthAutoCompleteDataBuilder extends BaseBuilder<AuthAutoCompleteData, AutoCompleteDataEntity.AuthAutoCompleteData> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public AuthAutoCompleteDataBuilder(
+            ConventionService conventionService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(AuthAutoCompleteDataBuilder.class)));
+    }
+
+    public AuthAutoCompleteDataBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<AuthAutoCompleteData> build(FieldSet fields, List<AutoCompleteDataEntity.AuthAutoCompleteData> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        List<AuthAutoCompleteData> models = new ArrayList<>();
+        for (AutoCompleteDataEntity.AuthAutoCompleteData d : data) {
+            AuthAutoCompleteData m = new AuthAutoCompleteData();
+            if (fields.hasField(this.asIndexer(AuthAutoCompleteData._url))) m.setUrl(d.getUrl());
+            if (fields.hasField(this.asIndexer(AuthAutoCompleteData._method))) m.setMethod(d.getMethod());
+            if (fields.hasField(this.asIndexer(AuthAutoCompleteData._body))) m.setBody(d.getBody());
+            if (fields.hasField(this.asIndexer(AuthAutoCompleteData._path))) m.setPath(d.getPath());
+            if (fields.hasField(this.asIndexer(AuthAutoCompleteData._type))) m.setType(d.getType());
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
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
new file mode 100644
index 000000000..702e65a1a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AutoCompleteDataBuilder.java
@@ -0,0 +1,36 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.AutoCompleteData;
+import gr.cite.tools.data.builder.BuilderFactory;
+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 AutoCompleteDataBuilder extends ComboBoxDataBuilder<AutoCompleteData, AutoCompleteDataEntity> {
+	private final BuilderFactory builderFactory;
+	@Autowired
+	public AutoCompleteDataBuilder(ConventionService conventionService, BuilderFactory builderFactory) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(AutoCompleteDataBuilder.class)));
+		this.builderFactory = builderFactory;
+	}
+
+	@Override
+	protected AutoCompleteData getInstance() {
+		return new AutoCompleteData();
+	}
+
+	@Override
+	protected void buildComboBoxChild(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/AutoCompleteSingleDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataBuilder.java
new file mode 100644
index 000000000..d10bda56d
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/AutoCompleteSingleDataBuilder.java
@@ -0,0 +1,64 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.AutoCompleteSingleData;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class AutoCompleteSingleDataBuilder extends BaseBuilder<AutoCompleteSingleData, AutoCompleteDataEntity.AutoCompleteSingleData> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+    private final BuilderFactory builderFactory;
+
+    @Autowired
+    public AutoCompleteSingleDataBuilder(
+            ConventionService conventionService, BuilderFactory builderFactory) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(AutoCompleteSingleDataBuilder.class)));
+        this.builderFactory = builderFactory;
+    }
+
+    public AutoCompleteSingleDataBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<AutoCompleteSingleData> build(FieldSet fields, List<AutoCompleteDataEntity.AutoCompleteSingleData> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        FieldSet autoCompleteOptionsFields = fields.extractPrefixed(this.asPrefix(AutoCompleteSingleData._autoCompleteOptions));
+        FieldSet authFields = fields.extractPrefixed(this.asPrefix(AutoCompleteSingleData._auth));
+        List<AutoCompleteSingleData> models = new ArrayList<>();
+        for (AutoCompleteDataEntity.AutoCompleteSingleData d : data) {
+            AutoCompleteSingleData m = new AutoCompleteSingleData();
+            if (fields.hasField(this.asIndexer(AutoCompleteSingleData._autocompleteType))) m.setAutocompleteType(d.getAutocompleteType());
+            if (fields.hasField(this.asIndexer(AutoCompleteSingleData._url))) m.setUrl(d.getUrl());
+            if (fields.hasField(this.asIndexer(AutoCompleteSingleData._optionsRoot))) m.setOptionsRoot(d.getOptionsRoot());
+            if (fields.hasField(this.asIndexer(AutoCompleteSingleData._hasAuth))) m.setHasAuth(d.getHasAuth());
+            if (fields.hasField(this.asIndexer(AutoCompleteSingleData._method))) m.setMethod(d.getMethod());
+            if (!autoCompleteOptionsFields.isEmpty() && d.getAutoCompleteOptions() != null) m.setAutoCompleteOptions(this.builderFactory.builder(ComboBoxOptionBuilder.class).authorize(this.authorize).build(autoCompleteOptionsFields, d.getAutoCompleteOptions()));
+            if (!authFields.isEmpty() && d.getAuth() != null) m.setAuth(this.builderFactory.builder(AuthAutoCompleteDataBuilder.class).authorize(this.authorize).build(authFields, d.getAuth()));
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
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
new file mode 100644
index 000000000..c7b4bcdc3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BaseFieldDataBuilder.java
@@ -0,0 +1,56 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+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 java.util.*;
+
+public abstract class BaseFieldDataBuilder<Model extends BaseFieldData, Entity extends BaseFieldDataEntity<?>> extends BaseBuilder<Model, Entity> {
+
+    protected EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public BaseFieldDataBuilder(
+            ConventionService conventionService,
+            LoggerService logger) {
+        super(conventionService, logger);
+    }
+
+    public BaseFieldDataBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+    
+    protected abstract Model getInstance();
+
+    protected abstract void buildChild(FieldSet fields, Entity d, Model m);
+    @Override
+    public List<Model> build(FieldSet fields, List<Entity> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        List<Model> models = new ArrayList<>();
+        for (Entity d : data) {
+            Model m = this.getInstance();
+            if (fields.hasField(this.asIndexer(Model._label))) m.setLabel(d.getLabel());
+            this.buildChild(fields, d, m);
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BooleanDecisionDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BooleanDecisionDataBuilder.java
new file mode 100644
index 000000000..1d6cb4840
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/BooleanDecisionDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BooleanDecisionData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class BooleanDecisionDataBuilder extends BaseFieldDataBuilder<BooleanDecisionData, BooleanDecisionDataEntity> {
+
+	@Autowired
+	public BooleanDecisionDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(BooleanDecisionDataBuilder.class)));
+	}
+
+	protected BooleanDecisionData getInstance() {
+		return new BooleanDecisionData();
+	}
+
+	@Override
+	protected void buildChild(FieldSet fields, BooleanDecisionDataEntity d, BooleanDecisionData model) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CheckBoxDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CheckBoxDataBuilder.java
new file mode 100644
index 000000000..fa79ea3b2
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CheckBoxDataBuilder.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.CheckBoxDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.CheckBoxData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class CheckBoxDataBuilder extends BaseFieldDataBuilder<CheckBoxData, CheckBoxDataEntity> {
+
+	@Autowired
+	public CheckBoxDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(CheckBoxDataBuilder.class)));
+	}
+
+	protected CheckBoxData getInstance() {
+		return new CheckBoxData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, CheckBoxDataEntity d, CheckBoxData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxDataBuilder.java
new file mode 100644
index 000000000..0864e3d7d
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxDataBuilder.java
@@ -0,0 +1,22 @@
+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/ComboBoxOptionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxOptionBuilder.java
new file mode 100644
index 000000000..8db512ec1
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ComboBoxOptionBuilder.java
@@ -0,0 +1,56 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.ComboBoxDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ComboBoxOption;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class ComboBoxOptionBuilder extends BaseBuilder<ComboBoxOption, ComboBoxDataEntity.Option> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public ComboBoxOptionBuilder(
+            ConventionService conventionService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(ComboBoxOptionBuilder.class)));
+    }
+
+    public ComboBoxOptionBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<ComboBoxOption> build(FieldSet fields, List<ComboBoxDataEntity.Option> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        List<ComboBoxOption> models = new ArrayList<>();
+        for (ComboBoxDataEntity.Option d : data) {
+            ComboBoxOption m = new ComboBoxOption();
+            if (fields.hasField(this.asIndexer(ComboBoxOption._label))) m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(ComboBoxOption._source))) m.setSource(d.getSource());
+            if (fields.hasField(this.asIndexer(ComboBoxOption._uri))) m.setUri(d.getUri());
+            if (fields.hasField(this.asIndexer(ComboBoxOption._value))) m.setValue(d.getValue());
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CurrencyDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CurrencyDataBuilder.java
new file mode 100644
index 000000000..75919c6b3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/CurrencyDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.CurrencyDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.CurrencyData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class CurrencyDataBuilder extends BaseFieldDataBuilder<CurrencyData, CurrencyDataEntity> {
+
+	@Autowired
+	public CurrencyDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(CurrencyDataBuilder.class)));
+	}
+
+	protected CurrencyData getInstance() {
+		return new CurrencyData();
+	}
+
+	@Override
+	protected void buildChild(FieldSet fields, CurrencyDataEntity d, CurrencyData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DataRepositoryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DataRepositoryDataBuilder.java
new file mode 100644
index 000000000..570f19977
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DataRepositoryDataBuilder.java
@@ -0,0 +1,32 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.DataRepositoryDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ComboBoxOption;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DataRepositoryDataBuilder extends BaseFieldDataBuilder<DataRepositoryData, DataRepositoryDataEntity> {
+
+	@Autowired
+	public DataRepositoryDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(DataRepositoryDataBuilder.class)));
+	}
+
+	protected DataRepositoryData getInstance() {
+		return new DataRepositoryData();
+	}
+
+	@Override
+	protected void buildChild(FieldSet fields, DataRepositoryDataEntity d, DataRepositoryData m) {
+		if (fields.hasField(this.asIndexer(DataRepositoryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataBuilder.java
new file mode 100644
index 000000000..41057d936
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteDataBuilder.java
@@ -0,0 +1,31 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.DatasetAutoCompleteDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetAutoCompleteData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DatasetAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<DatasetAutoCompleteData, DatasetAutoCompleteDataEntity> {
+
+	@Autowired
+	public DatasetAutoCompleteDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(DatasetAutoCompleteDataBuilder.class)));
+	}
+
+	protected DatasetAutoCompleteData getInstance() {
+		return new DatasetAutoCompleteData();
+	}
+
+	@Override
+	protected void buildInternalDmpChild(FieldSet fields, DatasetAutoCompleteDataEntity m, DatasetAutoCompleteData d) {
+		if (fields.hasField(this.asIndexer(DatasetAutoCompleteData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataBuilder.java
new file mode 100644
index 000000000..482b304c5
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatasetIdentifierDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.DatasetIdentifierDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetIdentifierData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DatasetIdentifierDataBuilder extends BaseFieldDataBuilder<DatasetIdentifierData, DatasetIdentifierDataEntity> {
+
+	@Autowired
+	public DatasetIdentifierDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(DatasetIdentifierDataBuilder.class)));
+	}
+
+	protected DatasetIdentifierData getInstance() {
+		return new DatasetIdentifierData();
+	}
+
+	@Override
+	protected void buildChild(FieldSet fields, DatasetIdentifierDataEntity d, DatasetIdentifierData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatePickerDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatePickerDataBuilder.java
new file mode 100644
index 000000000..8f65317f9
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DatePickerDataBuilder.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.DatePickerDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatePickerData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DatePickerDataBuilder extends BaseFieldDataBuilder<DatePickerData, DatePickerDataEntity> {
+
+	@Autowired
+	public DatePickerDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(DatePickerDataBuilder.class)));
+	}
+
+	protected DatePickerData getInstance() {
+		return new DatePickerData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, DatePickerDataEntity d, DatePickerData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataBuilder.java
new file mode 100644
index 000000000..bcd2e7eb0
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/DmpAutoCompleteDataBuilder.java
@@ -0,0 +1,31 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.DmpAutoCompleteDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DmpAutoCompleteData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DmpAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<DmpAutoCompleteData, DmpAutoCompleteDataEntity> {
+
+	@Autowired
+	public DmpAutoCompleteDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(DmpAutoCompleteDataBuilder.class)));
+	}
+
+	protected DmpAutoCompleteData getInstance() {
+		return new DmpAutoCompleteData();
+	}
+
+	@Override
+	protected void buildInternalDmpChild(FieldSet fields, DmpAutoCompleteDataEntity m, DmpAutoCompleteData d) {
+		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
new file mode 100644
index 000000000..3df37aa81
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ExternalDatasetDataBuilder.java
@@ -0,0 +1,32 @@
+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;
+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 ExternalDatasetDataBuilder extends BaseFieldDataBuilder<ExternalDatasetData, ExternalDatasetDataEntity> {
+
+	@Autowired
+	public ExternalDatasetDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(ExternalDatasetDataBuilder.class)));
+	}
+
+	protected ExternalDatasetData getInstance() {
+		return new ExternalDatasetData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, ExternalDatasetDataEntity d, ExternalDatasetData m) {
+		if (fields.hasField(this.asIndexer(ExternalDatasetData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+		if (fields.hasField(this.asIndexer(ExternalDatasetData._type))) m.setType(d.getType());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/FreeTextDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/FreeTextDataBuilder.java
new file mode 100644
index 000000000..987ab6890
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/FreeTextDataBuilder.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.FreeTextDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.FreeTextData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class FreeTextDataBuilder extends BaseFieldDataBuilder<FreeTextData, FreeTextDataEntity> {
+
+	@Autowired
+	public FreeTextDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(FreeTextDataBuilder.class)));
+	}
+
+	protected FreeTextData getInstance() {
+		return new FreeTextData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, FreeTextDataEntity d, FreeTextData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/InternalDmpBaseDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/InternalDmpBaseDataBuilder.java
new file mode 100644
index 000000000..c85334852
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/InternalDmpBaseDataBuilder.java
@@ -0,0 +1,22 @@
+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/LicenseDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LicenseDataBuilder.java
new file mode 100644
index 000000000..85791fbda
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/LicenseDataBuilder.java
@@ -0,0 +1,31 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.LicenseDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ComboBoxOption;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.LicenseData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class LicenseDataBuilder extends BaseFieldDataBuilder<LicenseData, LicenseDataEntity> {
+
+	@Autowired
+	public LicenseDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(LicenseDataBuilder.class)));
+	}
+
+	protected LicenseData getInstance() {
+		return new LicenseData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, LicenseDataEntity d, LicenseData m) {
+		if (fields.hasField(this.asIndexer(LicenseData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/OrganizationDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/OrganizationDataBuilder.java
new file mode 100644
index 000000000..0f6b1c2b7
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/OrganizationDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.OrganizationDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.OrganizationData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class OrganizationDataBuilder extends BaseFieldDataBuilder<OrganizationData, OrganizationDataEntity> {
+
+	@Autowired
+	public OrganizationDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(OrganizationDataBuilder.class)));
+	}
+
+	protected OrganizationData getInstance() {
+		return new OrganizationData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, OrganizationDataEntity d, OrganizationData m) {
+		if (fields.hasField(this.asIndexer(OrganizationData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationDataBuilder.java
new file mode 100644
index 000000000..fad197524
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/PublicationDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.PublicationDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.PublicationData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class PublicationDataBuilder extends BaseFieldDataBuilder<PublicationData, PublicationDataEntity> {
+
+	@Autowired
+	public PublicationDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(PublicationDataBuilder.class)));
+	}
+
+	protected PublicationData getInstance() {
+		return new PublicationData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, PublicationDataEntity d, PublicationData m) {
+		if (fields.hasField(this.asIndexer(PublicationData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RadioBoxDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RadioBoxDataBuilder.java
new file mode 100644
index 000000000..a35a0bb1c
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RadioBoxDataBuilder.java
@@ -0,0 +1,36 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.descriptiontemplatedefinition.FieldBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RadioBoxData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RadioBoxOption;
+import gr.cite.tools.data.builder.BuilderFactory;
+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 RadioBoxDataBuilder extends BaseFieldDataBuilder<RadioBoxData, RadioBoxDataEntity> {
+	private final BuilderFactory builderFactory;
+
+	@Autowired
+	public RadioBoxDataBuilder(ConventionService conventionService, BuilderFactory builderFactory) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(RadioBoxDataBuilder.class)));
+		this.builderFactory = builderFactory;
+	}
+
+	protected RadioBoxData getInstance() {
+		return new RadioBoxData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, RadioBoxDataEntity d, RadioBoxData m) {
+		FieldSet optionsFields = fields.extractPrefixed(this.asPrefix(RadioBoxData._options));
+		if (!optionsFields.isEmpty() && d.getOptions() != null) m.setOptions(this.builderFactory.builder(RadioBoxOptionBuilder.class).authorize(this.authorize).build(optionsFields, d.getOptions()));
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RadioBoxOptionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RadioBoxOptionBuilder.java
new file mode 100644
index 000000000..4e8d7a18d
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RadioBoxOptionBuilder.java
@@ -0,0 +1,54 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RadioBoxOption;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class RadioBoxOptionBuilder extends BaseBuilder<RadioBoxOption, RadioBoxDataEntity.Option> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public RadioBoxOptionBuilder(
+            ConventionService conventionService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(RadioBoxOptionBuilder.class)));
+    }
+
+    public RadioBoxOptionBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<RadioBoxOption> build(FieldSet fields, List<RadioBoxDataEntity.Option> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        List<RadioBoxOption> models = new ArrayList<>();
+        for (RadioBoxDataEntity.Option d : data) {
+            RadioBoxOption m = new RadioBoxOption();
+            if (fields.hasField(this.asIndexer(RadioBoxOption._label))) m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(RadioBoxOption._value))) m.setValue(d.getValue());
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RegistryDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RegistryDataBuilder.java
new file mode 100644
index 000000000..86d697ef3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RegistryDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.RegistryDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RegistryData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class RegistryDataBuilder extends BaseFieldDataBuilder<RegistryData, RegistryDataEntity> {
+
+	@Autowired
+	public RegistryDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(RegistryDataBuilder.class)));
+	}
+
+	protected RegistryData getInstance() {
+		return new RegistryData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, RegistryDataEntity d, RegistryData m) {
+		if (fields.hasField(this.asIndexer(RegistryData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataBuilder.java
new file mode 100644
index 000000000..3719d5546
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteDataBuilder.java
@@ -0,0 +1,32 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.ResearcherAutoCompleteDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherAutoCompleteData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class ResearcherAutoCompleteDataBuilder extends InternalDmpBaseDataBuilder<ResearcherAutoCompleteData, ResearcherAutoCompleteDataEntity> {
+
+	@Autowired
+	public ResearcherAutoCompleteDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(ResearcherAutoCompleteDataBuilder.class)));
+	}
+
+	protected ResearcherAutoCompleteData getInstance() {
+		return new ResearcherAutoCompleteData();
+	}
+
+	@Override
+	protected void buildInternalDmpChild(FieldSet fields, ResearcherAutoCompleteDataEntity d, ResearcherAutoCompleteData m) {
+		if (fields.hasField(this.asIndexer(ResearcherAutoCompleteData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+		
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherDataBuilder.java
new file mode 100644
index 000000000..f075f5a44
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ResearcherDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.ResearcherDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class ResearcherDataBuilder extends BaseFieldDataBuilder<ResearcherData, ResearcherDataEntity> {
+
+	@Autowired
+	public ResearcherDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(ResearcherDataBuilder.class)));
+	}
+
+	protected ResearcherData getInstance() {
+		return new ResearcherData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, ResearcherDataEntity d, ResearcherData m) {
+		if (fields.hasField(this.asIndexer(ResearcherData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RichTextAreaDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RichTextAreaDataBuilder.java
new file mode 100644
index 000000000..73d037b43
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/RichTextAreaDataBuilder.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.RichTextAreaDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RichTextAreaData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class RichTextAreaDataBuilder extends BaseFieldDataBuilder<RichTextAreaData, RichTextAreaDataEntity> {
+
+	@Autowired
+	public RichTextAreaDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(RichTextAreaDataBuilder.class)));
+	}
+
+	protected RichTextAreaData getInstance() {
+		return new RichTextAreaData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, RichTextAreaDataEntity d, RichTextAreaData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ServiceDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ServiceDataBuilder.java
new file mode 100644
index 000000000..1801c0e25
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ServiceDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.ServiceDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ServiceData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class ServiceDataBuilder extends BaseFieldDataBuilder<ServiceData, ServiceDataEntity> {
+
+	@Autowired
+	public ServiceDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(ServiceDataBuilder.class)));
+	}
+
+	protected ServiceData getInstance() {
+		return new ServiceData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, ServiceDataEntity d, ServiceData m) {
+		if (fields.hasField(this.asIndexer(ServiceData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TagDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TagDataBuilder.java
new file mode 100644
index 000000000..7fab0da1a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TagDataBuilder.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.TagDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.TagData;
+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 TagDataBuilder extends BaseFieldDataBuilder<TagData, TagDataEntity> {
+
+	@Autowired
+	public TagDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(TagDataBuilder.class)));
+	}
+
+	protected TagData getInstance() {
+		return new TagData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, TagDataEntity d, TagData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TaxonomyDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TaxonomyDataBuilder.java
new file mode 100644
index 000000000..0ef3b83d6
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TaxonomyDataBuilder.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.TaxonomyDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.TaxonomyData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class TaxonomyDataBuilder extends BaseFieldDataBuilder<TaxonomyData, TaxonomyDataEntity> {
+
+	@Autowired
+	public TaxonomyDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(TaxonomyDataBuilder.class)));
+	}
+
+	protected TaxonomyData getInstance() {
+		return new TaxonomyData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, TaxonomyDataEntity d, TaxonomyData m) {
+		if (fields.hasField(this.asIndexer(TaxonomyData._multiAutoComplete))) m.setMultiAutoComplete(d.getMultiAutoComplete());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TextAreaDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TextAreaDataBuilder.java
new file mode 100644
index 000000000..2cf32d61f
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/TextAreaDataBuilder.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.TextAreaDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.TextAreaData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class TextAreaDataBuilder extends BaseFieldDataBuilder<TextAreaData, TextAreaDataEntity> {
+
+	@Autowired
+	public TextAreaDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(TextAreaDataBuilder.class)));
+	}
+
+	protected TextAreaData getInstance() {
+		return new TextAreaData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, TextAreaDataEntity d, TextAreaData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/UploadDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/UploadDataBuilder.java
new file mode 100644
index 000000000..67e137591
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/UploadDataBuilder.java
@@ -0,0 +1,34 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.UploadDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.UploadData;
+import gr.cite.tools.data.builder.BuilderFactory;
+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 UploadDataBuilder extends BaseFieldDataBuilder<UploadData, UploadDataEntity> {
+	private final BuilderFactory builderFactory;
+
+	@Autowired
+	public UploadDataBuilder(ConventionService conventionService, BuilderFactory builderFactory) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(UploadDataBuilder.class)));
+		this.builderFactory = builderFactory;
+	}
+
+	protected UploadData getInstance() {
+		return new UploadData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, UploadDataEntity d, UploadData m) {
+		FieldSet typesFields = fields.extractPrefixed(this.asPrefix(UploadData._types));
+		if (!typesFields.isEmpty() && d.getTypes() != null) m.setTypes(this.builderFactory.builder(UploadOptionBuilder.class).build(typesFields, d.getTypes()));
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/UploadOptionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/UploadOptionBuilder.java
new file mode 100644
index 000000000..44c873e86
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/UploadOptionBuilder.java
@@ -0,0 +1,54 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.UploadDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.builder.BaseBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.UploadOption;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+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;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class UploadOptionBuilder extends BaseBuilder<UploadOption, UploadDataEntity.Option> {
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    @Autowired
+    public UploadOptionBuilder(
+            ConventionService conventionService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(UploadOptionBuilder.class)));
+    }
+
+    public UploadOptionBuilder authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    @Override
+    public List<UploadOption> build(FieldSet fields, List<UploadDataEntity.Option> data) throws MyApplicationException {
+        this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0));
+        this.logger.trace(new DataLogEntry("requested fields", fields));
+        if (fields == null || data == null || fields.isEmpty())
+            return new ArrayList<>();
+
+        List<UploadOption> models = new ArrayList<>();
+        for (UploadDataEntity.Option d : data) {
+            UploadOption m = new UploadOption();
+            if (fields.hasField(this.asIndexer(UploadOption._label))) m.setLabel(d.getLabel());
+            if (fields.hasField(this.asIndexer(UploadOption._value))) m.setValue(d.getValue());
+            models.add(m);
+        }
+        this.logger.debug("build {} items", Optional.of(models).map(List::size).orElse(0));
+        return models;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ValidationDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ValidationDataBuilder.java
new file mode 100644
index 000000000..35b68642b
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/ValidationDataBuilder.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.ValidationDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ValidationData;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class ValidationDataBuilder extends BaseFieldDataBuilder<ValidationData, ValidationDataEntity> {
+
+	@Autowired
+	public ValidationDataBuilder(ConventionService conventionService) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(ValidationDataBuilder.class)));
+	}
+
+	protected ValidationData getInstance() {
+		return new ValidationData();
+	}
+	@Override
+	protected void buildChild(FieldSet fields, ValidationDataEntity d, ValidationData m) {
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/WordListDataBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/WordListDataBuilder.java
new file mode 100644
index 000000000..a29e98831
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/descriptiontemplatedefinition/fielddata/WordListDataBuilder.java
@@ -0,0 +1,36 @@
+package eu.eudat.model.builder.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.WordListDataEntity;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.WordListData;
+import gr.cite.tools.data.builder.BuilderFactory;
+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 WordListDataBuilder extends ComboBoxDataBuilder<WordListData, WordListDataEntity> {
+	private final BuilderFactory builderFactory;
+	@Autowired
+	public WordListDataBuilder(ConventionService conventionService, BuilderFactory builderFactory) {
+		super(conventionService, new LoggerService(LoggerFactory.getLogger(WordListDataBuilder.class)));
+		this.builderFactory = builderFactory;
+	}
+
+	@Override
+	protected WordListData getInstance() {
+		return new WordListData();
+	}
+
+	@Override
+	protected void buildComboBoxChild(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/builder/dmpblueprintdefinition/DefinitionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/DefinitionBuilder.java
index 86e5b0a76..f0f2e8904 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/DefinitionBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/DefinitionBuilder.java
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.*;
 
-@Component
+@Component("dmpblueprintdefinitionbuilder")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DefinitionBuilder extends BaseBuilder<Definition, DefinitionEntity> {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/DescriptionTemplateBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/DescriptionTemplateBuilder.java
index 2ae115b47..6fdedaeeb 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/DescriptionTemplateBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/DescriptionTemplateBuilder.java
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.*;
 
-@Component
+@Component("dmpblueprintdefinitiondescriptiontemplatebuilder")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DescriptionTemplateBuilder extends BaseBuilder<DescriptionTemplate, DescriptionTemplateEntity> {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/FieldBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/FieldBuilder.java
index 5683d7da5..a3f44b69e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/FieldBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/FieldBuilder.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.*;
 
-@Component
+@Component("dmpblueprintdefinitionfieldbuilder")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public abstract class FieldBuilder<Model extends Field, Entity extends FieldEntity> extends BaseBuilder<Model, Entity> {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/SectionBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/SectionBuilder.java
index 652cf6282..1b9f0ef29 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/SectionBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/dmpblueprintdefinition/SectionBuilder.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Component
+@Component("dmpblueprintdefinitionsectionbuilder")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class SectionBuilder extends BaseBuilder<Section, SectionEntity> {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/DescriptionTemplateCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/DescriptionTemplateCensor.java
new file mode 100644
index 000000000..f5bb46c4b
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/DescriptionTemplateCensor.java
@@ -0,0 +1,46 @@
+package eu.eudat.model.censorship;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.DescriptionTemplate;
+import eu.eudat.model.censorship.descriptiontemplatedefinition.DefinitionCensor;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.censor.CensorFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DescriptionTemplateCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(DescriptionTemplateCensor.class));
+
+    protected final AuthorizationService authService;
+    protected final CensorFactory censorFactory;
+
+    public DescriptionTemplateCensor(ConventionService conventionService, AuthorizationService authService, CensorFactory censorFactory) {
+        super(conventionService);
+        this.authService = authService;
+        this.censorFactory = censorFactory;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+        FieldSet definitionFields = fields.extractPrefixed(this.asIndexerPrefix(DescriptionTemplate._definition));
+        this.censorFactory.censor(DescriptionTemplateTypeCensor.class).censor(definitionFields, userId);
+        FieldSet typeFields = fields.extractPrefixed(this.asIndexerPrefix(DescriptionTemplate._type));
+        this.censorFactory.censor(DefinitionCensor.class).censor(typeFields, userId);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/DefinitionCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/DefinitionCensor.java
new file mode 100644
index 000000000..edcde9a08
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/DefinitionCensor.java
@@ -0,0 +1,48 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import eu.eudat.model.descriptiontemplatedefinition.Definition;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.censor.CensorFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component("descriptiontemplatedefinitioncensor")
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DefinitionCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(DefinitionCensor.class));
+
+    protected final AuthorizationService authService;
+    protected final CensorFactory censorFactory;
+
+    public DefinitionCensor(ConventionService conventionService, 
+                            AuthorizationService authService, 
+                            CensorFactory censorFactory) {
+        super(conventionService);
+        this.authService = authService;
+        this.censorFactory = censorFactory;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+        FieldSet sectionsFields = fields.extractPrefixed(this.asIndexerPrefix(Definition._sections));
+        this.censorFactory.censor(SectionCensor.class).censor(sectionsFields, userId);
+        FieldSet pagesFields = fields.extractPrefixed(this.asIndexerPrefix(Definition._pages));
+        this.censorFactory.censor(PageCensor.class).censor(pagesFields, userId);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldCensor.java
new file mode 100644
index 000000000..7e57088fa
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldCensor.java
@@ -0,0 +1,49 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.censor.CensorFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import eu.eudat.model.descriptiontemplatedefinition.Field;
+
+import java.util.UUID;
+
+@Component("descriptiontemplatedefinitionfieldcensor")
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class FieldCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(FieldCensor.class));
+
+    protected final AuthorizationService authService;
+    protected final CensorFactory censorFactory;
+
+    public FieldCensor(ConventionService conventionService,
+                       AuthorizationService authService, CensorFactory censorFactory) {
+        super(conventionService);
+        this.authService = authService;
+        this.censorFactory = censorFactory;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+
+        FieldSet multiplicityFields = fields.extractPrefixed(this.asIndexerPrefix(Field._visibilityRules));
+        this.censorFactory.censor(RuleCensor.class).censor(multiplicityFields, userId);
+
+        FieldSet fieldFields = fields.extractPrefixed(this.asIndexerPrefix(Field._data));
+        this.censorFactory.censor(FieldDataCensor.class).censor(fieldFields, userId);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldDataCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldDataCensor.java
new file mode 100644
index 000000000..4f5d3ad14
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldDataCensor.java
@@ -0,0 +1,40 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.censor.CensorFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class FieldDataCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(FieldDataCensor.class));
+
+    protected final AuthorizationService authService;
+
+    public FieldDataCensor(ConventionService conventionService,
+                           AuthorizationService authService) {
+        super(conventionService);
+        this.authService = authService;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldSetCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldSetCensor.java
new file mode 100644
index 000000000..c6ddd6205
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/FieldSetCensor.java
@@ -0,0 +1,48 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.censor.CensorFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class FieldSetCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(FieldSetCensor.class));
+
+    protected final AuthorizationService authService;
+    protected final CensorFactory censorFactory;
+
+    public FieldSetCensor(ConventionService conventionService,
+                          AuthorizationService authService, CensorFactory censorFactory) {
+        super(conventionService);
+        this.authService = authService;
+        this.censorFactory = censorFactory;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+
+        FieldSet multiplicityFields = fields.extractPrefixed(this.asIndexerPrefix(eu.eudat.model.descriptiontemplatedefinition.FieldSet._multiplicity));
+        this.censorFactory.censor(MultiplicityCensor.class).censor(multiplicityFields, userId);
+
+        FieldSet fieldsFields = fields.extractPrefixed(this.asIndexerPrefix(eu.eudat.model.descriptiontemplatedefinition.FieldSet._fields));
+        this.censorFactory.censor(FieldCensor.class).censor(fieldsFields, userId);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/MultiplicityCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/MultiplicityCensor.java
new file mode 100644
index 000000000..40efbfc46
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/MultiplicityCensor.java
@@ -0,0 +1,39 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class MultiplicityCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(MultiplicityCensor.class));
+
+    protected final AuthorizationService authService;
+
+    public MultiplicityCensor(ConventionService conventionService,
+                              AuthorizationService authService) {
+        super(conventionService);
+        this.authService = authService;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/PageCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/PageCensor.java
new file mode 100644
index 000000000..29ef77568
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/PageCensor.java
@@ -0,0 +1,43 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.censor.CensorFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class PageCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(PageCensor.class));
+
+    protected final AuthorizationService authService;
+    protected final CensorFactory censorFactory;
+
+    public PageCensor(ConventionService conventionService,
+                      AuthorizationService authService,
+                      CensorFactory censorFactory) {
+        super(conventionService);
+        this.authService = authService;
+        this.censorFactory = censorFactory;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/RuleCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/RuleCensor.java
new file mode 100644
index 000000000..54979c047
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/RuleCensor.java
@@ -0,0 +1,39 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class RuleCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(RuleCensor.class));
+
+    protected final AuthorizationService authService;
+
+    public RuleCensor(ConventionService conventionService,
+                      AuthorizationService authService) {
+        super(conventionService);
+        this.authService = authService;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/SectionCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/SectionCensor.java
new file mode 100644
index 000000000..c7e913243
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/descriptiontemplatedefinition/SectionCensor.java
@@ -0,0 +1,46 @@
+package eu.eudat.model.censorship.descriptiontemplatedefinition;
+
+import eu.eudat.authorization.Permission;
+import eu.eudat.convention.ConventionService;
+import eu.eudat.model.censorship.BaseCensor;
+import eu.eudat.model.descriptiontemplatedefinition.Section;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.censor.CensorFactory;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.DataLogEntry;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.UUID;
+
+@Component("descriptiontemplatedefinitionsectioncensor")
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class SectionCensor extends BaseCensor {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(SectionCensor.class));
+
+    protected final AuthorizationService authService;
+    protected final CensorFactory censorFactory;
+
+    public SectionCensor(ConventionService conventionService,
+                         AuthorizationService authService,
+                         CensorFactory censorFactory) {
+        super(conventionService);
+        this.authService = authService;
+        this.censorFactory = censorFactory;
+    }
+
+    public void censor(FieldSet fields, UUID userId) {
+        logger.debug(new DataLogEntry("censoring fields", fields));
+        if (fields == null || fields.isEmpty())
+            return;
+
+        this.authService.authorizeForce(Permission.BrowseDescriptionTemplate);
+        FieldSet fieldsFields = fields.extractPrefixed(this.asIndexerPrefix(Section._fieldSets));
+        this.censorFactory.censor(FieldSetCensor.class).censor(fieldsFields, userId);
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DefinitionCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DefinitionCensor.java
index 5db844e62..7c6f65a86 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DefinitionCensor.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DefinitionCensor.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.UUID;
 
-@Component
+@Component("dmpblueprintdefinitioncensor")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DefinitionCensor extends BaseCensor {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DescriptionTemplatesCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DescriptionTemplatesCensor.java
index 9a8969f8e..c4e4023d1 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DescriptionTemplatesCensor.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/DescriptionTemplatesCensor.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.UUID;
 
-@Component
+@Component("dmpblueprintdefinitiondescriptiontemplatecensor")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class DescriptionTemplatesCensor extends BaseCensor {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/FieldCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/FieldCensor.java
index 181f601fe..896e48f32 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/FieldCensor.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/FieldCensor.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.UUID;
 
-@Component
+@Component("dmpblueprintdefinitionfieldcensor")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class FieldCensor extends BaseCensor {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/SectionCensor.java b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/SectionCensor.java
index 951020bf2..4aea31e62 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/SectionCensor.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/censorship/dmpblueprintdefinition/SectionCensor.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.UUID;
 
-@Component
+@Component("dmpblueprintdefinitionsectioncensor")
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class SectionCensor extends BaseCensor {
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Definition.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Definition.java
new file mode 100644
index 000000000..66fef15e8
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Definition.java
@@ -0,0 +1,28 @@
+package eu.eudat.model.descriptiontemplatedefinition;
+
+import java.util.List;
+
+public class Definition {
+
+	public final static String _sections = "sections";
+	private List<Section> sections;
+
+	public final static String _pages = "pages";
+	private List<Page> pages;
+
+	public List<Section> getSections() {
+		return sections;
+	}
+
+	public void setSections(List<Section> sections) {
+		this.sections = sections;
+	}
+
+	public List<Page> getPages() {
+		return pages;
+	}
+
+	public void setPages(List<Page> pages) {
+		this.pages = pages;
+	}
+}
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
new file mode 100644
index 000000000..947ed3cd0
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Field.java
@@ -0,0 +1,120 @@
+package eu.eudat.model.descriptiontemplatedefinition;
+
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.enums.FieldValidationType;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+
+import java.util.List;
+
+public class Field {
+
+	public final static String _id = "id";
+	private String id;
+
+	public final static String _ordinal = "ordinal";
+	private Integer ordinal;
+
+	public final static String _numbering = "numbering";
+	private String numbering;
+
+	public final static String _schematics = "schematics";
+	private List<String> schematics;
+
+	public final static String _defaultValue = "defaultValue";
+	private String defaultValue;
+
+	public final static String _visibilityRules = "visibilityRules";
+	private List<Rule> visibilityRules;
+
+	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;
+
+	public final static String _data = "data";
+	private BaseFieldData data;
+
+	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 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<Rule> getVisibilityRules() {
+		return visibilityRules;
+	}
+
+	public void setVisibilityRules(List<Rule> visibilityRules) {
+		this.visibilityRules = visibilityRules;
+	}
+
+	public List<FieldValidationType> getValidations() {
+		return validations;
+	}
+
+	public void setValidations(List<FieldValidationType> validations) {
+		this.validations = validations;
+	}
+
+	public FieldType getFieldType() {
+		return fieldType;
+	}
+
+	public void setFieldType(FieldType fieldType) {
+		this.fieldType = fieldType;
+	}
+
+	public Boolean getIncludeInExport() {
+		return includeInExport;
+	}
+
+	public void setIncludeInExport(Boolean includeInExport) {
+		this.includeInExport = includeInExport;
+	}
+
+	public BaseFieldData getData() {
+		return data;
+	}
+
+	public void setData(BaseFieldData data) {
+		this.data = data;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/FieldSet.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/FieldSet.java
new file mode 100644
index 000000000..82da3ff1d
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/FieldSet.java
@@ -0,0 +1,116 @@
+package eu.eudat.model.descriptiontemplatedefinition;
+
+import java.util.List;
+
+public class FieldSet {
+
+	public final static String _id = "id";
+	private String id;
+
+	public final static String _ordinal = "ordinal";
+	private Integer ordinal;
+
+	public final static String _numbering = "numbering";
+	private String numbering;
+
+	public final static String _title = "title";
+	private String title;
+
+	public final static String _description = "description";
+	private String description;
+
+	public final static String _extendedDescription = "extendedDescription";
+	private String extendedDescription;
+
+	public final static String _additionalInformation = "additionalInformation";
+	private String additionalInformation;
+
+	public final static String _multiplicity = "multiplicity";
+	private Multiplicity multiplicity;
+
+	public final static String _hasCommentField = "hasCommentField";
+	private Boolean hasCommentField;
+
+	public final static String _fields = "fields";
+	private List<Field> fields;
+
+	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 Multiplicity getMultiplicity() {
+		return multiplicity;
+	}
+
+	public void setMultiplicity(Multiplicity multiplicity) {
+		this.multiplicity = multiplicity;
+	}
+
+	public Boolean getHasCommentField() {
+		return hasCommentField;
+	}
+
+	public void setHasCommentField(Boolean hasCommentField) {
+		this.hasCommentField = hasCommentField;
+	}
+
+	public List<Field> getFields() {
+		return fields;
+	}
+
+	public void setFields(List<Field> fields) {
+		this.fields = fields;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Multiplicity.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Multiplicity.java
new file mode 100644
index 000000000..3fffdb932
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Multiplicity.java
@@ -0,0 +1,52 @@
+package eu.eudat.model.descriptiontemplatedefinition;
+
+import eu.eudat.commons.enums.DmpBlueprintFieldCategory;
+
+import java.util.UUID;
+
+public abstract class Multiplicity {
+
+	public final static String _min = "min";
+	private Integer min;
+
+	public final static String _max = "max";
+	private Integer max;
+
+	public final static String _placeholder = "placeholder";
+	private String placeholder;
+
+	public final static String _tableView = "tableView";
+	private Boolean tableView;
+
+	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/descriptiontemplatedefinition/Page.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Page.java
new file mode 100644
index 000000000..b498b879b
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Page.java
@@ -0,0 +1,42 @@
+package eu.eudat.model.descriptiontemplatedefinition;
+
+
+import java.util.List;
+
+public class Page {
+
+	public final static String _id = "id";
+	private String id;
+
+	public final static String _ordinal = "ordinal";
+	private int ordinal;
+
+	public final static String _title = "title";
+	private String title;
+
+	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/descriptiontemplatedefinition/Rule.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Rule.java
new file mode 100644
index 000000000..9d8d401c4
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Rule.java
@@ -0,0 +1,29 @@
+package eu.eudat.model.descriptiontemplatedefinition;
+
+public class Rule {
+
+	public final static String _target = "target";
+	private String target;
+
+
+	public final static String _value = "value";
+	private String value;
+
+
+	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/descriptiontemplatedefinition/Section.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
new file mode 100644
index 000000000..cdac01aae
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
@@ -0,0 +1,130 @@
+package eu.eudat.model.descriptiontemplatedefinition;
+
+
+import java.util.List;
+
+public class Section {
+
+	public final static String _id = "id";
+	private String id;
+
+	public final static String _ordinal = "ordinal";
+	private int ordinal;
+
+	public final static String _defaultVisibility = "defaultVisibility";
+	private Boolean defaultVisibility;
+
+	public final static String _multiplicity = "multiplicity";
+	private Boolean multiplicity;
+
+	public final static String _numbering = "numbering";
+	private String numbering;
+
+	public final static String _page = "page";
+	private String page;
+
+	public final static String _title = "title";
+	private String title;
+
+	public final static String _description = "description";
+	private String description;
+
+	public final static String _extendedDescription = "extendedDescription";
+	private String extendedDescription;
+
+	public final static String _sections = "sections";
+	private List<Section> sections;
+
+	public final static String _fieldSets = "fieldSets";
+	private List<FieldSet> fieldSets;
+
+	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 getNumbering() {
+		return numbering;
+	}
+
+	public void setNumbering(String numbering) {
+		this.numbering = numbering;
+	}
+
+	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 String getExtendedDescription() {
+		return extendedDescription;
+	}
+
+	public void setExtendedDescription(String extendedDescription) {
+		this.extendedDescription = extendedDescription;
+	}
+
+	public List<Section> getSections() {
+		return sections;
+	}
+
+	public void setSections(List<Section> sections) {
+		this.sections = sections;
+	}
+
+	public List<FieldSet> getFieldSets() {
+		return fieldSets;
+	}
+
+	public void setFieldSets(List<FieldSet> fieldSets) {
+		this.fieldSets = fieldSets;
+	}
+}
+
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AuthAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AuthAutoCompleteData.java
new file mode 100644
index 000000000..a772fa8c2
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AuthAutoCompleteData.java
@@ -0,0 +1,54 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class AuthAutoCompleteData {
+	public final static String _url = "url";
+	private String url;
+	public final static String _method = "method";
+	private String method;
+	public final static String _body = "body";
+	private String body;
+	public final static String _path = "path";
+	private String path;
+	public final static String _type = "type";
+	private String type;
+
+	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/descriptiontemplatedefinition/fielddata/AutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteData.java
new file mode 100644
index 000000000..87efae744
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteData.java
@@ -0,0 +1,22 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+import java.util.List;
+
+public class AutoCompleteData extends ComboBoxData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+    public final static String _autoCompleteSingleDataList = "autoCompleteSingleDataList";
+    private List<AutoCompleteSingleData> autoCompleteSingleDataList;
+
+    public Boolean getMultiAutoComplete() { return multiAutoComplete; }
+    public void setMultiAutoComplete(Boolean multiAutoComplete) { this.multiAutoComplete = multiAutoComplete; }
+
+    public List<AutoCompleteSingleData> getAutoCompleteSingleDataList() {
+        return autoCompleteSingleDataList;
+    }
+
+    public void setAutoCompleteSingleDataList(List<AutoCompleteSingleData> autoCompleteSingleDataList) {
+        this.autoCompleteSingleDataList = autoCompleteSingleDataList;
+    }
+}
+
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteSingleData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteSingleData.java
new file mode 100644
index 000000000..9a0046924
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/AutoCompleteSingleData.java
@@ -0,0 +1,76 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
+
+public class AutoCompleteSingleData {
+	public final static String _autocompleteType = "autocompleteType";
+	private AutoCompleteDataEntity.AutocompleteType autocompleteType;
+	public final static String _url = "url";
+	private String url;
+	public final static String _autoCompleteOptions = "autoCompleteOptions";
+	private ComboBoxOption autoCompleteOptions;
+	public final static String _optionsRoot = "optionsRoot";
+	private String optionsRoot;
+	public final static String _hasAuth = "hasAuth";
+	private Boolean hasAuth;
+	public final static String _auth = "auth";
+	private AuthAutoCompleteData auth;
+	public final static String _method = "method";
+	private String method;
+
+	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 AuthAutoCompleteData getAuth() {
+		return auth;
+	}
+
+	public void setAuth(AuthAutoCompleteData auth) {
+		this.auth = auth;
+	}
+
+	public ComboBoxOption getAutoCompleteOptions() {
+		return autoCompleteOptions;
+	}
+
+	public void setAutoCompleteOptions(ComboBoxOption 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/descriptiontemplatedefinition/fielddata/BaseFieldData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BaseFieldData.java
new file mode 100644
index 000000000..ce23bc0e3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BaseFieldData.java
@@ -0,0 +1,15 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public abstract class BaseFieldData {
+
+	public final static String _label = "label";
+	private String label;
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BooleanDecisionData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BooleanDecisionData.java
new file mode 100644
index 000000000..4472e9005
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/BooleanDecisionData.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class BooleanDecisionData extends BaseFieldData {
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CheckBoxData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CheckBoxData.java
new file mode 100644
index 000000000..1ddcdebcb
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CheckBoxData.java
@@ -0,0 +1,6 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class CheckBoxData extends BaseFieldData {
+
+    
+}
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
new file mode 100644
index 000000000..8a7f1c6a6
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ComboBoxData.java
@@ -0,0 +1,20 @@
+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/ComboBoxOption.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ComboBoxOption.java
new file mode 100644
index 000000000..ba1ca8e51
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ComboBoxOption.java
@@ -0,0 +1,46 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class ComboBoxOption {
+	public final static String _label = "label";
+	private String label;
+	public final static String _value = "value";
+	private String value;
+	public final static String _source = "source";
+	private String source;
+	public final static String _uri = "uri";
+	private String uri;
+
+	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/descriptiontemplatedefinition/fielddata/CurrencyData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CurrencyData.java
new file mode 100644
index 000000000..c5333dae4
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/CurrencyData.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class CurrencyData extends BaseFieldData {
+    
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DataRepositoryData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DataRepositoryData.java
new file mode 100644
index 000000000..6ff4a22c8
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DataRepositoryData.java
@@ -0,0 +1,14 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class DataRepositoryData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteData.java
new file mode 100644
index 000000000..36c199474
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetAutoCompleteData.java
@@ -0,0 +1,13 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class DatasetAutoCompleteData extends InternalDmpBaseData {
+	public final static String _multiAutoComplete = "multiAutoComplete";
+	private Boolean multiAutoComplete;
+
+	public Boolean getMultiAutoComplete() {
+		return multiAutoComplete;
+	}
+	public void setMultiAutoComplete(Boolean multiAutoComplete) {
+		this.multiAutoComplete = multiAutoComplete;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetIdentifierData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetIdentifierData.java
new file mode 100644
index 000000000..6d9336826
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatasetIdentifierData.java
@@ -0,0 +1,6 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+public class DatasetIdentifierData extends BaseFieldData {
+  
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatePickerData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatePickerData.java
new file mode 100644
index 000000000..cc2e50bd4
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DatePickerData.java
@@ -0,0 +1,4 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class DatePickerData extends BaseFieldData {
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DmpAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DmpAutoCompleteData.java
new file mode 100644
index 000000000..09a09db00
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/DmpAutoCompleteData.java
@@ -0,0 +1,13 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class DmpAutoCompleteData extends InternalDmpBaseData {
+	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/ExternalDatasetData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ExternalDatasetData.java
new file mode 100644
index 000000000..10f36ed91
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ExternalDatasetData.java
@@ -0,0 +1,27 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+import eu.eudat.commons.enums.FieldDataExternalDatasetType;
+
+public class ExternalDatasetData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+    public final static String _type = "type";
+    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/descriptiontemplatedefinition/fielddata/FreeTextData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/FreeTextData.java
new file mode 100644
index 000000000..e953e0f33
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/FreeTextData.java
@@ -0,0 +1,4 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class FreeTextData extends BaseFieldData {
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/InternalDmpBaseData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/InternalDmpBaseData.java
new file mode 100644
index 000000000..0cbf24905
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/InternalDmpBaseData.java
@@ -0,0 +1,15 @@
+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/LicenseData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LicenseData.java
new file mode 100644
index 000000000..cc9928ace
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/LicenseData.java
@@ -0,0 +1,15 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class LicenseData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/OrganizationData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/OrganizationData.java
new file mode 100644
index 000000000..258070f92
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/OrganizationData.java
@@ -0,0 +1,15 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class OrganizationData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationData.java
new file mode 100644
index 000000000..7857d458f
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/PublicationData.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+public class PublicationData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RadioBoxData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RadioBoxData.java
new file mode 100644
index 000000000..20f365401
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RadioBoxData.java
@@ -0,0 +1,19 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+import java.util.List;
+
+public class RadioBoxData extends BaseFieldData {
+
+
+    public final static String _options = "options";
+    private List<RadioBoxOption> options;
+
+    public List<RadioBoxOption> getOptions() {
+        return options;
+    }
+
+    public void setOptions(List<RadioBoxOption> options) {
+        this.options = options;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RadioBoxOption.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RadioBoxOption.java
new file mode 100644
index 000000000..1924865b3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RadioBoxOption.java
@@ -0,0 +1,24 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class RadioBoxOption {
+	public final static String _label = "label";
+	private String label;
+	public final static String _value = "value";
+	private String value;
+
+	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/descriptiontemplatedefinition/fielddata/RegistryData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RegistryData.java
new file mode 100644
index 000000000..4719b8e64
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RegistryData.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+public class RegistryData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteData.java
new file mode 100644
index 000000000..2e6c8af5a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherAutoCompleteData.java
@@ -0,0 +1,13 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class ResearcherAutoCompleteData extends InternalDmpBaseData {
+	public final static String _multiAutoComplete = "multiAutoComplete";
+	private Boolean multiAutoComplete;
+
+	public Boolean getMultiAutoComplete() {
+		return multiAutoComplete;
+	}
+	public void setMultiAutoComplete(Boolean multiAutoComplete) {
+		this.multiAutoComplete = multiAutoComplete;
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherData.java
new file mode 100644
index 000000000..06868dc47
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ResearcherData.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+public class ResearcherData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RichTextAreaData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RichTextAreaData.java
new file mode 100644
index 000000000..3f982196f
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/RichTextAreaData.java
@@ -0,0 +1,7 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+
+public class RichTextAreaData extends BaseFieldData {
+    
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ServiceData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ServiceData.java
new file mode 100644
index 000000000..f981038ad
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ServiceData.java
@@ -0,0 +1,15 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+public class ServiceData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TagData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TagData.java
new file mode 100644
index 000000000..9a4a71800
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TagData.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+public class TagData extends BaseFieldData {
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TaxonomyData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TaxonomyData.java
new file mode 100644
index 000000000..35ad571c5
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TaxonomyData.java
@@ -0,0 +1,16 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+public class TaxonomyData extends BaseFieldData {
+    public final static String _multiAutoComplete = "multiAutoComplete";
+    private Boolean multiAutoComplete;
+
+    public Boolean getMultiAutoComplete() {
+        return multiAutoComplete;
+    }
+
+    public void setMultiAutoComplete(Boolean multiAutoComplete) {
+        this.multiAutoComplete = multiAutoComplete;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TextAreaData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TextAreaData.java
new file mode 100644
index 000000000..37e9931fe
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/TextAreaData.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class TextAreaData extends BaseFieldData {
+    
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/UploadData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/UploadData.java
new file mode 100644
index 000000000..6090dd668
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/UploadData.java
@@ -0,0 +1,30 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+
+import java.util.List;
+
+public class UploadData extends BaseFieldData {
+    public final static String _types = "types";
+    private List<UploadOption> types;
+
+    public List<UploadOption> getTypes() {
+        return types;
+    }
+
+    public void setTypes(List<UploadOption> 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/descriptiontemplatedefinition/fielddata/UploadOption.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/UploadOption.java
new file mode 100644
index 000000000..2485c93db
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/UploadOption.java
@@ -0,0 +1,24 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class UploadOption {
+	public final static String _label = "label";
+	private String label;
+	public final static String _value = "value";
+	private String value;
+
+	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/descriptiontemplatedefinition/fielddata/ValidationData.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ValidationData.java
new file mode 100644
index 000000000..6df91ae22
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/ValidationData.java
@@ -0,0 +1,5 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+public class ValidationData extends BaseFieldData {
+  
+}
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
new file mode 100644
index 000000000..120b756d1
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/fielddata/WordListData.java
@@ -0,0 +1,26 @@
+package eu.eudat.model.descriptiontemplatedefinition.fielddata;
+
+import java.util.List;
+
+public class WordListData extends ComboBoxData {
+    public final static String _options = "options";
+    private List<ComboBoxOption> options;
+    public final static String _multiList = "multiList";
+    private Boolean multiList;
+
+    public List<ComboBoxOption> getOptions() {
+        return options;
+    }
+
+    public void setOptions(List<ComboBoxOption> 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/model/dmpblueprintdefinition/Field.java b/dmp-backend/core/src/main/java/eu/eudat/model/dmpblueprintdefinition/Field.java
index 791c37364..d39a9f81e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/dmpblueprintdefinition/Field.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/dmpblueprintdefinition/Field.java
@@ -25,7 +25,7 @@ public abstract class Field {
 	private Integer ordinal;
 
 	public final static String _required = "required";
-	private boolean required;
+	private Boolean required;
 
 	public UUID getId() {
 		return id;
@@ -75,11 +75,11 @@ public abstract class Field {
 		this.ordinal = ordinal;
 	}
 
-	public boolean isRequired() {
+	public Boolean isRequired() {
 		return required;
 	}
 
-	public void setRequired(boolean required) {
+	public void setRequired(Boolean required) {
 		this.required = required;
 	}
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java
index 2c0c24df8..52aabbac7 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/DescriptionTemplateTypePersist.java
@@ -3,8 +3,10 @@ package eu.eudat.model.persist;
 
 import eu.eudat.commons.enums.DescriptionTemplateTypeStatus;
 import eu.eudat.commons.validation.FieldNotNullIfOtherSet;
+import eu.eudat.commons.validation.ValidEnum;
 import eu.eudat.commons.validation.ValidId;
 
+import eu.eudat.data.DescriptionTemplateTypeEntity;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -18,12 +20,12 @@ public class DescriptionTemplateTypePersist {
 
     @NotNull(message = "{validation.empty}")
     @NotEmpty(message = "{validation.empty}")
-    @Size(max = 500, message = "{validation.largerthanmax}")
-    private String name;
+    @Size(max = DescriptionTemplateTypeEntity._nameLength, message = "{validation.largerthanmax}")
+    private String name = null;
 
     private String hash;
-    
-    @NotNull(message = "{validation.empty}")
+
+    @ValidEnum(message = "{validation.empty}")
     private DescriptionTemplateTypeStatus status;
     
     public UUID getId() {
diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java b/dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java
new file mode 100644
index 000000000..26b52732a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateQuery.java
@@ -0,0 +1,227 @@
+package eu.eudat.query;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.enums.IsActive;
+import eu.eudat.commons.scope.user.UserScope;
+import eu.eudat.data.DescriptionTemplateEntity;
+import eu.eudat.model.DescriptionTemplate;
+import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.query.FieldResolver;
+import gr.cite.tools.data.query.QueryBase;
+import gr.cite.tools.data.query.QueryContext;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DescriptionTemplateQuery extends QueryBase<DescriptionTemplateEntity> {
+
+    private String like;
+
+    private Collection<UUID> ids;
+
+    private Collection<IsActive> isActives;
+
+    private Collection<DescriptionTemplateStatus> statuses;
+
+    private Collection<UUID> excludedIds;
+    
+    private Collection<UUID> typeIds;
+
+    private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
+
+    public DescriptionTemplateQuery like(String value) {
+        this.like = value;
+        return this;
+    }
+
+    public DescriptionTemplateQuery ids(UUID value) {
+        this.ids = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery ids(UUID... value) {
+        this.ids = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery ids(Collection<UUID> values) {
+        this.ids = values;
+        return this;
+    }
+
+    public DescriptionTemplateQuery typeIds(UUID value) {
+        this.typeIds = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery typeIds(UUID... value) {
+        this.typeIds = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery typeIds(Collection<UUID> values) {
+        this.typeIds = values;
+        return this;
+    }
+
+    public DescriptionTemplateQuery isActive(IsActive value) {
+        this.isActives = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery isActive(IsActive... value) {
+        this.isActives = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery isActive(Collection<IsActive> values) {
+        this.isActives = values;
+        return this;
+    }
+
+    public DescriptionTemplateQuery statuses(DescriptionTemplateStatus value) {
+        this.statuses = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery statuses(DescriptionTemplateStatus... value) {
+        this.statuses = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery statuses(Collection<DescriptionTemplateStatus> values) {
+        this.statuses = values;
+        return this;
+    }
+
+    public DescriptionTemplateQuery excludedIds(Collection<UUID> values) {
+        this.excludedIds = values;
+        return this;
+    }
+
+    public DescriptionTemplateQuery excludedIds(UUID value) {
+        this.excludedIds = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery excludedIds(UUID... value) {
+        this.excludedIds = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateQuery authorize(EnumSet<AuthorizationFlags> values) {
+        this.authorize = values;
+        return this;
+    }
+
+    private final AuthorizationService authService;
+
+    public DescriptionTemplateQuery(
+            UserScope userScope,
+            AuthorizationService authService
+    ) {
+        this.authService = authService;
+    }
+
+    @Override
+    protected Class<DescriptionTemplateEntity> entityClass() {
+        return DescriptionTemplateEntity.class;
+    }
+
+    @Override
+    protected Boolean isFalseQuery() {
+        return this.isEmpty(this.ids) || this.isEmpty(this.typeIds) ||this.isEmpty(this.isActives) || this.isEmpty(this.excludedIds) || this.isEmpty(this.statuses);
+    }
+
+    @Override
+    protected <X, Y> Predicate applyFilters(QueryContext<X, Y> queryContext) {
+        List<Predicate> predicates = new ArrayList<>();
+        if (this.ids != null) {
+            CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateEntity._id));
+            for (UUID item : this.ids)
+                inClause.value(item);
+            predicates.add(inClause);
+        }
+        if (this.typeIds != null) {
+            CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateEntity._type));
+            for (UUID item : this.typeIds)
+                inClause.value(item);
+            predicates.add(inClause);
+        }
+        if (this.like != null && !this.like.isEmpty()) {
+            predicates.add(queryContext.CriteriaBuilder.or(queryContext.CriteriaBuilder.like(queryContext.Root.get(DescriptionTemplateEntity._description), this.like),
+                    queryContext.CriteriaBuilder.like(queryContext.Root.get(DescriptionTemplateEntity._description), this.like)
+            ));
+        }
+        if (this.isActives != null) {
+            CriteriaBuilder.In<IsActive> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateEntity._isActive));
+            for (IsActive item : this.isActives)
+                inClause.value(item);
+            predicates.add(inClause);
+        }
+
+        if (this.statuses != null) {
+            CriteriaBuilder.In<DescriptionTemplateStatus> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateEntity._status));
+            for (DescriptionTemplateStatus item : this.statuses)
+                inClause.value(item);
+            predicates.add(inClause);
+        }
+        if (this.excludedIds != null) {
+            CriteriaBuilder.In<UUID> notInClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateEntity._id));
+            for (UUID item : this.excludedIds)
+                notInClause.value(item);
+            predicates.add(notInClause.not());
+        }
+        if (!predicates.isEmpty()) {
+            Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
+            return queryContext.CriteriaBuilder.and(predicatesArray);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    protected DescriptionTemplateEntity convert(Tuple tuple, Set<String> columns) {
+        DescriptionTemplateEntity item = new DescriptionTemplateEntity();
+        item.setId(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._id, UUID.class));
+        item.setLabel(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._label, String.class));
+        item.setDefinition(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._definition, String.class));
+        item.setDescription(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._description, String.class));
+        item.setGroupId(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._groupId, UUID.class));
+        item.setVersion(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._version, Short.class));
+        item.setLanguage(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._language, String.class));
+        item.setType(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._type, UUID.class));
+        item.setCreatedAt(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._createdAt, Instant.class));
+        item.setUpdatedAt(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._updatedAt, Instant.class));
+        item.setIsActive(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._isActive, IsActive.class));
+        item.setStatus(QueryBase.convertSafe(tuple, columns, DescriptionTemplateEntity._status, DescriptionTemplateStatus.class));
+        return item;
+    }
+
+    @Override
+    protected String fieldNameOf(FieldResolver item) {
+        if (item.match(DescriptionTemplate._id)) return DescriptionTemplateEntity._id;
+        else if (item.match(DescriptionTemplate._label)) return DescriptionTemplateEntity._label;
+        else if (item.prefix(DescriptionTemplate._definition)) return DescriptionTemplateEntity._definition;
+        else if (item.match(DescriptionTemplate._description)) return DescriptionTemplateEntity._description;
+        else if (item.match(DescriptionTemplate._groupId)) return DescriptionTemplateEntity._groupId;
+        else if (item.match(DescriptionTemplate._version)) return DescriptionTemplateEntity._version;
+        else if (item.match(DescriptionTemplate._language)) return DescriptionTemplateEntity._language;
+        else if (item.prefix(DescriptionTemplate._type)) return DescriptionTemplateEntity._type;
+        else if (item.match(DescriptionTemplate._createdAt)) return DescriptionTemplateEntity._createdAt;
+        else if (item.match(DescriptionTemplate._updatedAt)) return DescriptionTemplateEntity._updatedAt;
+        else if (item.match(DescriptionTemplate._isActive)) return DescriptionTemplateEntity._isActive;
+        else if (item.match(DescriptionTemplate._status)) return DescriptionTemplateEntity._status;
+        else return null;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateLookup.java b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateLookup.java
new file mode 100644
index 000000000..1d4ff9ad2
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateLookup.java
@@ -0,0 +1,94 @@
+package eu.eudat.query.lookup;
+
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.enums.IsActive;
+import eu.eudat.query.DescriptionTemplateQuery;
+import gr.cite.tools.data.query.Lookup;
+import gr.cite.tools.data.query.QueryFactory;
+
+import java.util.List;
+import java.util.UUID;
+
+public class DescriptionTemplateLookup extends Lookup {
+
+    private String like;
+
+    private List<IsActive> isActive;
+
+    private List<DescriptionTemplateStatus> statuses;
+
+    private List<UUID> ids;
+    
+    private List<UUID> typeIds;
+
+    private List<UUID> excludedIds;
+
+    public String getLike() {
+        return like;
+    }
+
+    public void setLike(String like) {
+        this.like = like;
+    }
+
+    public List<IsActive> getIsActive() {
+        return isActive;
+    }
+
+    public void setIsActive(List<IsActive> isActive) {
+        this.isActive = isActive;
+    }
+
+    public List<UUID> getIds() {
+        return ids;
+    }
+
+    public void setIds(List<UUID> ids) {
+        this.ids = ids;
+    }
+
+    public List<UUID> getExcludedIds() {
+        return excludedIds;
+    }
+
+    public void setExcludedIds(List<UUID> excludeIds) {
+        this.excludedIds = excludeIds;
+    }
+
+    public List<DescriptionTemplateStatus> getStatuses() {
+        return statuses;
+    }
+
+    public void setStatuses(List<DescriptionTemplateStatus> statuses) {
+        this.statuses = statuses;
+    }
+
+    public List<UUID> getTypeIds() {
+        return typeIds;
+    }
+
+    public void setTypeIds(List<UUID> typeIds) {
+        this.typeIds = typeIds;
+    }
+
+    public DescriptionTemplateQuery enrich(QueryFactory queryFactory) {
+        DescriptionTemplateQuery query = queryFactory.query(DescriptionTemplateQuery.class);
+        if (this.like != null)
+            query.like(this.like);
+        if (this.isActive != null)
+            query.isActive(this.isActive);
+        if (this.statuses != null)
+            query.statuses(this.statuses);
+        if (this.ids != null)
+            query.ids(this.ids);
+        if (this.excludedIds != null)
+            query.excludedIds(this.excludedIds);
+        if (this.typeIds != null)
+            query.typeIds(this.typeIds);
+
+        this.enrichCommon(query);
+
+        return query;
+    }
+
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateTypeLookup.java b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateTypeLookup.java
index f12fe2bf9..509e41461 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateTypeLookup.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateTypeLookup.java
@@ -53,6 +53,14 @@ public class DescriptionTemplateTypeLookup extends Lookup {
         this.excludedIds = excludeIds;
     }
 
+    public List<DescriptionTemplateTypeStatus> getStatuses() {
+        return statuses;
+    }
+
+    public void setStatuses(List<DescriptionTemplateTypeStatus> statuses) {
+        this.statuses = statuses;
+    }
+
     public DescriptionTemplateTypeQuery enrich(QueryFactory queryFactory) {
         DescriptionTemplateTypeQuery query = queryFactory.query(DescriptionTemplateTypeQuery.class);
         if (this.like != null)
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintService.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintService.java
index 0bb4ab08f..b31b77718 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintService.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintService.java
@@ -32,5 +32,5 @@ public interface DmpBlueprintService {
     DmpBlueprint buildClone(UUID id, FieldSet fields) throws MyForbiddenException, MyValidationException, MyApplicationException, MyNotFoundException;
 
     ResponseEntity<byte[]> exportXml(UUID id) throws MyForbiddenException, MyNotFoundException, JAXBException, ParserConfigurationException, IOException, InstantiationException, IllegalAccessException, SAXException, TransformerException;
-    DmpBlueprint importXml(byte[] bytes, String label, FieldSet fields) throws MyForbiddenException, MyNotFoundException, JAXBException, ParserConfigurationException, TransformerException, InvalidApplicationException;
+    DmpBlueprint importXml(byte[] bytes, String label, FieldSet fields) throws MyForbiddenException, MyNotFoundException, JAXBException, ParserConfigurationException, TransformerException, InvalidApplicationException, IOException, InstantiationException, IllegalAccessException, SAXException;
 }
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java
index 847cc40cc..b5a327dba 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmpblueprint/DmpBlueprintServiceImpl.java
@@ -119,7 +119,7 @@ public class DmpBlueprintServiceImpl implements DmpBlueprintService {
         data.setLabel(model.getLabel());
         data.setStatus(model.getStatus());
         data.setUpdatedAt(Instant.now());
-        data.setDefinition(this.xmlHandlingService.xmlSerializableToXml(this.buildDefinitionEntity(model.getDefinition())));
+        data.setDefinition(this.xmlHandlingService.toXml(this.buildDefinitionEntity(model.getDefinition())));
         
         if (isUpdate) this.entityManager.merge(data);
         else  this.entityManager.persist(data);
@@ -214,7 +214,7 @@ public class DmpBlueprintServiceImpl implements DmpBlueprintService {
 
     public boolean fieldInBlueprint(DmpBlueprintEntity dmpBlueprintEntity, DmpBlueprintSystemFieldType type) {
 
-        DefinitionEntity definition = this.xmlHandlingService.xmlSerializableFromXmlSafe(DefinitionEntity.class, dmpBlueprintEntity.getDefinition());
+        DefinitionEntity definition = this.xmlHandlingService.fromXmlSafe(DefinitionEntity.class, dmpBlueprintEntity.getDefinition());
         if (definition == null || definition.getSections() == null) return false;
         
         for(SectionEntity section: definition.getSections()){
@@ -297,7 +297,7 @@ public class DmpBlueprintServiceImpl implements DmpBlueprintService {
         DmpBlueprintEntity data = this.entityManager.find(DmpBlueprintEntity.class, id);
         if (data == null) throw new MyNotFoundException(messageSource.getMessage("General_ItemNotFound", new Object[]{id, DmpBlueprint.class.getSimpleName()}, LocaleContextHolder.getLocale()));
 
-        DefinitionEntity dmpDefinition = this.xmlHandlingService.xmlSerializableFromXml(DefinitionEntity.class, data.getDefinition());
+        DefinitionEntity dmpDefinition = this.xmlHandlingService.fromXml(DefinitionEntity.class, data.getDefinition());
         String xml = this.buildExportXml(dmpDefinition);
         return this.responseUtilsService.buildResponseFileFromText(xml, data.getLabel() + ".xml");
     }
@@ -316,7 +316,7 @@ public class DmpBlueprintServiceImpl implements DmpBlueprintService {
         return this.xmlHandlingService.generateXml(xmlDoc);
     }
 
-    public DmpBlueprint importXml(byte[] bytes, String label, FieldSet fields) throws MyForbiddenException, MyNotFoundException, JAXBException, ParserConfigurationException, TransformerException, InvalidApplicationException {
+    public DmpBlueprint importXml(byte[] bytes, String label, FieldSet fields) throws MyForbiddenException, MyNotFoundException, JAXBException, ParserConfigurationException, TransformerException, InvalidApplicationException, IOException, InstantiationException, IllegalAccessException, SAXException {
         logger.debug(new MapLogEntry("import data").And("bytes", bytes).And("label", label).And("fields", fields));
 
         this.authorizationService.authorizeForce(Permission.ImportDmpBlueprint);
@@ -330,7 +330,7 @@ public class DmpBlueprintServiceImpl implements DmpBlueprintService {
         data.setLabel(label);
         data.setStatus(DmpBlueprintStatus.Draft);
         data.setUpdatedAt(Instant.now());
-        data.setDefinition(this.xmlHandlingService.xmlSerializableToXml(dmpDefinition.toDefinitionEntity()));
+        data.setDefinition(this.xmlHandlingService.toXml(dmpDefinition.toDefinitionEntity()));
         
         this.entityManager.persist(data);
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BaseFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BaseFieldDataHelperService.java
new file mode 100644
index 000000000..d416efd6a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BaseFieldDataHelperService.java
@@ -0,0 +1,43 @@
+package eu.eudat.service.fielddatahelper;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import gr.cite.tools.fieldset.FieldSet;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public abstract class BaseFieldDataHelperService<M extends BaseFieldData, D extends BaseFieldDataEntity<?>> implements FieldDataHelperService {
+	protected String subType;
+	
+	protected abstract List<M> buildInternal(FieldSet fieldSet, List<D> datas, EnumSet<AuthorizationFlags> authorizationFlags);
+	
+	@Override
+	public boolean requireSubType(){
+		return false;
+	}
+	@Override
+	public FieldDataHelperService setSubType(String data){
+		subType = data;
+		return this;
+	}
+
+	@Override
+	public String getSubType(){
+		return subType;
+	}
+
+	@Override
+	public BaseFieldData buildOne(FieldSet fieldSet, BaseFieldDataEntity<?> data, EnumSet<AuthorizationFlags> authorizationFlags){
+		List<BaseFieldData> models = this.build(fieldSet, List.of(data), authorizationFlags);
+		if (models == null || models.isEmpty()) return null;
+		return models.get(0);
+	}
+
+	@Override
+	public List<BaseFieldData> build(FieldSet fieldSet, List<BaseFieldDataEntity<?>> datas, EnumSet<AuthorizationFlags> authorizationFlags) {
+		return this.buildInternal(fieldSet, datas.stream().map(x-> (D) x).collect(Collectors.toList()), authorizationFlags).stream().map(x-> (M)x).collect(Collectors.toList());
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BooleanDecisionFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BooleanDecisionFieldDataHelperService.java
new file mode 100644
index 000000000..43c7f37e7
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/BooleanDecisionFieldDataHelperService.java
@@ -0,0 +1,56 @@
+package eu.eudat.service.fielddatahelper;
+
+import eu.eudat.authorization.AuthorizationFlags;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.BooleanDecisionDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.BooleanDecisionDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BooleanDecisionData;
+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 BooleanDecisionFieldDataHelperService extends BaseFieldDataHelperService<BooleanDecisionData, BooleanDecisionDataEntity> {
+	private final BuilderFactory builderFactory;
+
+	public BooleanDecisionFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.BOOLEAN_DECISION;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new BooleanDecisionDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new BooleanDecisionData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return BooleanDecisionDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return BooleanDecisionData.class;
+	}
+
+	@Override
+	public List<BooleanDecisionData> buildInternal(FieldSet fieldSet, List<BooleanDecisionDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(BooleanDecisionDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CheckBoxFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CheckBoxFieldDataHelperService.java
new file mode 100644
index 000000000..6557c490a
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CheckBoxFieldDataHelperService.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.CheckBoxDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.CheckBoxDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.CheckBoxData;
+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 CheckBoxFieldDataHelperService extends BaseFieldDataHelperService<CheckBoxData, CheckBoxDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public CheckBoxFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.CHECK_BOX;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new CheckBoxDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new CheckBoxData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return CheckBoxDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return CheckBoxData.class;
+	}
+
+	@Override
+	public List<CheckBoxData> buildInternal(FieldSet fieldSet, List<CheckBoxDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(CheckBoxDataBuilder.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
new file mode 100644
index 000000000..9c7b329a7
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ComboBoxFieldDataHelperService.java
@@ -0,0 +1,96 @@
+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/CurrencyFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CurrencyFieldDataHelperService.java
new file mode 100644
index 000000000..aa53433a3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/CurrencyFieldDataHelperService.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.CurrencyDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.CurrencyDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.CurrencyData;
+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 CurrencyFieldDataHelperService extends BaseFieldDataHelperService<CurrencyData, CurrencyDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public CurrencyFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.CURRENCY;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new CurrencyDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new CurrencyData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return CurrencyDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return CurrencyData.class;
+	}
+
+	@Override
+	public List<CurrencyData> buildInternal(FieldSet fieldSet, List<CurrencyDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(CurrencyDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DataRepositoryFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DataRepositoryFieldDataHelperService.java
new file mode 100644
index 000000000..6e9f228a2
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DataRepositoryFieldDataHelperService.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.DataRepositoryDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DataRepositoryDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DataRepositoryData;
+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 DataRepositoryFieldDataHelperService extends BaseFieldDataHelperService<DataRepositoryData, DataRepositoryDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public DataRepositoryFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.DATA_REPOSITORIES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new DataRepositoryDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new DataRepositoryData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return DataRepositoryDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return DataRepositoryData.class;
+	}
+
+	@Override
+	public List<DataRepositoryData> buildInternal(FieldSet fieldSet, List<DataRepositoryDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(DataRepositoryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetIdentifierFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetIdentifierFieldDataHelperService.java
new file mode 100644
index 000000000..12ce69dd5
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatasetIdentifierFieldDataHelperService.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.DatasetIdentifierDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DatasetIdentifierDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatasetIdentifierData;
+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 DatasetIdentifierFieldDataHelperService extends BaseFieldDataHelperService<DatasetIdentifierData, DatasetIdentifierDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public DatasetIdentifierFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.DATASET_IDENTIFIER;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new DatasetIdentifierDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new DatasetIdentifierData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return DatasetIdentifierDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return DatasetIdentifierData.class;
+	}
+
+	@Override
+	public List<DatasetIdentifierData> buildInternal(FieldSet fieldSet, List<DatasetIdentifierDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(DatasetIdentifierDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatePickerFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatePickerFieldDataHelperService.java
new file mode 100644
index 000000000..a3478347f
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/DatePickerFieldDataHelperService.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.DatePickerDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.DatePickerDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.DatePickerData;
+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 DatePickerFieldDataHelperService extends BaseFieldDataHelperService<DatePickerData, DatePickerDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public DatePickerFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.DATE_PICKER;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new DatePickerDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new DatePickerData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return DatePickerDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return DatePickerData.class;
+	}
+
+	@Override
+	public List<DatePickerData> buildInternal(FieldSet fieldSet, List<DatePickerDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(DatePickerDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.java
new file mode 100644
index 000000000..eb8c816a7
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ExternalDatasetFieldDataHelperService.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.ExternalDatasetDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ExternalDatasetDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ExternalDatasetData;
+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 ExternalDatasetFieldDataHelperService extends BaseFieldDataHelperService<ExternalDatasetData, ExternalDatasetDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public ExternalDatasetFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.EXTERNAL_DATASETS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new ExternalDatasetDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new ExternalDatasetData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return ExternalDatasetDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return ExternalDatasetData.class;
+	}
+
+	@Override
+	public List<ExternalDatasetData> buildInternal(FieldSet fieldSet, List<ExternalDatasetDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(ExternalDatasetDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java
new file mode 100644
index 000000000..25aabb2cc
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperService.java
@@ -0,0 +1,23 @@
+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.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import gr.cite.tools.fieldset.FieldSet;
+
+import java.util.EnumSet;
+import java.util.List;
+
+public interface FieldDataHelperService {
+	FieldType getFormType();
+	String getSubType();
+	BaseFieldDataEntity<?> newDataInstance();
+	BaseFieldData newModelInstance();
+	Class<?> getDataClass();
+	Class<?> getModelClass();
+	List<BaseFieldData> build(gr.cite.tools.fieldset.FieldSet fieldSet, List<BaseFieldDataEntity<?>> datas, EnumSet<AuthorizationFlags> authorizationFlags);
+	BaseFieldData buildOne(FieldSet fieldSet, BaseFieldDataEntity<?> data, EnumSet<AuthorizationFlags> authorizationFlags);
+	boolean requireSubType();
+	FieldDataHelperService setSubType(String data);
+}
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
new file mode 100644
index 000000000..636ef2023
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FieldDataHelperServiceProvider.java
@@ -0,0 +1,119 @@
+package eu.eudat.service.fielddatahelper;
+
+import eu.eudat.commons.enums.FieldType;
+import gr.cite.tools.data.builder.Builder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+
+public class FieldDataHelperServiceProvider {
+
+	@Autowired
+	private ApplicationContext applicationContext;
+	
+	public  FieldDataHelperService get(FieldType type){
+		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;
+			}
+			case RADIO_BOX:  {
+				item = this.applicationContext.getBean(RadioBoxFieldDataHelperService.class);
+				break;
+			}
+			case CHECK_BOX:  {
+				item = this.applicationContext.getBean(CheckBoxFieldDataHelperService.class);
+				break;
+			}
+			case FREE_TEXT:  {
+				item = this.applicationContext.getBean(FreeTextFieldDataHelperService.class);
+				break;
+			}
+			case TEXT_AREA:  {
+				item = this.applicationContext.getBean(TextAreaFieldDataHelperService.class);
+				break;
+			}
+			case RICH_TEXT_AREA:  {
+				item = this.applicationContext.getBean(RichTextAreaDataFieldDataHelperService.class);
+				break;
+			}
+			case UPLOAD:  {
+				item = this.applicationContext.getBean(UploadFieldDataHelperService.class);
+				break;
+			}
+			case DATE_PICKER: {
+				item = this.applicationContext.getBean(DatePickerFieldDataHelperService.class);
+				break;
+			}
+			case EXTERNAL_DATASETS:  {
+				item = this.applicationContext.getBean(ExternalDatasetFieldDataHelperService.class);
+				break;
+			}
+			case DATA_REPOSITORIES: 
+			case PUB_REPOSITORIES:
+			case JOURNAL_REPOSITORIES:  {
+				item = this.applicationContext.getBean(DataRepositoryFieldDataHelperService.class);
+				break;
+			}
+			case TAXONOMIES:  {
+				item = this.applicationContext.getBean(TaxonomyFieldDataHelperService.class);
+				break;
+			}
+			case LICENSES:  {
+				item = this.applicationContext.getBean(LicenseFieldDataHelperService.class);
+				break;
+			}
+			case PUBLICATIONS:  {
+				item = this.applicationContext.getBean(PublicationFieldDataHelperService.class);
+				break;
+			}
+			case REGISTRIES:  {
+				item = this.applicationContext.getBean(RegistryFieldDataHelperService.class);
+				break;
+			}
+			case SERVICES:  {
+				item = this.applicationContext.getBean(ServiceFieldDataHelperService.class);
+				break;
+			}
+			case TAGS: {
+				item = this.applicationContext.getBean(TagFieldDataHelperService.class);
+				break;
+			}
+			case RESEARCHERS:  {
+				item = this.applicationContext.getBean(ResearcherFieldDataHelperService.class);
+				break;
+			}
+			case ORGANIZATIONS:  {
+				item = this.applicationContext.getBean(OrganizationFieldDataHelperService.class);
+				break;
+			}
+			case DATASET_IDENTIFIER:   {
+				item = this.applicationContext.getBean(DatasetIdentifierFieldDataHelperService.class);
+				break;
+			}
+			case CURRENCY:   {
+				item = this.applicationContext.getBean(CurrencyFieldDataHelperService.class);
+				break;
+			}
+			case VALIDATION:   {
+				item = this.applicationContext.getBean(ValidationFieldDataHelperService.class);
+				break;
+			}
+			default: throw new RuntimeException("unrecognized builder " + type.getValue());
+		}
+		if (item != null && item instanceof Builder) {
+			return item;
+		} else {
+			throw new RuntimeException("unrecognized builder " + type.getValue());
+		}
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FreeTextFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FreeTextFieldDataHelperService.java
new file mode 100644
index 000000000..2cf05bec2
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/FreeTextFieldDataHelperService.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.FreeTextDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.FreeTextDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.FreeTextData;
+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 FreeTextFieldDataHelperService extends BaseFieldDataHelperService<FreeTextData, FreeTextDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public FreeTextFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.FREE_TEXT;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new FreeTextDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new FreeTextData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return FreeTextDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return FreeTextData.class;
+	}
+
+	@Override
+	public List<FreeTextData> buildInternal(FieldSet fieldSet, List<FreeTextDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(FreeTextDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
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
new file mode 100644
index 000000000..a6b9347f6
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/InternalDmpBaseFieldDataHelperService.java
@@ -0,0 +1,100 @@
+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/LicenseFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LicenseFieldDataHelperService.java
new file mode 100644
index 000000000..9626863a0
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/LicenseFieldDataHelperService.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.LicenseDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.LicenseDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.LicenseData;
+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 LicenseFieldDataHelperService extends BaseFieldDataHelperService<LicenseData, LicenseDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public LicenseFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.LICENSES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new LicenseDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new LicenseData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return LicenseDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return LicenseData.class;
+	}
+
+	@Override
+	public List<LicenseData> buildInternal(FieldSet fieldSet, List<LicenseDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(LicenseDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/OrganizationFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/OrganizationFieldDataHelperService.java
new file mode 100644
index 000000000..284311447
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/OrganizationFieldDataHelperService.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.OrganizationDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.OrganizationDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.OrganizationData;
+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 OrganizationFieldDataHelperService extends BaseFieldDataHelperService<OrganizationData, OrganizationDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public OrganizationFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.ORGANIZATIONS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new OrganizationDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new OrganizationData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return OrganizationDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return OrganizationData.class;
+	}
+
+	@Override
+	public List<OrganizationData> buildInternal(FieldSet fieldSet, List<OrganizationDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(OrganizationDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationFieldDataHelperService.java
new file mode 100644
index 000000000..590dadb19
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/PublicationFieldDataHelperService.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.PublicationDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.PublicationDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.PublicationData;
+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 PublicationFieldDataHelperService extends BaseFieldDataHelperService<PublicationData, PublicationDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public PublicationFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.PUBLICATIONS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new PublicationDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new PublicationData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return PublicationDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return PublicationData.class;
+	}
+
+	@Override
+	public List<PublicationData> buildInternal(FieldSet fieldSet, List<PublicationDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(PublicationDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.java
new file mode 100644
index 000000000..6d1cfd555
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RadioBoxFieldDataHelperService.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.RadioBoxDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.RadioBoxDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RadioBoxData;
+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 RadioBoxFieldDataHelperService extends BaseFieldDataHelperService<RadioBoxData, RadioBoxDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public RadioBoxFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.RADIO_BOX;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new RadioBoxDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new RadioBoxData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return RadioBoxDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return RadioBoxData.class;
+	}
+
+	@Override
+	public List<RadioBoxData> buildInternal(FieldSet fieldSet, List<RadioBoxDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(RadioBoxDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RegistryFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RegistryFieldDataHelperService.java
new file mode 100644
index 000000000..bcaa040d4
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RegistryFieldDataHelperService.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.RegistryDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.RegistryDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RegistryData;
+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 RegistryFieldDataHelperService extends BaseFieldDataHelperService<RegistryData, RegistryDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public RegistryFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.REGISTRIES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new RegistryDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new RegistryData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return RegistryDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return RegistryData.class;
+	}
+
+	@Override
+	public List<RegistryData> buildInternal(FieldSet fieldSet, List<RegistryDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(RegistryDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherFieldDataHelperService.java
new file mode 100644
index 000000000..82d159825
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ResearcherFieldDataHelperService.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.ResearcherDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ResearcherDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ResearcherData;
+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 ResearcherFieldDataHelperService extends BaseFieldDataHelperService<ResearcherData, ResearcherDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public ResearcherFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.RESEARCHERS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new ResearcherDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new ResearcherData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return ResearcherDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return ResearcherData.class;
+	}
+
+	@Override
+	public List<ResearcherData> buildInternal(FieldSet fieldSet, List<ResearcherDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(ResearcherDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RichTextAreaDataFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RichTextAreaDataFieldDataHelperService.java
new file mode 100644
index 000000000..df1fe0f42
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/RichTextAreaDataFieldDataHelperService.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.RichTextAreaDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.RichTextAreaDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.RichTextAreaData;
+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 RichTextAreaDataFieldDataHelperService extends BaseFieldDataHelperService<RichTextAreaData, RichTextAreaDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public RichTextAreaDataFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.RICH_TEXT_AREA;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new RichTextAreaDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new RichTextAreaData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return RichTextAreaDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return RichTextAreaData.class;
+	}
+
+	@Override
+	public List<RichTextAreaData> buildInternal(FieldSet fieldSet, List<RichTextAreaDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(RichTextAreaDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ServiceFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ServiceFieldDataHelperService.java
new file mode 100644
index 000000000..62705b874
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ServiceFieldDataHelperService.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.ServiceDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ServiceDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ServiceData;
+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 ServiceFieldDataHelperService extends BaseFieldDataHelperService<ServiceData, ServiceDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public ServiceFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.SERVICES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new ServiceDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new ServiceData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return ServiceDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return ServiceData.class;
+	}
+
+	@Override
+	public List<ServiceData> buildInternal(FieldSet fieldSet, List<ServiceDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(ServiceDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TagFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TagFieldDataHelperService.java
new file mode 100644
index 000000000..08d91fdf0
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TagFieldDataHelperService.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.TagDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.TagDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.TagData;
+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 TagFieldDataHelperService extends BaseFieldDataHelperService<TagData, TagDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public TagFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.TAGS;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new TagDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new TagData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return TagDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return TagData.class;
+	}
+
+	@Override
+	public List<TagData> buildInternal(FieldSet fieldSet, List<TagDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(TagDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TaxonomyFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TaxonomyFieldDataHelperService.java
new file mode 100644
index 000000000..9b62cb647
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TaxonomyFieldDataHelperService.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.TaxonomyDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.TaxonomyDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.TaxonomyData;
+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 TaxonomyFieldDataHelperService extends BaseFieldDataHelperService<TaxonomyData, TaxonomyDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public TaxonomyFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.TAXONOMIES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new TaxonomyDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new TaxonomyData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return TaxonomyDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return TaxonomyData.class;
+	}
+
+	@Override
+	public List<TaxonomyData> buildInternal(FieldSet fieldSet, List<TaxonomyDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(TaxonomyDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TextAreaFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TextAreaFieldDataHelperService.java
new file mode 100644
index 000000000..a54268067
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/TextAreaFieldDataHelperService.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.TextAreaDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.TextAreaDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.TextAreaData;
+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 TextAreaFieldDataHelperService extends BaseFieldDataHelperService<TextAreaData, TextAreaDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public TextAreaFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.TEXT_AREA;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new TextAreaDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new TextAreaData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return TextAreaDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return TextAreaData.class;
+	}
+
+	@Override
+	public List<TextAreaData> buildInternal(FieldSet fieldSet, List<TextAreaDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(TextAreaDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.java
new file mode 100644
index 000000000..857930b37
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/UploadFieldDataHelperService.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.UploadDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.UploadDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.UploadData;
+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 UploadFieldDataHelperService extends BaseFieldDataHelperService<UploadData, UploadDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public UploadFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.UPLOAD;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new UploadDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new UploadData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return UploadDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return UploadData.class;
+	}
+
+	@Override
+	public List<UploadData> buildInternal(FieldSet fieldSet, List<UploadDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(UploadDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ValidationFieldDataHelperService.java b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ValidationFieldDataHelperService.java
new file mode 100644
index 000000000..9186036e3
--- /dev/null
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/fielddatahelper/ValidationFieldDataHelperService.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.ValidationDataEntity;
+import eu.eudat.model.builder.descriptiontemplatedefinition.fielddata.ValidationDataBuilder;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.BaseFieldData;
+import eu.eudat.model.descriptiontemplatedefinition.fielddata.ValidationData;
+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 ValidationFieldDataHelperService extends BaseFieldDataHelperService<ValidationData, ValidationDataEntity> {
+	
+	private final BuilderFactory builderFactory;
+
+	public ValidationFieldDataHelperService(BuilderFactory builderFactory) {
+		this.builderFactory = builderFactory;
+	}
+
+
+	@Override
+	public FieldType getFormType() {
+		return FieldType.LICENSES;
+	}
+
+	@Override
+	public BaseFieldDataEntity<?> newDataInstance() {
+		return new ValidationDataEntity();
+	}
+
+	@Override
+	public BaseFieldData newModelInstance() {
+		return new ValidationData();
+	}
+
+	@Override
+	public Class<?> getDataClass() {
+		return ValidationDataEntity.class;
+	}
+	@Override
+	public Class<?> getModelClass() {
+		return ValidationData.class;
+	}
+
+	@Override
+	public List<ValidationData> buildInternal(FieldSet fieldSet, List<ValidationDataEntity> datas, EnumSet<AuthorizationFlags> authorizationFlags){
+		return this.builderFactory.builder(ValidationDataBuilder.class).authorize(authorizationFlags).build(fieldSet, datas);
+	}
+}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
index e42bb5e86..17f3ce63a 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
@@ -1,13 +1,13 @@
 package eu.eudat.data.dao.criteria;
 
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
-public class DatasetProfileCriteria extends Criteria<DescriptionTemplate> {
+public class DatasetProfileCriteria extends Criteria<DescriptionTemplateEntity> {
 
     public enum DatasetProfileFilter {
         DMPs((short) 0), Datasets((short) 1);
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java
index 3f5b0940f..90fd4f3c5 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java
@@ -1,11 +1,11 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 
 import java.util.UUID;
 
 
-public class DatasetProfileWizardCriteria extends Criteria<DescriptionTemplate> {
+public class DatasetProfileWizardCriteria extends Criteria<DescriptionTemplateEntity> {
     private UUID id;
 
     public UUID getId() {
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java
index a4873dedd..d2d120c0f 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java
@@ -3,22 +3,22 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.DescriptionTemplateTypeEntity;
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.queryable.QueryableList;
 
 import javax.management.InvalidApplicationException;
 import java.util.List;
 import java.util.UUID;
 
-public interface DatasetProfileDao extends DatabaseAccessLayer<DescriptionTemplate, UUID> {
+public interface DatasetProfileDao extends DatabaseAccessLayer<DescriptionTemplateEntity, UUID> {
 
-    QueryableList<DescriptionTemplate> getWithCriteria(DatasetProfileCriteria criteria);
+    QueryableList<DescriptionTemplateEntity> getWithCriteria(DatasetProfileCriteria criteria);
 
-    QueryableList<DescriptionTemplate> getAll();
+    QueryableList<DescriptionTemplateEntity> getAll();
 
-    QueryableList<DescriptionTemplate> getAuthenticated(QueryableList<DescriptionTemplate> query, UUID principal, List<Integer> roles);
+    QueryableList<DescriptionTemplateEntity> getAuthenticated(QueryableList<DescriptionTemplateEntity> query, UUID principal, List<Integer> roles);
 
-    List<DescriptionTemplate> getAllIds() throws InvalidApplicationException;
+    List<DescriptionTemplateEntity> getAllIds() throws InvalidApplicationException;
 
     Long countWithType(DescriptionTemplateTypeEntity type) throws InvalidApplicationException;
 
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
index 234e0ed7b..ced5e5e43 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
@@ -1,10 +1,12 @@
 package eu.eudat.data.dao.entities;
 
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.enums.IsActive;
 import eu.eudat.data.DescriptionTemplateTypeEntity;
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
@@ -23,16 +25,16 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 @Component("datasetProfileDao")
-public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> implements DatasetProfileDao {
+public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplateEntity> implements DatasetProfileDao {
 
     @Autowired
-    public DatasetProfileDaoImpl(DatabaseService<DescriptionTemplate> databaseService) {
+    public DatasetProfileDaoImpl(DatabaseService<DescriptionTemplateEntity> databaseService) {
         super(databaseService);
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> getWithCriteria(DatasetProfileCriteria criteria) {
-        QueryableList<DescriptionTemplate> query = getDatabaseService().getQueryable(DescriptionTemplate.class);
+    public QueryableList<DescriptionTemplateEntity> getWithCriteria(DatasetProfileCriteria criteria) {
+        QueryableList<DescriptionTemplateEntity> query = getDatabaseService().getQueryable(DescriptionTemplateEntity.class);
         if (criteria.getLike() != null && !criteria.getLike().isEmpty())
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"));
         if (!criteria.getAllVersions())
@@ -65,58 +67,58 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> i
             query.where(((builder, root) -> root.get("id").in(criteria.getIds())));
         }
         if (criteria.getFinalized()) {
-            query.where(((builder, root) -> builder.equal(root.get("status"), DescriptionTemplate.Status.FINALIZED.getValue())));
+            query.where(((builder, root) -> builder.equal(root.get("status"), DescriptionTemplateStatus.Finalized)));
         } else {
-            query.where(((builder, root) -> builder.notEqual(root.get("status"), DescriptionTemplate.Status.DELETED.getValue())));
+            query.where(((builder, root) -> builder.notEqual(root.get("isActive"), IsActive.Inactive)));
         }
         if (criteria.getPeriodStart() != null)
-            query.where((builder, root) -> builder.greaterThanOrEqualTo(root.get("created"), criteria.getPeriodStart()));
+            query.where((builder, root) -> builder.greaterThanOrEqualTo(root.get("createdAt"), criteria.getPeriodStart()));
         return query;
     }
 
     @Override
-    public DescriptionTemplate createOrUpdate(DescriptionTemplate item) {
-        return this.getDatabaseService().createOrUpdate(item, DescriptionTemplate.class);
+    public DescriptionTemplateEntity createOrUpdate(DescriptionTemplateEntity item) {
+        return this.getDatabaseService().createOrUpdate(item, DescriptionTemplateEntity.class);
     }
 
     @Override
-    public DescriptionTemplate find(UUID id) throws InvalidApplicationException {
-        return getDatabaseService().getQueryable(DescriptionTemplate.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle();
+    public DescriptionTemplateEntity find(UUID id) throws InvalidApplicationException {
+        return getDatabaseService().getQueryable(DescriptionTemplateEntity.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle();
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> getAll() {
-        return getDatabaseService().getQueryable(DescriptionTemplate.class);
+    public QueryableList<DescriptionTemplateEntity> getAll() {
+        return getDatabaseService().getQueryable(DescriptionTemplateEntity.class);
     }
 
     @Override
-    public List<DescriptionTemplate> getAllIds() throws InvalidApplicationException {
-        return getDatabaseService().getQueryable(DescriptionTemplate.class).withFields(Collections.singletonList("id")).toList();
+    public List<DescriptionTemplateEntity> getAllIds() throws InvalidApplicationException {
+        return getDatabaseService().getQueryable(DescriptionTemplateEntity.class).withFields(Collections.singletonList("id")).toList();
     }
 
     @Override
-    public void delete(DescriptionTemplate item) {
+    public void delete(DescriptionTemplateEntity item) {
         this.getDatabaseService().delete(item);
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> asQueryable() {
-        return this.getDatabaseService().getQueryable(DescriptionTemplate.class);
+    public QueryableList<DescriptionTemplateEntity> asQueryable() {
+        return this.getDatabaseService().getQueryable(DescriptionTemplateEntity.class);
     }
 
     @Async
     @Override
-    public CompletableFuture<DescriptionTemplate> createOrUpdateAsync(DescriptionTemplate item) {
+    public CompletableFuture<DescriptionTemplateEntity> createOrUpdateAsync(DescriptionTemplateEntity item) {
         return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
     }
 
     @Override
-    public DescriptionTemplate find(UUID id, String hint) {
+    public DescriptionTemplateEntity find(UUID id, String hint) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> getAuthenticated(QueryableList<DescriptionTemplate> query, UUID principal, List<Integer> roles) {
+    public QueryableList<DescriptionTemplateEntity> getAuthenticated(QueryableList<DescriptionTemplateEntity> query, UUID principal, List<Integer> roles) {
         if (roles != null && !roles.isEmpty()) {
             query.where((builder, root) -> {
                 Join userJoin = root.join("users", JoinType.LEFT);
@@ -131,6 +133,6 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> i
 
     @Override
     public Long countWithType(DescriptionTemplateTypeEntity type) throws InvalidApplicationException {
-        return this.getDatabaseService().getQueryable(DescriptionTemplate.class).where((builder, root) -> builder.equal(root.get("type"), type)).count();
+        return this.getDatabaseService().getQueryable(DescriptionTemplateEntity.class).where((builder, root) -> builder.equal(root.get("type"), type)).count();
     }
 }
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java
index 59fa5ad31..bceb05e6f 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java
@@ -1,24 +1,24 @@
 package eu.eudat.data.query.items.item.datasetprofile;
 
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.query.PaginationService;
 import eu.eudat.data.query.definition.TableQuery;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;
 
-public class DatasetProfileAutocompleteRequest extends TableQuery<DatasetProfileCriteria, DescriptionTemplate, UUID> {
+public class DatasetProfileAutocompleteRequest extends TableQuery<DatasetProfileCriteria, DescriptionTemplateEntity, UUID> {
     @Override
-    public QueryableList<DescriptionTemplate> applyCriteria() {
-        QueryableList<DescriptionTemplate> query = this.getQuery();
+    public QueryableList<DescriptionTemplateEntity> applyCriteria() {
+        QueryableList<DescriptionTemplateEntity> query = this.getQuery();
         if (this.getCriteria().getLike() != null && !this.getCriteria().getLike().isEmpty())
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + this.getCriteria().getLike().toUpperCase() + "%"));
         return query;
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> applyPaging(QueryableList<DescriptionTemplate> items) {
+    public QueryableList<DescriptionTemplateEntity> applyPaging(QueryableList<DescriptionTemplateEntity> items) {
         return PaginationService.applyPaging(items, this);
     }
 }
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java
index 24c7e5ae7..ea169920f 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java
@@ -1,13 +1,13 @@
 package eu.eudat.data.query.items.item.datasetprofile;
 
 import eu.eudat.data.dao.criteria.DatasetProfileWizardCriteria;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.query.definition.Query;
 import eu.eudat.queryable.QueryableList;
 
-public class DatasetProfileWizardAutocompleteRequest extends Query<DatasetProfileWizardCriteria, DescriptionTemplate> {
+public class DatasetProfileWizardAutocompleteRequest extends Query<DatasetProfileWizardCriteria, DescriptionTemplateEntity> {
     @Override
-    public QueryableList<DescriptionTemplate> applyCriteria() {
+    public QueryableList<DescriptionTemplateEntity> applyCriteria() {
         return null;
     }
 }
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java
index 9bf4639db..044d7fb1c 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java
@@ -1,23 +1,23 @@
 package eu.eudat.data.query.items.table.datasetprofile;
 
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.query.definition.TableQuery;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;
 
-public class DatasetProfileTableRequestItem extends TableQuery<DatasetProfileCriteria, DescriptionTemplate, UUID> {
+public class DatasetProfileTableRequestItem extends TableQuery<DatasetProfileCriteria, DescriptionTemplateEntity, UUID> {
     @Override
-    public QueryableList<DescriptionTemplate> applyCriteria() {
-        QueryableList<DescriptionTemplate> query = this.getQuery();
+    public QueryableList<DescriptionTemplateEntity> applyCriteria() {
+        QueryableList<DescriptionTemplateEntity> query = this.getQuery();
         if (this.getCriteria().getLike() != null && !this.getCriteria().getLike().isEmpty())
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + this.getCriteria().getLike().toUpperCase() + "%"));
         return query;
     }
 
     @Override
-    public QueryableList<DescriptionTemplate> applyPaging(QueryableList<DescriptionTemplate> items) {
+    public QueryableList<DescriptionTemplateEntity> applyPaging(QueryableList<DescriptionTemplateEntity> items) {
         return null;
     }
 }
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 cc1a64aff..a264f30fc 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
@@ -1,8 +1,9 @@
 package eu.eudat.controllers;
 
 import eu.eudat.authorization.Permission;
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
 import eu.eudat.commons.scope.user.UserScope;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.UserDatasetProfile;
 import eu.eudat.data.old.UserInfo;
 import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem;
@@ -19,10 +20,12 @@ import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
 import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.models.data.helpers.responses.ResponseItem;
 import eu.eudat.models.data.user.composite.PagedDatasetProfile;
+import eu.eudat.query.DescriptionTemplateTypeQuery;
 import eu.eudat.service.descriptiontemplatetype.DescriptionTemplateTypeService;
 import eu.eudat.types.ApiMessageCode;
 import eu.eudat.types.MetricNames;
 import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.query.QueryFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -48,11 +51,12 @@ public class Admin extends BaseController {
 	private final MetricsManager metricsManager;
 	private final AuthorizationService authorizationService;
 	private final UserScope userScope;
+	private final QueryFactory queryFactory;
 
 	private final DescriptionTemplateTypeService descriptionTemplateTypeService;
 
 	@Autowired
-	public Admin(ApiContext apiContext, DatasetProfileManager datasetProfileManager, UserManager userManager/*, Logger logger*/, ConfigLoader configLoader, MetricsManager metricsManager, AuthorizationService authorizationService, UserScope userScope, DescriptionTemplateTypeService descriptionTemplateTypeService) {
+	public Admin(ApiContext apiContext, DatasetProfileManager datasetProfileManager, UserManager userManager/*, Logger logger*/, ConfigLoader configLoader, MetricsManager metricsManager, AuthorizationService authorizationService, UserScope userScope, QueryFactory queryFactory, DescriptionTemplateTypeService descriptionTemplateTypeService) {
 		super(apiContext);
 		this.datasetProfileManager = datasetProfileManager;
 		this.userManager = userManager;
@@ -60,6 +64,7 @@ public class Admin extends BaseController {
 		this.metricsManager = metricsManager;
 		this.authorizationService = authorizationService;
 		this.userScope = userScope;
+		this.queryFactory = queryFactory;
 		this.descriptionTemplateTypeService = descriptionTemplateTypeService;
 	}
 
@@ -70,22 +75,22 @@ public class Admin extends BaseController {
 		
 		//this.getLoggerService().info(principal, "Admin Added Dataset Profile");
 		DatasetProfile shortenProfile = profile.toShort();
-		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext(), descriptionTemplateTypeService);
+		DescriptionTemplateEntity modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext(), descriptionTemplateTypeService);
 //		modelDefinition.setType(getApiContext().getOperationsContext().getDatabaseRepository().getDescriptionTemplateTypeDao().findFromName(profile.getType()));
 //TODO: dtziotzios		modelDefinition.setType(descriptionTemplateTypeService.getEntityByName(profile.getType()));
 		modelDefinition.setGroupId(UUID.randomUUID());
 		modelDefinition.setVersion((short) 0);
 
-		DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
+		DescriptionTemplateEntity descriptionTemplateEntity = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
 		UserDatasetProfile userDatasetProfile = new UserDatasetProfile();
-		userDatasetProfile.setDatasetProfile(descriptionTemplate);
+		userDatasetProfile.setDatasetProfile(descriptionTemplateEntity);
 		UserInfo userInfo = getApiContext().getOperationsContext().getDatabaseRepository().getUserInfoDao().find(this.userScope.getUserId());
 		userDatasetProfile.setUser(userInfo);
 		userDatasetProfile.setRole(0);
 		getApiContext().getOperationsContext().getDatabaseRepository().getUserDatasetProfileDao().createOrUpdate(userDatasetProfile);
-		datasetProfileManager.storeDatasetProfileUsers(descriptionTemplate, profile);
+		datasetProfileManager.storeDatasetProfileUsers(descriptionTemplateEntity, profile);
 
-		metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricsManager.datasetTemplateStatus.get(descriptionTemplate.getStatus()) );
+		metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricsManager.datasetTemplateStatus.get(descriptionTemplateEntity.getStatus()) );
 		return ResponseEntity.status(HttpStatus.OK).body(modelDefinition.getId());
 	}
 
@@ -95,17 +100,17 @@ public class Admin extends BaseController {
 		this.authorizationService.authorizeForce(Permission.AdminRole, Permission.DatasetProfileManagerRole);
 		
 		DatasetProfile shortenProfile = profile.toShort();
-		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext(), descriptionTemplateTypeService);
-		DescriptionTemplate datasetprofile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+		DescriptionTemplateEntity modelDefinition = AdminManager.generateViewStyleDefinition(shortenProfile, getApiContext(), descriptionTemplateTypeService);
+		DescriptionTemplateEntity datasetprofile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
 		datasetprofile.setDefinition(modelDefinition.getDefinition());
-		Short oldStatus = datasetprofile.getStatus();
+		DescriptionTemplateStatus oldStatus = datasetprofile.getStatus();
 		datasetprofile.setStatus(modelDefinition.getStatus());
 		datasetprofile.setLabel(modelDefinition.getLabel());
 		datasetprofile.setDescription(modelDefinition.getDescription());
 		datasetprofile.setLanguage(modelDefinition.getLanguage());
-		DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(datasetprofile);
-		datasetProfileManager.storeDatasetProfileUsers(descriptionTemplate, profile);
-		if (descriptionTemplate.getStatus() == 1 && oldStatus == 0) {
+		DescriptionTemplateEntity descriptionTemplateEntity = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(datasetprofile);
+		datasetProfileManager.storeDatasetProfileUsers(descriptionTemplateEntity, profile);
+		if (DescriptionTemplateStatus.Finalized.equals(descriptionTemplateEntity.getStatus()) && DescriptionTemplateStatus.Draft.equals(oldStatus)) {
 			metricsManager.increaseValue(MetricNames.DATASET_TEMPLATE, 1, MetricNames.ACTIVE);
 		}
 		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<UUID>().status(ApiMessageCode.NO_MESSAGE));
@@ -117,7 +122,7 @@ public class Admin extends BaseController {
 		this.authorizationService.authorizeForce(Permission.AdminRole, Permission.DatasetProfileManagerRole);
 		
 		try {
-			DescriptionTemplate modelDefinition = this.datasetProfileManager.createNewVersionDatasetProfile(id, profile);
+			DescriptionTemplateEntity modelDefinition = this.datasetProfileManager.createNewVersionDatasetProfile(id, profile);
 			return ResponseEntity.status(HttpStatus.OK).body(modelDefinition.getId());
 		} catch (DatasetProfileNewVersionException exception) {
 			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.ERROR_MESSAGE).message(exception.getMessage()));
@@ -146,7 +151,7 @@ public class Admin extends BaseController {
 	public ResponseEntity<ResponseItem<PagedDatasetProfile>> getPreview(@RequestBody DatasetProfile profile) throws Exception {
 		this.authorizationService.authorizeForce(Permission.AdminRole, Permission.DatasetProfileManagerRole);
 		
-		DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext(), descriptionTemplateTypeService);
+		DescriptionTemplateEntity modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext(), descriptionTemplateTypeService);
 		eu.eudat.models.data.user.composite.DatasetProfile datasetProfile = userManager.generateDatasetProfileModel(modelDefinition);
 		PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
 		pagedDatasetProfile.buildPagedDatasetProfile(datasetProfile);
@@ -170,7 +175,7 @@ public class Admin extends BaseController {
 		this.authorizationService.authorizeForce(Permission.AdminRole, Permission.DatasetProfileManagerRole);
 
 		try {
-			DescriptionTemplate ret = AdminManager.inactivate(this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao(), this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao(), id);
+			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()));
@@ -183,12 +188,12 @@ public class Admin extends BaseController {
 		this.authorizationService.authorizeForce(Permission.AdminRole, Permission.DatasetProfileManagerRole);
 
 		if (contentType.equals("application/xml")) {
-			DescriptionTemplate profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+			DescriptionTemplateEntity profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
 			eu.eudat.models.data.user.composite.DatasetProfile datasetProfile = userManager.generateDatasetProfileModel(profile);
-			datasetProfile.setStatus(profile.getStatus());
+			datasetProfile.setStatus(profile.getStatus().getValue());
 			datasetProfile.setDescription(profile.getDescription());
 			datasetProfile.setLanguage(profile.getLanguage());
-			datasetProfile.setType(profile.getType().getName());
+			datasetProfile.setType(this.queryFactory.query(DescriptionTemplateTypeQuery.class).ids(profile.getType()).first().getName());
 			return this.datasetProfileManager.getDocument(datasetProfile, profile.getLabel());
 		} else {
 			return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().status(ApiMessageCode.ERROR_MESSAGE).message("NOT AUTHORIZE"));
@@ -202,12 +207,12 @@ public class Admin extends BaseController {
 
 		eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.DatasetProfile datasetProfileModel = this.datasetProfileManager.createDatasetProfileFromXml(file);
 		eu.eudat.models.data.admin.composite.DatasetProfile datasetProfileEntity = datasetProfileModel.toAdminCompositeModel(file.getOriginalFilename());
-		DescriptionTemplate modelDefinition;
+		DescriptionTemplateEntity modelDefinition;
 		if (id == null) {
 			modelDefinition = AdminManager.generateViewStyleDefinition(datasetProfileEntity, getApiContext(), descriptionTemplateTypeService);
-			DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
+			DescriptionTemplateEntity descriptionTemplateEntity = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
 			UserDatasetProfile userDatasetProfile = new UserDatasetProfile();
-			userDatasetProfile.setDatasetProfile(descriptionTemplate);
+			userDatasetProfile.setDatasetProfile(descriptionTemplateEntity);
 			UserInfo userInfo = getApiContext().getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userScope.getUserId());
 			userDatasetProfile.setUser(userInfo);
 			userDatasetProfile.setRole(0);
@@ -215,7 +220,7 @@ public class Admin extends BaseController {
 		} else {
 			modelDefinition = datasetProfileManager.createNewVersionDatasetProfile(id, datasetProfileEntity);
 		}
-		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DescriptionTemplate>>()
+		return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<DescriptionTemplateEntity>>()
 				.status(ApiMessageCode.SUCCESS_MESSAGE).message(""));
 	}
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java
index 5af490513..09f12b11f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java
@@ -1,12 +1,13 @@
 package eu.eudat.controllers;
 
 import eu.eudat.authorization.Permission;
+import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
 import eu.eudat.data.dao.criteria.RequestItem;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.logic.managers.AdminManager;
 import eu.eudat.logic.managers.DatasetProfileManager;
 import eu.eudat.logic.services.ApiContext;
-import eu.eudat.models.data.components.commons.datafield.AutoCompleteData;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
 import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel;
 import eu.eudat.models.data.helpers.common.AutoCompleteLookupItem;
 import eu.eudat.models.data.helpers.common.AutoCompleteOptionsLookupItem;
@@ -23,8 +24,6 @@ import javax.xml.xpath.XPathExpressionException;
 import java.util.List;
 import java.util.UUID;
 
-import static eu.eudat.types.Authorities.ADMIN;
-
 @RestController
 @CrossOrigin
 @RequestMapping(value = {"/api"})
@@ -58,7 +57,7 @@ public class DatasetProfileController extends BaseController {
     public ResponseEntity<ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>> clone(@PathVariable String id) throws InvalidApplicationException {
         this.authorizationService.authorizeForce(Permission.AdminRole);
         
-        DescriptionTemplate profile = this.datasetProfileManager.clone(id);
+        DescriptionTemplateEntity profile = this.datasetProfileManager.clone(id);
         eu.eudat.models.data.admin.composite.DatasetProfile datasetprofile = AdminManager.generateDatasetProfileModel(profile);
         datasetprofile.setLabel(profile.getLabel() + " new ");
         return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<eu.eudat.models.data.admin.composite.DatasetProfile>().payload(datasetprofile));
@@ -66,16 +65,16 @@ public class DatasetProfileController extends BaseController {
 
     @RequestMapping(method = RequestMethod.POST, value = {"/search/autocomplete"}, consumes = "application/json", produces = "application/json")
     public ResponseEntity<Object> getDataForAutocomplete(@RequestBody RequestItem<AutoCompleteLookupItem> lookupItem) throws XPathExpressionException, InvalidApplicationException {
-        DescriptionTemplate descriptionTemplate = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(lookupItem.getCriteria().getProfileID()));
-        eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field modelfield = this.datasetProfileManager.queryForField(descriptionTemplate.getDefinition(), lookupItem.getCriteria().getFieldID());
-        AutoCompleteData data = (AutoCompleteData) modelfield.getData();
+        DescriptionTemplateEntity descriptionTemplateEntity = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(lookupItem.getCriteria().getProfileID()));
+        FieldEntity modelfield = this.datasetProfileManager.queryForField(descriptionTemplateEntity.getDefinition(), lookupItem.getCriteria().getFieldID());
+        AutoCompleteDataEntity data = (AutoCompleteDataEntity) modelfield.getData();
         List<ExternalAutocompleteFieldModel> items = this.datasetProfileManager.getAutocomplete(data, lookupItem.getCriteria().getLike());
         return ResponseEntity.status(HttpStatus.OK).body(items);
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/search/autocompleteOptions"}, consumes = "application/json", produces = "application/json")
     public ResponseEntity<Object> getDataForAutocompleteOptions(@RequestBody RequestItem<AutoCompleteOptionsLookupItem> lookupItem) {
-        AutoCompleteData data = new AutoCompleteData();
+        AutoCompleteDataEntity data = new AutoCompleteDataEntity();
         data.setAutoCompleteSingleDataList(lookupItem.getCriteria().getAutoCompleteSingleDataList());
         List<ExternalAutocompleteFieldModel> items = this.datasetProfileManager.getAutocomplete(data, lookupItem.getCriteria().getLike());
         return ResponseEntity.status(HttpStatus.OK).body(items);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java
index 8a7efed6c..9bdec08b6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java
@@ -3,7 +3,7 @@ package eu.eudat.controllers;
 import eu.eudat.authorization.Permission;
 import eu.eudat.commons.scope.user.UserScope;
 import eu.eudat.data.old.Dataset;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest;
 import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest;
 import eu.eudat.data.query.items.table.dataset.DatasetPublicTableRequest;
@@ -222,7 +222,7 @@ public class Datasets extends BaseController {
 
     @RequestMapping(method = RequestMethod.GET, value = {"/get/{id}"}, produces = "application/json")
     public ResponseEntity<ResponseItem<PagedDatasetProfile>> getSingle(@PathVariable String id) throws InvalidApplicationException {
-        DescriptionTemplate profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+        DescriptionTemplateEntity profile = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
         eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(profile);
         PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
         pagedDatasetProfile.buildPagedDatasetProfile(datasetprofile);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java
index 4c2da492e..a4ca63488 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java
@@ -3,7 +3,7 @@ package eu.eudat.controllers;
 
 import eu.eudat.authorization.Permission;
 import eu.eudat.commons.scope.user.UserScope;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.DMP;
 import eu.eudat.data.old.Funder;
 import eu.eudat.data.old.Project;
@@ -96,7 +96,7 @@ public class QuickWizardController extends BaseController {
         quickWizard.getDmp().setId(dmpEntity.getId());
         for (DatasetDescriptionQuickWizardModel dataset : quickWizard.getDatasets().getDatasetsList()) {
             DataManagementPlan dmp = quickWizard.getDmp().toDataDmp(grantEntity, projectEntity, userScope);
-            DescriptionTemplate profile = quickWizard.getDmp().getDatasetProfile();
+            DescriptionTemplateEntity profile = quickWizard.getDmp().getDatasetProfile();
             DatasetWizardModel datasetWizardModel = dataset.toDataModel(dmp, profile);
             this.datasetManager.createOrUpdate(datasetWizardModel);
         }
@@ -110,7 +110,7 @@ public class QuickWizardController extends BaseController {
         this.authorizationService.authorizeForce(Permission.AuthenticatedRole);
 
         for(DatasetDescriptionQuickWizardModel dataset : datasetCreateWizardModel.getDatasets().getDatasetsList()){
-            DescriptionTemplate profile = new DescriptionTemplate();
+            DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
             profile.setId(datasetCreateWizardModel.getDmpMeta().getDatasetProfile().getId());
             profile.setLabel(datasetCreateWizardModel.getDmpMeta().getDatasetProfile().getLabel());
             this.datasetManager.createOrUpdate(dataset.toDataModel(datasetCreateWizardModel.getDmpMeta().getDmp(), profile));
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
new file mode 100644
index 000000000..d0b81d22b
--- /dev/null
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DescriptionTemplateController.java
@@ -0,0 +1,125 @@
+package eu.eudat.controllers.v2;
+
+import eu.eudat.audit.AuditableAction;
+import eu.eudat.authorization.AuthorizationFlags;
+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.result.QueryResult;
+import eu.eudat.query.DescriptionTemplateQuery;
+import eu.eudat.query.lookup.DescriptionTemplateLookup;
+import gr.cite.tools.auditing.AuditService;
+import gr.cite.tools.data.builder.BuilderFactory;
+import gr.cite.tools.data.censor.CensorFactory;
+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.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import gr.cite.tools.logging.MapLogEntry;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.web.bind.annotation.*;
+
+import javax.management.InvalidApplicationException;
+import java.util.*;
+
+@RestController
+@RequestMapping(path = "api/description-template")
+public class DescriptionTemplateController {
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(DescriptionTemplateController.class));
+
+    private final BuilderFactory builderFactory;
+
+    private final AuditService auditService;
+
+//    private final DescriptionTemplateService descriptionTemplateTypeService;
+
+    private final CensorFactory censorFactory;
+
+    private final QueryFactory queryFactory;
+
+    private final MessageSource messageSource;
+
+    public DescriptionTemplateController(
+            BuilderFactory builderFactory,
+            AuditService auditService,
+//            DescriptionTemplateService descriptionTemplateTypeService,
+            CensorFactory censorFactory,
+            QueryFactory queryFactory,
+            MessageSource messageSource) {
+        this.builderFactory = builderFactory;
+        this.auditService = auditService;
+//        this.descriptionTemplateTypeService = descriptionTemplateTypeService;
+        this.censorFactory = censorFactory;
+        this.queryFactory = queryFactory;
+        this.messageSource = messageSource;
+    }
+
+    @PostMapping("query")
+    public QueryResult<DescriptionTemplate> Query(@RequestBody DescriptionTemplateLookup lookup) throws MyApplicationException, MyForbiddenException {
+        logger.debug("querying {}", DescriptionTemplate.class.getSimpleName());
+
+        this.censorFactory.censor(DescriptionTemplateCensor.class).censor(lookup.getProject(), null);
+
+        DescriptionTemplateQuery query = lookup.enrich(this.queryFactory).authorize(AuthorizationFlags.OwnerOrPermission);
+
+        List<DescriptionTemplateEntity> data = query.collectAs(lookup.getProject());
+        List<DescriptionTemplate> models = this.builderFactory.builder(DescriptionTemplateBuilder.class).authorize(AuthorizationFlags.OwnerOrPermission).build(lookup.getProject(), data);
+        long count = (lookup.getMetadata() != null && lookup.getMetadata().getCountAll()) ? query.count() : models.size();
+
+        this.auditService.track(AuditableAction.DescriptionTemplate_Query, "lookup", lookup);
+        //this.auditService.trackIdentity(AuditableAction.IdentityTracking_Action);
+
+        return new QueryResult<>(models, count);
+    }
+
+    @GetMapping("{id}")
+    public DescriptionTemplate Get(@PathVariable("id") UUID id, FieldSet fieldSet, Locale locale) throws MyApplicationException, MyForbiddenException, MyNotFoundException {
+        logger.debug(new MapLogEntry("retrieving" + DescriptionTemplate.class.getSimpleName()).And("id", id).And("fields", fieldSet));
+
+        this.censorFactory.censor(DescriptionTemplateCensor.class).censor(fieldSet, null);
+
+        DescriptionTemplateQuery query = this.queryFactory.query(DescriptionTemplateQuery.class).authorize(AuthorizationFlags.OwnerOrPermission).ids(id);
+        DescriptionTemplate model = this.builderFactory.builder(DescriptionTemplateBuilder.class).authorize(AuthorizationFlags.OwnerOrPermission).build(fieldSet, query.firstAs(fieldSet));
+        if (model == null)
+            throw new MyNotFoundException(messageSource.getMessage("General_ItemNotFound", new Object[]{id, DescriptionTemplate.class.getSimpleName()}, LocaleContextHolder.getLocale()));
+
+        this.auditService.track(AuditableAction.DescriptionTemplate_Lookup, Map.ofEntries(
+                new AbstractMap.SimpleEntry<String, Object>("id", id),
+                new AbstractMap.SimpleEntry<String, Object>("fields", fieldSet)
+        ));
+        //this.auditService.trackIdentity(AuditableAction.IdentityTracking_Action);
+
+        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);
+//    }
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java
index c87562c9d..1ba5ebc06 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/DmpBlueprintController.java
@@ -171,7 +171,7 @@ public class DmpBlueprintController {
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/xml/import"}) 
-    public DmpBlueprint importXml(@RequestParam("file") MultipartFile file, FieldSet fieldSet) throws IOException, JAXBException, InvalidApplicationException, ParserConfigurationException, TransformerException {
+    public DmpBlueprint importXml(@RequestParam("file") MultipartFile file, FieldSet fieldSet) throws IOException, JAXBException, InvalidApplicationException, ParserConfigurationException, TransformerException, InstantiationException, IllegalAccessException, SAXException {
         logger.debug(new MapLogEntry("clone" + DmpBlueprint.class.getSimpleName()).And("file", file));
 
         this.censorFactory.censor(DmpBlueprintCensor.class).censor(fieldSet, null);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/BuilderFactoryImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/BuilderFactoryImpl.java
index c1639eb54..74798d574 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/BuilderFactoryImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/BuilderFactoryImpl.java
@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
 public class BuilderFactoryImpl implements BuilderFactory {
 
     public <T extends Builder> T getBuilder(Class<T> tClass) {
-        if (tClass.equals(CredentialBuilder.class)) return (T) new CredentialBuilder();
         if (tClass.equals(DataRepositoryCriteriaBuilder.class)) return (T) new DataRepositoryCriteriaBuilder();
         if (tClass.equals(DatasetProfileBuilder.class)) return (T) new DatasetProfileBuilder();
         if (tClass.equals(DataTableDataBuilder.class)) return (T) new DataTableDataBuilder<>();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/CredentialBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/CredentialBuilder.java
deleted file mode 100644
index 214195717..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/CredentialBuilder.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package eu.eudat.logic.builders.entity;
-
-import eu.eudat.commons.enums.ProviderType;
-import eu.eudat.commons.enums.IsActive;
-import eu.eudat.data.CredentialEntity;
-import eu.eudat.logic.builders.Builder;
-import eu.eudat.data.old.UserInfo;
-
-import java.util.Date;
-import java.util.UUID;
-
-/**
- * Created by ikalyvas on 2/15/2018.
- */
-public class CredentialBuilder extends Builder<CredentialEntity> {
-
-    private UUID id;
-
-    private UserInfo userInfo;
-
-    private IsActive isActive;
-
-    private ProviderType provider;
-
-    private String publicValue;
-
-    private String secret;
-
-    private Date creationTime;
-
-    private Date lastUpdateTime;
-
-    private String externalId;
-
-    private String email;
-
-    public CredentialBuilder id(UUID id) {
-        this.id = id;
-        return this;
-    }
-
-    public CredentialBuilder userInfo(UserInfo userInfo) {
-        this.userInfo = userInfo;
-        return this;
-    }
-
-    public CredentialBuilder status(IsActive isActive) {
-        this.isActive = isActive;
-        return this;
-    }
-
-    public CredentialBuilder provider(ProviderType provider) {
-        this.provider = provider;
-        return this;
-    }
-
-    public CredentialBuilder publicValue(String publicValue) {
-        this.publicValue = publicValue;
-        return this;
-    }
-
-    public CredentialBuilder secret(String secret) {
-        this.secret = secret;
-        return this;
-    }
-
-    public CredentialBuilder creationTime(Date creationTime) {
-        this.creationTime = creationTime;
-        return this;
-    }
-
-    public CredentialBuilder lastUpdateTime(Date lastUpdateTime) {
-        this.lastUpdateTime = lastUpdateTime;
-        return this;
-    }
-
-    public CredentialBuilder externalId(String externalId) {
-        this.externalId = externalId;
-        return this;
-    }
-
-    public CredentialBuilder email(String email) {
-        this.email = email;
-        return this;
-    }
-
-    public CredentialEntity build() {
-        CredentialEntity credential = new CredentialEntity();
-        credential.setIsActive(isActive);
-        credential.setLastUpdateTime(lastUpdateTime);
-        credential.setCreationTime(creationTime);
-        credential.setProvider(provider);
-        credential.setSecret(secret);
-        credential.setPublicValue(publicValue);
-        credential.setUserId(userInfo.getId());
-        credential.setId(id);
-        credential.setExternalId(externalId);
-        credential.setEmail(email);
-        return credential;
-    }
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java
index 1ce744f9b..d49f6df32 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java
@@ -1,34 +1,32 @@
 package eu.eudat.logic.builders.entity;
 
-import eu.eudat.data.old.DescriptionTemplate;
-import eu.eudat.data.DescriptionTemplateTypeEntity;
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.logic.builders.Builder;
-import eu.eudat.data.old.Dataset;
 
-import java.util.Date;
-import java.util.Set;
+import java.time.Instant;
 import java.util.UUID;
 
 /**
  * Created by ikalyvas on 2/15/2018.
  */
-public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
+public class DatasetProfileBuilder extends Builder<DescriptionTemplateEntity> {
 
     private UUID id;
 
     private String label;
 
-    private DescriptionTemplateTypeEntity type;
+    private UUID type;
 
-    private Set<Dataset> dataset;
+//    private Set<Dataset> dataset;
 
     private String definition;
 
-    private Short status;
+    private DescriptionTemplateStatus status;
 
-    private Date created;
+    private Instant created;
 
-    private Date modified = new Date();
+    private Instant modified = Instant.now();
 
     private String description;
 
@@ -44,32 +42,32 @@ public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
         return this;
     }
 
-    public DatasetProfileBuilder type(DescriptionTemplateTypeEntity type) {
+    public DatasetProfileBuilder type(UUID type) {
         this.type = type;
         return this;
     }
 
-    public DatasetProfileBuilder dataset(Set<Dataset> dataset) {
-        this.dataset = dataset;
-        return this;
-    }
+//    public DatasetProfileBuilder dataset(Set<Dataset> dataset) {
+//        this.dataset = dataset;
+//        return this;
+//    }
 
     public DatasetProfileBuilder definition(String definition) {
         this.definition = definition;
         return this;
     }
 
-    public DatasetProfileBuilder status(Short status) {
+    public DatasetProfileBuilder status(DescriptionTemplateStatus status) {
         this.status = status;
         return this;
     }
 
-    public DatasetProfileBuilder created(Date created) {
+    public DatasetProfileBuilder created(Instant created) {
         this.created = created;
         return this;
     }
 
-    public DatasetProfileBuilder modified(Date modified) {
+    public DatasetProfileBuilder modified(Instant modified) {
         this.modified = modified;
         return this;
     }
@@ -85,18 +83,18 @@ public class DatasetProfileBuilder extends Builder<DescriptionTemplate> {
     }
 
     @Override
-    public DescriptionTemplate build() {
-        DescriptionTemplate descriptionTemplate = new DescriptionTemplate();
-        descriptionTemplate.setCreated(created);
-        descriptionTemplate.setStatus(status);
-        descriptionTemplate.setId(id);
-        descriptionTemplate.setDataset(dataset);
-        descriptionTemplate.setDefinition(definition);
-        descriptionTemplate.setDescription(description);
-        descriptionTemplate.setModified(modified);
-        descriptionTemplate.setLabel(label);
-        descriptionTemplate.setLanguage(language);
-        descriptionTemplate.setType(type);
-        return descriptionTemplate;
+    public DescriptionTemplateEntity build() {
+        DescriptionTemplateEntity descriptionTemplateEntity = new DescriptionTemplateEntity();
+        descriptionTemplateEntity.setCreatedAt(created);
+        descriptionTemplateEntity.setStatus(status);
+        descriptionTemplateEntity.setId(id);
+//        descriptionTemplate.setDataset(dataset);
+        descriptionTemplateEntity.setDefinition(definition);
+        descriptionTemplateEntity.setDescription(description);
+        descriptionTemplateEntity.setUpdatedAt(modified);
+        descriptionTemplateEntity.setLabel(label);
+        descriptionTemplateEntity.setLanguage(language);
+        descriptionTemplateEntity.setType(type);
+        return descriptionTemplateEntity;
     }
 }
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 6e27751d8..1d5719ec3 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
@@ -1,32 +1,36 @@
 package eu.eudat.logic.managers;
 
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
+import eu.eudat.commons.enums.IsActive;
+import eu.eudat.commons.types.descriptiontemplate.PageEntity;
+import eu.eudat.commons.types.descriptiontemplate.SectionEntity;
 import eu.eudat.data.dao.entities.DatasetDao;
 import eu.eudat.data.dao.entities.DatasetProfileDao;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.DescriptionTemplateTypeEntity;
 import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption;
 import eu.eudat.logic.builders.entity.DatasetProfileBuilder;
-import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel;
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
+import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.models.data.admin.composite.DatasetProfile;
 import eu.eudat.logic.services.ApiContext;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.commons.types.xml.XmlBuilder;
 import eu.eudat.service.descriptiontemplatetype.DescriptionTemplateTypeService;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import javax.management.InvalidApplicationException;
-import java.util.Date;
+import java.time.Instant;
 import java.util.UUID;
 
 public class AdminManager {
 
-    public static DescriptionTemplate generateViewStyleDefinition(DatasetProfile profile, ApiContext apiContext, DescriptionTemplateTypeService descriptionTemplateTypeService) throws Exception {
-        ViewStyleModel viewStyleModel = new ViewStyleModel();
-        viewStyleModel.setSections(new ModelBuilder().toViewStyleDefinition(profile.getSections(), eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section.class));
-        viewStyleModel.setPages(new ModelBuilder().toViewStyleDefinition(profile.getPages(), eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Page.class));
+    public static DescriptionTemplateEntity generateViewStyleDefinition(DatasetProfile profile, ApiContext apiContext, DescriptionTemplateTypeService descriptionTemplateTypeService) throws Exception {
+        DefinitionEntity defintion = new DefinitionEntity();
+        defintion.setSections(new ModelBuilder().toViewStyleDefinition(profile.getSections(), SectionEntity.class));
+        defintion.setPages(new ModelBuilder().toViewStyleDefinition(profile.getPages(), PageEntity.class));
         Document viewStyleDoc = XmlBuilder.getDocument();
-        Element elementViewStyle = viewStyleModel.toXml(viewStyleDoc);
+        Element elementViewStyle = defintion.toXml(viewStyleDoc);
         viewStyleDoc.appendChild(elementViewStyle);
         String xml = XmlBuilder.generateXml(viewStyleDoc);
 
@@ -46,26 +50,26 @@ public class AdminManager {
             throw new Exception("Description template type '" + profile.getType() + "' could not be found.");
         }
 
-        DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getBuilderFactory().getBuilder(DatasetProfileBuilder.class).definition(xml).label(profile.getLabel())
-                .status(profile.getStatus()).created(new Date()).description(profile.getDescription()).language(profile.getLanguage())
+        DescriptionTemplateEntity descriptionTemplateEntity = apiContext.getOperationsContext().getBuilderFactory().getBuilder(DatasetProfileBuilder.class).definition(xml).label(profile.getLabel())
+                .status(DescriptionTemplateStatus.of(profile.getStatus())).created(Instant.now()).description(profile.getDescription()).language(profile.getLanguage())
                 //TODO: dtziotzios  .type(type)
                 .build();
 
-        if (descriptionTemplate.getGroupId() == null) {
-            descriptionTemplate.setGroupId(UUID.randomUUID());
+        if (descriptionTemplateEntity.getGroupId() == null) {
+            descriptionTemplateEntity.setGroupId(UUID.randomUUID());
         }
 
-        if (descriptionTemplate.getVersion() == null) {
-            descriptionTemplate.setVersion((short)1);
+        if (descriptionTemplateEntity.getVersion() == null) {
+            descriptionTemplateEntity.setVersion((short)1);
         }
 
-        return descriptionTemplate;
+        return descriptionTemplateEntity;
     }
 
-    public static eu.eudat.models.data.admin.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplate profile) {
+    public static eu.eudat.models.data.admin.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplateEntity profile) {
         Document viewStyleDoc = XmlBuilder.fromXml(profile.getDefinition());
         Element root = viewStyleDoc.getDocumentElement();
-        eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewstyle = new eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel().fromXml(root);
+        DefinitionEntity viewstyle = new DefinitionEntity().fromXml(root);
 
         eu.eudat.models.data.admin.composite.DatasetProfile datasetprofile = new eu.eudat.models.data.admin.composite.DatasetProfile();
         datasetprofile.buildProfile(viewstyle);
@@ -73,12 +77,12 @@ public class AdminManager {
     }
 
 
-    public static DescriptionTemplate inactivate(DatasetProfileDao datasetProfileRepository, DatasetDao datasetDao, String id) throws InvalidApplicationException {
+    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) {
-            DescriptionTemplate detasetProfile = datasetProfileRepository.find(UUID.fromString(id));
-            detasetProfile.setStatus(DescriptionTemplate.Status.DELETED.getValue());
+            DescriptionTemplateEntity detasetProfile = datasetProfileRepository.find(UUID.fromString(id));
+            detasetProfile.setIsActive(IsActive.Inactive);
             detasetProfile = datasetProfileRepository.createOrUpdate(detasetProfile);
             return detasetProfile;
         } else {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 09269b19b..73f512fde 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -13,7 +13,7 @@ import eu.eudat.data.DmpBlueprintEntity;
 import eu.eudat.data.EntityDoiEntity;
 import eu.eudat.data.dao.criteria.*;
 import eu.eudat.data.dao.entities.*;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.*;
 import eu.eudat.data.old.Researcher;
 import eu.eudat.commons.enums.old.notification.ActiveStatus;
@@ -436,7 +436,7 @@ public class DataManagementPlanManager {
         datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.DMPs.getValue());
         datasetProfileTableRequestItem.getCriteria().setUserId(this.userScope.getUserId());
 
-        QueryableList<DescriptionTemplate> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
+        QueryableList<DescriptionTemplateEntity> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
         List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
 
         DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
@@ -1381,7 +1381,7 @@ public class DataManagementPlanManager {
 //        // Space below Datasets.
 //        XWPFParagraph parBreakDatasets = document.createParagraph();
 
-        DefinitionEntity dmpBlueprint = this.xmlHandlingService.xmlSerializableFromXmlSafe(DefinitionEntity.class, dmpEntity.getProfile().getDefinition());
+        DefinitionEntity dmpBlueprint = this.xmlHandlingService.fromXmlSafe(DefinitionEntity.class, dmpEntity.getProfile().getDefinition());
         for(SectionEntity section: dmpBlueprint.getSections()){
             wordBuilder.addParagraphContent("Section " + section.getOrdinal(), document, ParagraphStyle.HEADER1, BigInteger.ZERO, 0);
             XWPFParagraph sectionInfoParagraph = document.createParagraph();
@@ -1527,10 +1527,10 @@ public class DataManagementPlanManager {
             if(!section.getDescriptionTemplates().isEmpty()){
                 wordBuilder.addParagraphContent("Section descriptions", document, ParagraphStyle.HEADER2, BigInteger.ZERO, 0);
                 wordBuilder.addParagraphContent("Description Templates", document, ParagraphStyle.HEADER4, BigInteger.ZERO, 0);
-                for(DescriptionTemplateEntity descriptionTemplate: section.getDescriptionTemplates()){
+                for(eu.eudat.commons.types.dmpblueprint.DescriptionTemplateEntity descriptionTemplateEntity : section.getDescriptionTemplates()){
                     XWPFParagraph templateParagraph = document.createParagraph();
                     XWPFRun runTemplateLabel = templateParagraph.createRun();
-                    runTemplateLabel.setText("• " + descriptionTemplate.getLabel());
+                    runTemplateLabel.setText("• " + descriptionTemplateEntity.getLabel());
                     runTemplateLabel.setColor("116a78");
                 }
 
@@ -1940,19 +1940,19 @@ public class DataManagementPlanManager {
         Element profiles = xmlDoc.createElement("profiles");
         // Get DatasetProfiles from DMP to add to XML.
         for (DMPDatasetProfile dmpDescriptionProfile : dmp.getAssociatedDmps()) {
-            DescriptionTemplate descriptionTemplate = dmpDescriptionProfile.getDatasetprofile();
+            DescriptionTemplateEntity descriptionTemplateEntity = dmpDescriptionProfile.getDatasetprofile();
             Element profile = xmlDoc.createElement("profile");
             Element profileId = xmlDoc.createElement("profileId");
-            profileId.setTextContent(descriptionTemplate.getId().toString());
+            profileId.setTextContent(descriptionTemplateEntity.getId().toString());
             profile.appendChild(profileId);
             Element profileGroupId = xmlDoc.createElement("profileGroupId");
-            profileGroupId.setTextContent(descriptionTemplate.getGroupId().toString());
+            profileGroupId.setTextContent(descriptionTemplateEntity.getGroupId().toString());
             profile.appendChild(profileGroupId);
             Element profileLabel = xmlDoc.createElement("profileLabel");
-            profileLabel.setTextContent(descriptionTemplate.getLabel());
+            profileLabel.setTextContent(descriptionTemplateEntity.getLabel());
             profile.appendChild(profileLabel);
             Element profileVersion = xmlDoc.createElement("profileVersion");
-            profileVersion.setTextContent(String.valueOf(descriptionTemplate.getVersion()));
+            profileVersion.setTextContent(String.valueOf(descriptionTemplateEntity.getVersion()));
             profile.appendChild(profileVersion);
             Element profileInSections = xmlDoc.createElement("profileInSections");
             Map<String, Object> data = new ObjectMapper().readValue(dmpDescriptionProfile.getData(), new TypeReference<Map<String, Object>>() {});
@@ -2142,7 +2142,7 @@ public class DataManagementPlanManager {
 
             for (AssociatedProfileImportModels a : dataManagementPlans.get(0).getProfilesImportModels()) {
                 try {
-                    DescriptionTemplate exProfile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(a.getId());
+                    DescriptionTemplateEntity exProfile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(a.getId());
                     AssociatedProfile associatedProfile = new AssociatedProfile().fromData(exProfile);
                     Map<String, Object> data = new HashMap<>();
                     List<Integer> sections = new ArrayList<>(a.getSection());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
index 2c0e00b9e..c6ef08813 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.authorization.Permission;
 import eu.eudat.commons.scope.user.UserScope;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.dao.criteria.*;
 import eu.eudat.data.dao.entities.DataRepositoryDao;
 import eu.eudat.data.dao.entities.DatasetDao;
@@ -51,7 +52,6 @@ import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.models.data.listingmodels.DatasetListingModel;
 import eu.eudat.models.data.user.composite.PagedDatasetProfile;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.types.Authorities;
 import eu.eudat.types.MetricNames;
 import gr.cite.commons.web.authz.service.AuthorizationService;
 import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
@@ -307,13 +307,13 @@ public class DatasetManager {
         profileCriteria.setGroupIds(uuidList);
         profileCriteria.setAllVersions(true);
 
-        List<DescriptionTemplate> profileVersions = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria)
+        List<DescriptionTemplateEntity> profileVersions = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria)
                 .orderBy(((builder, root) -> builder.desc(root.get("version"))))
                 .toList();
-        List<DescriptionTemplate> profileVersionsIncluded = new LinkedList<>();
+        List<DescriptionTemplateEntity> profileVersionsIncluded = new LinkedList<>();
 
         // Iterate through the versions and remove those that are not included in the DMP of the dataset in question.
-        for (DescriptionTemplate version : profileVersions) {
+        for (DescriptionTemplateEntity version : profileVersions) {
             for (AssociatedProfile p : dataset.getDmp().getProfiles()) {
                 if (version.getId().toString().equals(p.getDescriptionTemplateId().toString())) {
                     profileVersionsIncluded.add(version);
@@ -322,14 +322,14 @@ public class DatasetManager {
         }
 
         // Sort the list with the included Versions.
-        Stream<DescriptionTemplate> sorted = profileVersionsIncluded.stream().sorted(Comparator.comparing(DescriptionTemplate::getVersion).reversed());
+        Stream<DescriptionTemplateEntity> sorted = profileVersionsIncluded.stream().sorted(Comparator.comparing(DescriptionTemplateEntity::getVersion).reversed());
 
         // Make the Stream into List and get the first item.
-        List<DescriptionTemplate> profiles = sorted.collect(Collectors.toList());
+        List<DescriptionTemplateEntity> profiles = sorted.collect(Collectors.toList());
         if (profiles.isEmpty())
             throw new NoSuchElementException("No profiles found for the specific Dataset");
 
-        DescriptionTemplate profile = profiles.get(0);
+        DescriptionTemplateEntity profile = profiles.get(0);
 
         // Check if the dataset is on the latest Version.
         boolean latestVersion = profile.getVersion().toString().equals(datasetEntity.getProfile().getVersion().toString());
@@ -724,7 +724,7 @@ public class DatasetManager {
 
     public String checkDatasetValidation(Dataset dataset) throws Exception {
         List<String> datasetProfileValidators = new LinkedList<>();
-        DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(dataset.getProfile().getId());
+        DescriptionTemplateEntity profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(dataset.getProfile().getId());
         DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder builder = builderFactory.newDocumentBuilder();
         Document xmlDocument = builder.parse(new ByteArrayInputStream(profile.getDefinition().getBytes()));
@@ -982,9 +982,9 @@ public class DatasetManager {
 
         // Checks if XML datasetProfileId GroupId matches the one selected.
         try {
-            DescriptionTemplate importDescriptionTemplate = databaseRepository.getDatasetProfileDao().find(UUID.fromString(importModel.getDatasetProfileId()));
-            DescriptionTemplate latestVersionDescriptionTemplate = databaseRepository.getDatasetProfileDao().find(UUID.fromString(datasetProfileId));
-            if (latestVersionDescriptionTemplate.getGroupId() != importDescriptionTemplate.getGroupId()) {
+            DescriptionTemplateEntity importDescriptionTemplateEntity = databaseRepository.getDatasetProfileDao().find(UUID.fromString(importModel.getDatasetProfileId()));
+            DescriptionTemplateEntity latestVersionDescriptionTemplateEntity = databaseRepository.getDatasetProfileDao().find(UUID.fromString(datasetProfileId));
+            if (latestVersionDescriptionTemplateEntity.getGroupId() != importDescriptionTemplateEntity.getGroupId()) {
                 throw new Exception();
             }
         } catch (Exception e) {
@@ -1017,7 +1017,7 @@ public class DatasetManager {
         entity.setStatus((short) 0);
         entity.setCreated(new Date());
         entity.setModified(new Date());
-        DescriptionTemplate profile = new DescriptionTemplate();
+        DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
         profile.setId(UUID.fromString(datasetProfileId));
         entity.setProfile(profile);
 
@@ -1052,7 +1052,7 @@ public class DatasetManager {
         profileCriteria.setGroupIds(uuidList);
 
         // Gets the latest version of the datasetProfile.
-        DescriptionTemplate item = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria).getSingle();
+        DescriptionTemplateEntity item = databaseRepository.getDatasetProfileDao().getWithCriteria(profileCriteria).getSingle();
 
         // Sets the latest version of dataet Profile to the Dataset in question.
         dataset.setDatasetProfileDefinition(getLatestDatasetProfile(datasetEntity, item));
@@ -1078,7 +1078,7 @@ public class DatasetManager {
         return dataset;
     }
 
-    public PagedDatasetProfile getLatestDatasetProfile(Dataset datasetEntity, DescriptionTemplate profile) {
+    public PagedDatasetProfile getLatestDatasetProfile(Dataset datasetEntity, DescriptionTemplateEntity profile) {
         eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(profile);
         datasetprofile.setStatus(datasetEntity.getStatus());
         if (datasetEntity.getProperties() != null) {
@@ -1095,7 +1095,7 @@ public class DatasetManager {
         datasetProfileTableRequestItem.getCriteria().setFilter(DatasetProfileCriteria.DatasetProfileFilter.Datasets.getValue());
         datasetProfileTableRequestItem.getCriteria().setUserId(this.userScope.getUserId());
 
-        QueryableList<DescriptionTemplate> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
+        QueryableList<DescriptionTemplateEntity> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
         List<DatasetProfileListingModel> listingModels = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
 
         DataTableData<DatasetProfileListingModel> data = new DataTableData<>();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
index 5ac8c8c5f..76bcb8b2f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java
@@ -3,7 +3,7 @@ package eu.eudat.logic.managers;
 import eu.eudat.authorization.Permission;
 import eu.eudat.commons.scope.user.UserScope;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.UserDatasetProfile;
 import eu.eudat.data.old.UserInfo;
 import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteRequest;
@@ -20,18 +20,20 @@ import eu.eudat.commons.types.xml.XmlBuilder;
 import eu.eudat.logic.utilities.documents.helpers.FileEnvelope;
 import eu.eudat.logic.utilities.documents.xml.datasetProfileXml.ExportXmlBuilderDatasetProfile;
 import eu.eudat.logic.utilities.documents.xml.datasetProfileXml.ImportXmlBuilderDatasetProfile;
-import eu.eudat.models.data.components.commons.datafield.AutoCompleteData;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
 import eu.eudat.models.data.datasetprofile.DatasetProfileAutocompleteItem;
 import eu.eudat.models.data.datasetprofile.DatasetProfileListingModel;
-import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field;
+import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
 import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel;
 import eu.eudat.models.data.helpers.common.DataTableData;
 import eu.eudat.models.data.listingmodels.UserInfoListingModel;
 import eu.eudat.models.data.mail.SimpleMail;
+import eu.eudat.query.DescriptionTemplateTypeQuery;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.service.descriptiontemplatetype.DescriptionTemplateTypeService;
 import eu.eudat.types.MetricNames;
 import gr.cite.commons.web.authz.service.AuthorizationService;
+import gr.cite.tools.data.query.QueryFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,9 +79,10 @@ public class DatasetProfileManager {
     private final DescriptionTemplateTypeService descriptionTemplateTypeService;
     private final AuthorizationService authorizationService;
     private final UserScope userScope;
+    private final QueryFactory queryFactory;
 
     @Autowired
-    public DatasetProfileManager(ApiContext apiContext, Environment environment, ConfigLoader configLoader, MetricsManager metricsManager, RemoteFetcher remoteFetcher, DescriptionTemplateTypeService descriptionTemplateTypeService, AuthorizationService authorizationService, UserScope userScope) {
+    public DatasetProfileManager(ApiContext apiContext, Environment environment, ConfigLoader configLoader, MetricsManager metricsManager, RemoteFetcher remoteFetcher, DescriptionTemplateTypeService descriptionTemplateTypeService, AuthorizationService authorizationService, UserScope userScope, QueryFactory queryFactory) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
         this.environment = environment;
@@ -89,16 +92,17 @@ public class DatasetProfileManager {
         this.remoteFetcher = remoteFetcher;
         this.authorizationService = authorizationService;
         this.userScope = userScope;
+        this.queryFactory = queryFactory;
     }
 
     @Transactional
     public eu.eudat.models.data.admin.composite.DatasetProfile getDatasetProfile(String id) throws InvalidApplicationException {
-        DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+        DescriptionTemplateEntity profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
         eu.eudat.models.data.admin.composite.DatasetProfile datasetprofile = AdminManager.generateDatasetProfileModel(profile);
         datasetprofile.setLabel(profile.getLabel());
-        datasetprofile.setStatus(profile.getStatus());
+        datasetprofile.setStatus(profile.getStatus().getValue());
         datasetprofile.setDescription(profile.getDescription());
-        datasetprofile.setType(profile.getType().getName());
+        datasetprofile.setType(this.queryFactory.query(DescriptionTemplateTypeQuery.class).ids(profile.getType()).first().getName());
         datasetprofile.setLanguage(profile.getLanguage());
         datasetprofile.setUsers(new ArrayList<>());
         retrieveUsers(profile, datasetprofile);
@@ -106,53 +110,53 @@ public class DatasetProfileManager {
     }
 
     public List<DatasetProfileAutocompleteItem> getWithCriteria(DatasetProfileAutocompleteRequest datasetProfileAutocompleteRequest) throws IllegalAccessException, InstantiationException, InvalidApplicationException {
-        QueryableList<DescriptionTemplate> items = databaseRepository.getDatasetProfileDao().getWithCriteria(datasetProfileAutocompleteRequest.getCriteria());
-        QueryableList<DescriptionTemplate> pagedItems = datasetProfileAutocompleteRequest.applyPaging(items);
+        QueryableList<DescriptionTemplateEntity> items = databaseRepository.getDatasetProfileDao().getWithCriteria(datasetProfileAutocompleteRequest.getCriteria());
+        QueryableList<DescriptionTemplateEntity> pagedItems = datasetProfileAutocompleteRequest.applyPaging(items);
         List<DatasetProfileAutocompleteItem> datasetProfiles = pagedItems.select(item -> new DatasetProfileAutocompleteItem().fromDataModel(item));
         return datasetProfiles;
     }
 
-    public DescriptionTemplate clone(String id) throws InvalidApplicationException {
-        DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+    public DescriptionTemplateEntity clone(String id) throws InvalidApplicationException {
+        DescriptionTemplateEntity profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
         apiContext.getOperationsContext().getDatabaseRepository().detachEntity(profile);
         profile.setId(null);
         return profile;
     }
 
     public DataTableData<DatasetProfileListingModel> getPaged(DatasetProfileTableRequestItem datasetProfileTableRequestItem) throws Exception {
-        QueryableList<DescriptionTemplate> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
-        QueryableList<DescriptionTemplate> authItems = null;
+        QueryableList<DescriptionTemplateEntity> items = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(datasetProfileTableRequestItem.getCriteria());
+        QueryableList<DescriptionTemplateEntity> authItems = null;
         if (this.authorizationService.authorize(Permission.AdminRole)) {
             authItems = items;
         } else if (this.authorizationService.authorize(Permission.DatasetProfileManagerRole)) {
             List<Integer> roles = Arrays.asList(0, 1);
             authItems = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getAuthenticated(items, this.userScope.getUserId(), roles);
         }
-        QueryableList<DescriptionTemplate> pagedItems = PaginationManager.applyPaging(authItems, datasetProfileTableRequestItem);
+        QueryableList<DescriptionTemplateEntity> pagedItems = PaginationManager.applyPaging(authItems, datasetProfileTableRequestItem);
         List<DatasetProfileListingModel> datasetProfiles = pagedItems.select(item -> new DatasetProfileListingModel().fromDataModel(item));
         return apiContext.getOperationsContext().getBuilderFactory().getBuilder(DataTableDataBuilder.class).data(datasetProfiles).totalCount(items.count()).build();
     }
 
     public List<DatasetProfileListingModel> getAll(DatasetProfileTableRequestItem tableRequestItem) throws IllegalAccessException, InstantiationException, InvalidApplicationException {
-        QueryableList<DescriptionTemplate> items = databaseRepository.getDatasetProfileDao().getWithCriteria(tableRequestItem.getCriteria());
+        QueryableList<DescriptionTemplateEntity> items = databaseRepository.getDatasetProfileDao().getWithCriteria(tableRequestItem.getCriteria());
         List<DatasetProfileListingModel> datasetProfiles = items.select(item -> new DatasetProfileListingModel().fromDataModel(item));
 
         return datasetProfiles;
     }
 
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field queryForField(String xml, String fieldId) throws XPathExpressionException {
-        eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field field = new Field();
+    public FieldEntity queryForField(String xml, String fieldId) throws XPathExpressionException {
+        FieldEntity fieldEntity = new FieldEntity();
         Document document = XmlBuilder.fromXml(xml);
         XPathFactory xpathFactory = XPathFactory.newInstance();
         XPath xpath = xpathFactory.newXPath();
         XPathExpression expr =
                 xpath.compile("//field[@id='" + fieldId + "']");
         Element name = (Element) expr.evaluate(document, XPathConstants.NODE);
-        field.fromXml(name);
-        return field;
+        fieldEntity.fromXml(name);
+        return fieldEntity;
     }
 
-    public List<ExternalAutocompleteFieldModel> getAutocomplete(AutoCompleteData data, String like) {
+    public List<ExternalAutocompleteFieldModel> getAutocomplete(AutoCompleteDataEntity data, String like) {
         /*List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
         SimpleClientHttpRequestFactory simpleFactory = new SimpleClientHttpRequestFactory();
 
@@ -224,7 +228,7 @@ public class DatasetProfileManager {
         List<Map<String, String>> rawResults = new ArrayList<>();
         genericUrls.setFetchMode(FetchStrategy.FIRST);
         urlCriteria.setLike(like);
-        for (AutoCompleteData.AutoCompleteSingleData singleData : data.getAutoCompleteSingleDataList()) {
+        for (AutoCompleteDataEntity.AutoCompleteSingleData singleData : data.getAutoCompleteSingleDataList()) {
             UrlConfiguration urlConfiguration = new UrlConfiguration();
             try {
                 URI uri;
@@ -352,36 +356,36 @@ public class DatasetProfileManager {
         return convFile;
     }
 
-    public DescriptionTemplate createNewVersionDatasetProfile(String id, eu.eudat.models.data.admin.composite.DatasetProfile profile) throws Exception {
+    public DescriptionTemplateEntity createNewVersionDatasetProfile(String id, eu.eudat.models.data.admin.composite.DatasetProfile profile) throws Exception {
         // Getting the DescriptionTemplate which we will create its new version.
-        DescriptionTemplate oldDescriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
+        DescriptionTemplateEntity oldDescriptionTemplateEntity = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
 
         // Getting the DescriptionTemplate with the latest Version.
         DatasetProfileCriteria criteria = new DatasetProfileCriteria();
         LinkedList<UUID> list = new LinkedList<>();
-        list.push(oldDescriptionTemplate.getGroupId());
+        list.push(oldDescriptionTemplateEntity.getGroupId());
         criteria.setGroupIds(list);
         criteria.setAllVersions(false);
-        QueryableList<DescriptionTemplate> datasetProfileQueryableList = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria);
-        DescriptionTemplate latestVersionDescriptionTemplate = datasetProfileQueryableList.getSingle();
+        QueryableList<DescriptionTemplateEntity> datasetProfileQueryableList = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria);
+        DescriptionTemplateEntity latestVersionDescriptionTemplateEntity = datasetProfileQueryableList.getSingle();
 
-        if (latestVersionDescriptionTemplate.getVersion().equals(oldDescriptionTemplate.getVersion())){
+        if (latestVersionDescriptionTemplateEntity.getVersion().equals(oldDescriptionTemplateEntity.getVersion())){
             eu.eudat.models.data.admin.composite.DatasetProfile sortedProfile = profile.toShort();
-            DescriptionTemplate modelDefinition = AdminManager.generateViewStyleDefinition(sortedProfile, apiContext, descriptionTemplateTypeService);
+            DescriptionTemplateEntity modelDefinition = AdminManager.generateViewStyleDefinition(sortedProfile, apiContext, descriptionTemplateTypeService);
 //            modelDefinition.setLabel(oldDescriptionTemplate.getLabel());
-            modelDefinition.setVersion((short) (oldDescriptionTemplate.getVersion() + 1));
-            modelDefinition.setGroupId(oldDescriptionTemplate.getGroupId());
+            modelDefinition.setVersion((short) (oldDescriptionTemplateEntity.getVersion() + 1));
+            modelDefinition.setGroupId(oldDescriptionTemplateEntity.getGroupId());
 //            modelDefinition.setLanguage(oldDescriptionTemplate.getLanguage());
             apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
-            DescriptionTemplate descriptionTemplate =  apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
-            this.storeDatasetProfileUsers(descriptionTemplate, profile);
+            DescriptionTemplateEntity descriptionTemplateEntity =  apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition);
+            this.storeDatasetProfileUsers(descriptionTemplateEntity, profile);
             return modelDefinition;
         } else {
             throw new DatasetProfileNewVersionException("Version to update not the latest.");
         }
     }
 
-    public void storeDatasetProfileUsers(DescriptionTemplate entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
+    public void storeDatasetProfileUsers(DescriptionTemplateEntity entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
         if (model.getUsers() != null && !model.getUsers().isEmpty()) {
             if (entity.getUsers() == null) {
                 entity.setUsers(new HashSet<>());
@@ -421,7 +425,7 @@ public class DatasetProfileManager {
     }
 
     @Transactional
-    public void retrieveUsers(DescriptionTemplate entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
+    public void retrieveUsers(DescriptionTemplateEntity entity, eu.eudat.models.data.admin.composite.DatasetProfile model) {
         if (entity.getUsers() != null && !entity.getUsers().isEmpty()) {
             model.setUsers(entity.getUsers().stream().filter(userDatasetProfile -> userDatasetProfile.getRole() < 2).map(userDatasetProfile -> {
                 UserInfoListingModel userInfoListingModel = new UserInfoListingModel();
@@ -462,10 +466,10 @@ public class DatasetProfileManager {
     }
 
     public void addSemanticsInDatasetProfiles() throws XPathExpressionException, InvalidApplicationException {
-        List<DescriptionTemplate> ids = this.databaseRepository.getDatasetProfileDao().getAllIds();
-        for(DescriptionTemplate dp: ids){
-            DescriptionTemplate descriptionTemplate = this.databaseRepository.getDatasetProfileDao().find(dp.getId());
-            Document document = XmlBuilder.fromXml(descriptionTemplate.getDefinition());
+        List<DescriptionTemplateEntity> ids = this.databaseRepository.getDatasetProfileDao().getAllIds();
+        for(DescriptionTemplateEntity dp: ids){
+            DescriptionTemplateEntity descriptionTemplateEntity = this.databaseRepository.getDatasetProfileDao().find(dp.getId());
+            Document document = XmlBuilder.fromXml(descriptionTemplateEntity.getDefinition());
             XPathFactory xpathFactory = XPathFactory.newInstance();
             XPath xpath = xpathFactory.newXPath();
             XPathExpression expr = xpath.compile("//rdaCommonStandard");
@@ -483,15 +487,15 @@ public class DatasetProfileManager {
                 fieldParent.insertBefore(schematics, rdaPropertyNode);
                 fieldParent.removeChild(rdaPropertyNode);
             }
-            this.updateDatasetProfileXml(document, descriptionTemplate);
+            this.updateDatasetProfileXml(document, descriptionTemplateEntity);
         }
     }
 
     public void addRdaInSemanticsInDatasetProfiles() throws XPathExpressionException, InvalidApplicationException {
-        List<DescriptionTemplate> ids = this.databaseRepository.getDatasetProfileDao().getAllIds();
-        for(DescriptionTemplate dp: ids){
-            DescriptionTemplate descriptionTemplate = this.databaseRepository.getDatasetProfileDao().find(dp.getId());
-            Document document = XmlBuilder.fromXml(descriptionTemplate.getDefinition());
+        List<DescriptionTemplateEntity> ids = this.databaseRepository.getDatasetProfileDao().getAllIds();
+        for(DescriptionTemplateEntity dp: ids){
+            DescriptionTemplateEntity descriptionTemplateEntity = this.databaseRepository.getDatasetProfileDao().find(dp.getId());
+            Document document = XmlBuilder.fromXml(descriptionTemplateEntity.getDefinition());
             XPathFactory xpathFactory = XPathFactory.newInstance();
             XPath xpath = xpathFactory.newXPath();
             XPathExpression expr = xpath.compile("//schematic");
@@ -503,11 +507,11 @@ public class DatasetProfileManager {
                     schematicNode.setTextContent("rda." + schematicRda);
                 }
             }
-            this.updateDatasetProfileXml(document, descriptionTemplate);
+            this.updateDatasetProfileXml(document, descriptionTemplateEntity);
         }
     }
 
-    private void updateDatasetProfileXml(Document document, DescriptionTemplate descriptionTemplate) {
+    private void updateDatasetProfileXml(Document document, DescriptionTemplateEntity descriptionTemplateEntity) {
         try {
             DOMSource domSource = new DOMSource(document);
             StringWriter writer = new StringWriter();
@@ -518,8 +522,8 @@ public class DatasetProfileManager {
             transformer.transform(domSource, result);
             String newDefinition = writer.toString();
             if(newDefinition != null){
-                descriptionTemplate.setDefinition(newDefinition);
-                this.databaseRepository.getDatasetProfileDao().createOrUpdate(descriptionTemplate);
+                descriptionTemplateEntity.setDefinition(newDefinition);
+                this.databaseRepository.getDatasetProfileDao().createOrUpdate(descriptionTemplateEntity);
             }
         }
         catch(TransformerException ex) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
index 3f8b2e168..a81ee9701 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java
@@ -6,7 +6,7 @@ import eu.eudat.data.dao.entities.DMPDao;
 import eu.eudat.data.dao.entities.DatasetProfileDao;
 import eu.eudat.data.old.DMP;
 import eu.eudat.data.old.Dataset;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.UserInfo;
 import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest;
 import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest;
@@ -42,11 +42,11 @@ public class DatasetWizardManager {
         }
         DatasetProfileCriteria criteria = new DatasetProfileCriteria();
         criteria.setIds(dataManagementPlan.getProfiles().stream().map(AssociatedProfile::getDescriptionTemplateId).collect(Collectors.toList()));
-        List<DescriptionTemplate> descriptionTemplates = profileDao.getWithCriteria(criteria).toList();
+        List<DescriptionTemplateEntity> descriptionTemplateEntities = profileDao.getWithCriteria(criteria).toList();
         criteria.setIds(null);
-        criteria.setGroupIds(descriptionTemplates.stream().map(DescriptionTemplate::getGroupId).collect(Collectors.toList()));
-        descriptionTemplates = profileDao.getWithCriteria(criteria).toList();
-        List<AssociatedProfile> profiles = descriptionTemplates.stream().map(profile -> new AssociatedProfile().fromData(profile)).collect(Collectors.toList());
+        criteria.setGroupIds(descriptionTemplateEntities.stream().map(DescriptionTemplateEntity::getGroupId).collect(Collectors.toList()));
+        descriptionTemplateEntities = profileDao.getWithCriteria(criteria).toList();
+        List<AssociatedProfile> profiles = descriptionTemplateEntities.stream().map(profile -> new AssociatedProfile().fromData(profile)).collect(Collectors.toList());
         return profiles;
     }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java
index f145af3db..5fa429a96 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java
@@ -1,7 +1,8 @@
 package eu.eudat.logic.managers;
 
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
 import eu.eudat.data.dao.criteria.*;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.logic.services.ApiContext;
 import eu.eudat.types.MetricNames;
 import io.micrometer.prometheus.PrometheusMeterRegistry;
@@ -35,8 +36,8 @@ public class MetricsManager {
     private final Map<String, Gauge> gauges;
 
     public static final Map<Short, String> datasetTemplateStatus = Stream.of(new Object[][] {
-            { DescriptionTemplate.Status.SAVED.getValue(), MetricNames.DRAFT },
-            { DescriptionTemplate.Status.FINALIZED.getValue(), MetricNames.ACTIVE },
+            { DescriptionTemplateStatus.Draft.getValue(), MetricNames.DRAFT },
+            { DescriptionTemplateStatus.Finalized.getValue(), MetricNames.ACTIVE },
     }).collect(Collectors.toMap(data -> (Short) data[0], data -> (String) data[1]));
 
     public void increaseValue(String name, int amount,  String label) {
@@ -408,9 +409,9 @@ public class MetricsManager {
         criteria.setStatus(1);
         criteria.setAllVersions(false);
         if (countNexus) criteria.setPeriodStart(getNexusDate());
-        List<DescriptionTemplate> descriptionTemplates = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria).withFields(Collections.singletonList("id")).toList();
+        List<DescriptionTemplateEntity> descriptionTemplateEntities = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().getWithCriteria(criteria).withFields(Collections.singletonList("id")).toList();
         DatasetCriteria datasetCriteria = new DatasetCriteria();
-        datasetCriteria.setDatasetTemplates(descriptionTemplates.stream().map(DescriptionTemplate::getId).collect(Collectors.toList()));
+        datasetCriteria.setDatasetTemplates(descriptionTemplateEntities.stream().map(DescriptionTemplateEntity::getId).collect(Collectors.toList()));
         return apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().getWithCriteria(datasetCriteria).select(root -> root.getProfile().getId()).stream().distinct().count();
     }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java
index 19aa2c74b..c74918ba8 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java
@@ -2,7 +2,7 @@ package eu.eudat.logic.managers;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.logic.mapper.prefilling.PrefillingMapper;
 import eu.eudat.logic.proxy.config.ExternalUrlCriteria;
 import eu.eudat.logic.proxy.config.configloaders.ConfigLoader;
@@ -63,15 +63,15 @@ public class PrefillingManager {
         PrefillingConfig prefillingConfig = configLoader.getExternalUrls().getPrefillings().get(configId);
         PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet();
         Map<String, Object> prefillingEntity = getSingle(prefillingGet.getUrl(), prefillId);
-        DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
-        return prefillingMapper.mapPrefilledEntityToDatasetWizard(prefillingEntity, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
+        DescriptionTemplateEntity descriptionTemplateEntity = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
+        return prefillingMapper.mapPrefilledEntityToDatasetWizard(prefillingEntity, prefillingGet, prefillingConfig.getType(), descriptionTemplateEntity, datasetManager, licenseManager);
     }
 
     public DatasetWizardModel getPrefilledDatasetUsingData(Map<String, Object> data, String configId, UUID profileId) throws Exception {
         PrefillingConfig prefillingConfig = configLoader.getExternalUrls().getPrefillings().get(configId);
         PrefillingGet prefillingGet = prefillingConfig.getPrefillingGet();
-        DescriptionTemplate descriptionTemplate = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
-        return prefillingMapper.mapPrefilledEntityToDatasetWizard(data, prefillingGet, prefillingConfig.getType(), descriptionTemplate, datasetManager, licenseManager);
+        DescriptionTemplateEntity descriptionTemplateEntity = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(profileId);
+        return prefillingMapper.mapPrefilledEntityToDatasetWizard(data, prefillingGet, prefillingConfig.getType(), descriptionTemplateEntity, datasetManager, licenseManager);
     }
 
     private Map<String, Object> getSingle(String url, String id) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
index 4a407abbc..559e669cf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java
@@ -3,11 +3,12 @@ package eu.eudat.logic.managers;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.authorization.Permission;
 import eu.eudat.commons.scope.user.UserScope;
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
 import eu.eudat.data.CredentialEntity;
 import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
 import eu.eudat.data.dao.entities.UserInfoDao;
 import eu.eudat.data.old.DMP;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.UserInfo;
 import eu.eudat.data.old.UserRole;
 import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem;
@@ -59,10 +60,10 @@ public class UserManager {
 		this.authorizationService = authorizationService;
 	}
 
-	public eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplate profile) {
+	public eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplateEntity profile) {
 		Document viewStyleDoc = XmlBuilder.fromXml(profile.getDefinition());
 		Element root = (Element) viewStyleDoc.getDocumentElement();
-		eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewstyle = new eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel().fromXml(root);
+		DefinitionEntity viewstyle = new DefinitionEntity().fromXml(root);
 
 		eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = new eu.eudat.models.data.user.composite.DatasetProfile();
 		datasetprofile.buildProfile(viewstyle);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
index b824216e3..1636b20f0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.data.old.Dataset;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.logic.managers.DatasetManager;
 import eu.eudat.logic.managers.DatasetProfileManager;
@@ -18,7 +18,7 @@ import eu.eudat.logic.proxy.config.exceptions.HugeResultSet;
 import eu.eudat.logic.proxy.config.exceptions.NoURLFound;
 import eu.eudat.logic.utilities.helpers.StreamDistinctBy;
 import eu.eudat.logic.utilities.json.JsonSearcher;
-import eu.eudat.models.data.components.commons.datafield.AutoCompleteData;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
 import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 import eu.eudat.models.data.datasetprofile.RenderStyle;
 import eu.eudat.models.data.datasetwizard.DatasetWizardModel;
@@ -49,7 +49,7 @@ public class PrefillingMapper {
     }
 
     public DatasetWizardModel mapPrefilledEntityToDatasetWizard(Map<String, Object> prefilledEntity, PrefillingGet prefillingGet, String type,
-                                                                       DescriptionTemplate profile, DatasetManager datasetManager, LicenseManager licenseManager) throws Exception {
+                                                                DescriptionTemplateEntity profile, DatasetManager datasetManager, LicenseManager licenseManager) throws Exception {
         DatasetWizardModel datasetWizardModel = new DatasetWizardModel();
         datasetWizardModel.setProfile(new DatasetProfileOverviewModel().fromDataModel(profile));
         Dataset dataset = new Dataset();
@@ -231,12 +231,12 @@ public class PrefillingMapper {
         String type = node.isArray() ? node.get(0).get("data").get("type").asText() : node.get("data").get("type").asText();
         if(type.equals("autocomplete")) {
             JsonNode dataNode = node.isArray() ? node.get(0).get("data") : node.get("data");
-            AutoCompleteData autoCompleteData = mapper.treeToValue(dataNode, AutoCompleteData.class);
-            isMultiSelect = autoCompleteData.getMultiAutoComplete();
+            AutoCompleteDataEntity autoCompleteDataEntity = mapper.treeToValue(dataNode, AutoCompleteDataEntity.class);
+            isMultiSelect = autoCompleteDataEntity.getMultiAutoComplete();
             for (String format : parsedValues) {
                 List<ExternalAutocompleteFieldModel> result = new ArrayList<>();
                 try {
-                    result = datasetProfileManager.getAutocomplete(autoCompleteData, format);
+                    result = datasetProfileManager.getAutocomplete(autoCompleteDataEntity, format);
                 }
                 catch (Exception e) {
                     logger.error(e.getMessage(), e);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/ModelBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/ModelBuilder.java
index 58786cb16..e4d14a8ab 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/ModelBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/builders/ModelBuilder.java
@@ -1,17 +1,14 @@
 package eu.eudat.logic.utilities.builders;
 
-import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition;
-import eu.eudat.models.data.components.commons.datafield.*;
-import eu.eudat.models.data.entities.xmlmodels.modeldefinition.DatabaseModelDefinition;
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
+import eu.eudat.commons.types.common.DatabaseModelDefinition;
 import eu.eudat.logic.utilities.interfaces.ModelDefinition;
 import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 public class ModelBuilder {
     private static final Logger logger = LoggerFactory.getLogger(ModelBuilder.class);
@@ -58,98 +55,4 @@ public class ModelBuilder {
         }
         return list;
     }
-
-    public <U> FieldData<U> toFieldData(Object data, String type, Element dataElement) {
-        if (type.equals("combobox")) {
-            if (dataElement != null) {
-                if (dataElement.getAttribute("type").equals("autocomplete")) {
-                    return (FieldData<U>) new AutoCompleteData().fromData(data);
-                } else if (dataElement.getAttribute("type").equals("wordlist"))
-                    return (FieldData<U>) new WordListData().fromData(data);
-            }
-        }
-        if (type.equals("internalDmpEntities")) {
-            if (dataElement != null) {
-                if (dataElement.getAttribute("type").equals("researchers")) {
-                    return (FieldData<U>) new ResearchersAutoCompleteData().fromData(data);
-                }
-				else if (dataElement.getAttribute("type").equals("datasets"))
-					return (FieldData<U>) new DatasetsAutoCompleteData().fromData(data);
-				else if (dataElement.getAttribute("type").equals("dmps"))
-					return (FieldData<U>) new DMPsAutoCompleteData().fromData(data);
-            }
-        }
-        if (type.equals("booleanDecision")) return (FieldData<U>) new BooleanDecisionData().fromData(data);
-        if (type.equals("radiobox")) return (FieldData<U>) new RadioBoxData().fromData(data);
-        if (type.equals("checkBox")) return (FieldData<U>) new CheckBoxData().fromData(data);
-        if (type.equals("freetext")) return (FieldData<U>) new FreeTextData().fromData(data);
-        if (type.equals("textarea")) return (FieldData<U>) new TextAreaData().fromData(data);
-        if (type.equals("richTextarea")) return (FieldData<U>) new RichTextAreaData().fromData(data);
-        if (type.equals("upload")) return (FieldData<U>) new UploadData().fromData(data);
-//        if (type.equals("table")) return (FieldData<U>) new TableData().fromData(data);
-        if (type.equals("datePicker")) return (FieldData<U>) new DatePickerData().fromData(data);
-        if (type.equals("externalDatasets")) return (FieldData<U>) new ExternalDatasetsData().fromData(data);
-        if (type.equals("dataRepositories")) return (FieldData<U>) new DataRepositoriesData().fromData(data);
-        if (type.equals("pubRepositories")) return (FieldData<U>) new DataRepositoriesData().fromData(data);
-        if (type.equals("journalRepositories")) return (FieldData<U>) new DataRepositoriesData().fromData(data);
-        if (type.equals("taxonomies")) return (FieldData<U>) new TaxonomiesData().fromData(data);
-        if (type.equals("licenses")) return (FieldData<U>) new LicensesData().fromData(data);
-        if (type.equals("publications")) return (FieldData<U>) new PublicationsData().fromData(data);
-        if (type.equals("registries")) return (FieldData<U>) new RegistriesData().fromData(data);
-        if (type.equals("services")) return (FieldData<U>) new ServicesData().fromData(data);
-        if (type.equals("tags")) return (FieldData<U>) new TagsData().fromData(data);
-        if (type.equals("researchers")) return (FieldData<U>) new ResearcherData().fromData(data);
-        if (type.equals("organizations")) return (FieldData<U>) new OrganizationsData().fromData(data);
-        if (type.equals("datasetIdentifier")) return (FieldData<U>) new DatasetIdentifierData().fromData(data);
-        if (type.equals("currency")) return (FieldData<U>) new CurrencyData().fromData(data);
-        if (type.equals("validation")) return (FieldData<U>) new ValidationData().fromData(data);
-        return null;
-    }
-
-    public <U> FieldData<U> toFieldData(Object data, String type) {
-        if (type.equals("combobox")) {
-            String comboboxType = (String) ((Map<String, Object>) data).get("type");
-            if (comboboxType.equals("autocomplete")) {
-                return (FieldData<U>) new AutoCompleteData().fromData(data);
-            } else if (comboboxType.equals("wordlist"))
-                return (FieldData<U>) new WordListData().fromData(data);
-        }
-        if (type.equals("internalDmpEntities")) {
-            String internalDmpEntitiesType = (String) ((Map<String, Object>) data).get("type");
-            if (internalDmpEntitiesType.equals("researchers")) {
-                return (FieldData<U>) new ResearchersAutoCompleteData().fromData(data);
-            }
-            else if (internalDmpEntitiesType.equals("datasets")) {
-                return (FieldData<U>) new DatasetsAutoCompleteData().fromData(data);
-            }
-			else if (internalDmpEntitiesType.equals("dmps")) {
-				return (FieldData<U>) new DMPsAutoCompleteData().fromData(data);
-			}
-        }
-        if (type.equals("booleanDecision")) return (FieldData<U>) new BooleanDecisionData().fromData(data);
-        if (type.equals("radiobox")) return (FieldData<U>) new RadioBoxData().fromData(data);
-        if (type.equals("checkBox")) return (FieldData<U>) new CheckBoxData().fromData(data);
-        if (type.equals("freetext")) return (FieldData<U>) new FreeTextData().fromData(data);
-        if (type.equals("textarea")) return (FieldData<U>) new TextAreaData().fromData(data);
-        if (type.equals("richTextarea")) return (FieldData<U>) new RichTextAreaData().fromData(data);
-        if (type.equals("upload")) return (FieldData<U>) new UploadData().fromData(data);
-//        if (type.equals("table")) return (FieldData<U>) new TableData().fromData(data);
-        if (type.equals("datePicker")) return (FieldData<U>) new DatePickerData().fromData(data);
-        if (type.equals("externalDatasets")) return (FieldData<U>) new ExternalDatasetsData().fromData(data);
-        if (type.equals("dataRepositories")) return (FieldData<U>) new DataRepositoriesData().fromData(data);
-        if (type.equals("pubRepositories")) return (FieldData<U>) new DataRepositoriesData().fromData(data);
-        if (type.equals("journalRepositories")) return (FieldData<U>) new DataRepositoriesData().fromData(data);
-        if (type.equals("taxonomies")) return (FieldData<U>) new TaxonomiesData().fromData(data);
-        if (type.equals("licenses")) return (FieldData<U>) new LicensesData().fromData(data);
-        if (type.equals("publications")) return (FieldData<U>) new PublicationsData().fromData(data);
-        if (type.equals("registries")) return (FieldData<U>) new RegistriesData().fromData(data);
-        if (type.equals("services")) return (FieldData<U>) new ServicesData().fromData(data);
-        if (type.equals("tags")) return (FieldData<U>) new TagsData().fromData(data);
-        if (type.equals("researchers")) return (FieldData<U>) new ResearcherData().fromData(data);
-        if (type.equals("organizations")) return (FieldData<U>) new OrganizationsData().fromData(data);
-        if (type.equals("datasetIdentifier")) return (FieldData<U>) new DatasetIdentifierData().fromData(data);
-        if (type.equals("currency")) return (FieldData<U>) new CurrencyData().fromData(data);
-        if (type.equals("validation")) return (FieldData<U>) new ValidationData().fromData(data);
-        return null;
-    }
 }
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 39693ba22..5b5385a60 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
@@ -3,6 +3,8 @@ package eu.eudat.logic.utilities.documents.word;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.eudat.commons.enums.FieldDataComboBoxType;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.*;
 import eu.eudat.data.old.DMP;
 import eu.eudat.data.old.Dataset;
 import eu.eudat.data.old.Organisation;
@@ -12,7 +14,6 @@ import eu.eudat.logic.services.forms.VisibilityRuleService;
 import eu.eudat.logic.utilities.documents.types.ParagraphStyle;
 import eu.eudat.logic.utilities.interfaces.ApplierWithValue;
 import eu.eudat.logic.utilities.json.JavaToJson;
-import eu.eudat.models.data.components.commons.datafield.*;
 import eu.eudat.models.data.pid.PidLink;
 import eu.eudat.models.data.user.components.datasetprofile.Field;
 import eu.eudat.models.data.user.components.datasetprofile.FieldSet;
@@ -409,11 +410,12 @@ public class WordBuilder {
                         }
                     }
                 }
-                if (hasValue && compositeField.getHasCommentField() && compositeField.getCommentFieldValue() != null && !compositeField.getCommentFieldValue().isEmpty() && !createListing) {
-                    XWPFParagraph paragraph = addParagraphContent("<i>Comment:</i>\n"+compositeField.getCommentFieldValue(), mainDocumentPart, ParagraphStyle.HTML, numId, indent);
-//                    CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl();
-//                    number.setVal(BigInteger.valueOf(indent));
-                }
+                //TODO: Dataset Profile
+//                if (hasValue && compositeField.getHasCommentField() && compositeField.getCommentFieldValue() != null && !compositeField.getCommentFieldValue().isEmpty() && !createListing) {
+//                    XWPFParagraph paragraph = addParagraphContent("<i>Comment:</i>\n"+compositeField.getCommentFieldValue(), mainDocumentPart, ParagraphStyle.HTML, numId, indent);
+////                    CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl();
+////                    number.setVal(BigInteger.valueOf(indent));
+//                }
                 if (!hasValue && paragraphPos > -1) {
                     mainDocumentPart.removeBodyElement(paragraphPos);
                 }
@@ -437,7 +439,7 @@ public class WordBuilder {
                     cell = row.createCell();
                 }
                 cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.valueOf("CENTER"));
-                String label = ((FieldData) field.getData()).getLabel();
+                String label = ((BaseFieldDataEntity) field.getData()).getLabel();
                 if(label != null && label != "") {
                     XWPFParagraph paragraph = cell.getParagraphs().get(0);
                     paragraph.setIndentationFirstLine(50);
@@ -467,9 +469,9 @@ public class WordBuilder {
             if (visibilityRuleService.isElementVisible(field.getId()) && field.getExport()) {
                 if (!createListing) {
                     try {
-                        if(field.getViewStyle().getRenderStyle().equals("upload")){
+                        if(field.getViewStyle().getFieldType().equals("upload")){
                             boolean isImage = false;
-                            for(UploadData.Option type: ((UploadData)field.getData()).getTypes()){
+                            for(UploadDataEntity.Option type: ((UploadDataEntity)field.getData()).getTypes()){
                                 String fileFormat = type.getValue();
                                 if(IMAGE_TYPE_MAP.containsKey(fileFormat)){
                                     isImage = true;
@@ -491,12 +493,12 @@ public class WordBuilder {
                         else if (field.getValue() != null && !field.getValue().toString().isEmpty()) {
                             this.indent = indent;
                             String format = this.formatter(field);
-                            if (field.getViewStyle().getRenderStyle().equals("tags")) {
+                            if (field.getViewStyle().getFieldType().equals("tags")) {
                                 format = getCommaSeparatedFormatsFromJson(format, "name");
-                            } else if (field.getViewStyle().getRenderStyle().equals("combobox") && field.getData() instanceof AutoCompleteData) {
+                            } else if (field.getViewStyle().getFieldType().equals("combobox") && field.getData() instanceof AutoCompleteDataEntity) {
                                 format = getCommaSeparatedFormatsFromJson(format, "label");
                             }
-                            boolean isResearcher = field.getViewStyle().getRenderStyle().equals("researchers");
+                            boolean isResearcher = field.getViewStyle().getFieldType().equals("researchers");
                             if(format != null && !format.isEmpty()){
                                 Object hasMultiAutoComplete = mapper.convertValue(field.getData(), Map.class).get("multiAutoComplete");
                                 boolean isMultiAutoComplete = hasMultiAutoComplete != null && (boolean)hasMultiAutoComplete;
@@ -528,7 +530,7 @@ public class WordBuilder {
                                                 hasMultiplicityItems = false;
                                             }
                                             else{
-                                                XWPFParagraph paragraph = addCellContent(format, mainDocumentPart, field.getViewStyle().getRenderStyle().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent, numOfRows, numOfCells, numOfValuesInCell);
+                                                XWPFParagraph paragraph = addCellContent(format, mainDocumentPart, field.getViewStyle().getFieldType().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent, numOfRows, numOfCells, numOfValuesInCell);
                                                 numOfValuesInCell++;
                                                 if(orcidResearcher){
                                                     XWPFHyperlinkRun run = paragraph.createHyperlinkRun("https://orcid.org/" + orcId);
@@ -556,7 +558,7 @@ public class WordBuilder {
                                 hasValue = true;
                             }
                             else{
-                                XWPFParagraph paragraph = addCellContent(format, mainDocumentPart, field.getViewStyle().getRenderStyle().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent, numOfRows, numOfCells, 0);
+                                XWPFParagraph paragraph = addCellContent(format, mainDocumentPart, field.getViewStyle().getFieldType().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent, numOfRows, numOfCells, 0);
                                 if (paragraph != null) {
                                     hasValue = true;
                                 }
@@ -611,9 +613,9 @@ public class WordBuilder {
             if (visibilityRuleService.isElementVisible(field.getId()) && field.getExport()) {
                 if (!createListing) {
                     try {
-                        if(field.getViewStyle().getRenderStyle().equals("upload")){
+                        if(field.getViewStyle().getFieldType().equals("upload")){
                             boolean isImage = false;
-                            for(UploadData.Option type: ((UploadData)field.getData()).getTypes()){
+                            for(UploadDataEntity.Option type: ((UploadDataEntity)field.getData()).getTypes()){
                                 String fileFormat = type.getValue();
                                 if(IMAGE_TYPE_MAP.containsKey(fileFormat)){
                                     isImage = true;
@@ -637,12 +639,12 @@ public class WordBuilder {
                         else if (field.getValue() != null && !field.getValue().toString().isEmpty()) {
                             this.indent = indent;
                             String format = this.formatter(field);
-                            if (field.getViewStyle().getRenderStyle().equals("tags")) {
+                            if (field.getViewStyle().getFieldType().equals("tags")) {
                                 format = getCommaSeparatedFormatsFromJson(format, "name");
-                            } else if (field.getViewStyle().getRenderStyle().equals("combobox") && field.getData() instanceof AutoCompleteData) {
+                            } else if (field.getViewStyle().getFieldType().equals("combobox") && field.getData() instanceof AutoCompleteDataEntity) {
                                 format = getCommaSeparatedFormatsFromJson(format, "label");
                             }
-                            switch (field.getViewStyle().getRenderStyle()) {
+                            switch (field.getViewStyle().getFieldType().getValue()) {
                                 case "organizations":
                                 case "externalDatasets":
                                 case "publications":
@@ -695,7 +697,7 @@ public class WordBuilder {
                                     }
                                     break;
                                 default:
-                                    boolean isResearcher = field.getViewStyle().getRenderStyle().equals("researchers");
+                                    boolean isResearcher = field.getViewStyle().getFieldType().equals("researchers");
                                     if(format != null && !format.isEmpty()){
                                         Object hasMultiAutoComplete = mapper.convertValue(field.getData(), Map.class).get("multiAutoComplete");
                                         boolean isMultiAutoComplete = hasMultiAutoComplete != null && (boolean)hasMultiAutoComplete;
@@ -725,7 +727,7 @@ public class WordBuilder {
                                                         hasMultiplicityItems = false;
                                                     }
                                                     else{
-                                                        XWPFParagraph paragraph = addParagraphContent(format, mainDocumentPart, field.getViewStyle().getRenderStyle().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent);
+                                                        XWPFParagraph paragraph = addParagraphContent(format, mainDocumentPart, field.getViewStyle().getFieldType().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent);
                                                         if(orcidResearcher){
                                                             XWPFHyperlinkRun run = paragraph.createHyperlinkRun("https://orcid.org/" + orcId);
                                                             run.setText(orcId);
@@ -754,7 +756,7 @@ public class WordBuilder {
                                             hasValue = true;
                                         }
                                         else {
-                                            XWPFParagraph paragraph = addParagraphContent(format, mainDocumentPart, field.getViewStyle().getRenderStyle().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent);
+                                            XWPFParagraph paragraph = addParagraphContent(format, mainDocumentPart, field.getViewStyle().getFieldType().equals("richTextarea") ? ParagraphStyle.HTML : ParagraphStyle.TEXT, numId, indent);
                                             if (paragraph != null) {
 //                                                CTDecimalNumber number = paragraph.getCTP().getPPr().getNumPr().addNewIlvl();
 //                                                number.setVal(BigInteger.valueOf(indent));
@@ -866,31 +868,31 @@ public class WordBuilder {
     }
 
     private String formatter(Field field) throws IOException {
-        String comboboxType = null;
+        FieldDataComboBoxType comboboxType = null;
         if (field.getValue() == null) {
             return null;
         }
-        switch (field.getViewStyle().getRenderStyle()) {
-            case "researchers":
-            case "projects":
-            case "organizations":
-            case "externalDatasets":
-            case "dataRepositories":
-            case "pubRepositories":
-            case "journalRepositories":
-            case "taxonomies":
-            case "licenses":
-            case "publications":
-            case "registries":
-            case "services":
-            case "tags":
-            case "currency":
-                comboboxType = "autocomplete";
-            case "combobox": {
+        switch (field.getViewStyle().getFieldType()) {
+            case RESEARCHERS:
+//            case "projects": //TODO: Description Templatedefinition
+            case ORGANIZATIONS:
+            case EXTERNAL_DATASETS:
+            case DATA_REPOSITORIES:
+            case PUB_REPOSITORIES:
+            case JOURNAL_REPOSITORIES:
+            case TAXONOMIES:
+            case LICENSES:
+            case PUBLICATIONS:
+            case REGISTRIES:
+            case SERVICES:
+            case TAGS:
+            case CURRENCY:
+                comboboxType = FieldDataComboBoxType.Autocomplete;
+            case COMBO_BOX: {
                 if (comboboxType == null) {
-                    comboboxType = ((ComboBoxData) field.getData()).getType();
+                    comboboxType = ((ComboBoxDataEntity) field.getData()).getType();
                 }
-                if (comboboxType.equals("autocomplete")) {
+                if (comboboxType.equals(FieldDataComboBoxType.Autocomplete)) {
                     mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
                     if (field.getValue() == null) return null;
                     List<Map<String, Object>> mapList = new ArrayList<>();
@@ -918,12 +920,12 @@ public class WordBuilder {
                         index++;
                     }
                     return sb.toString();
-                } else if (comboboxType.equals("wordlist")) {
-                    WordListData wordListData = (WordListData) field.getData();
+                } else if (comboboxType.equals(FieldDataComboBoxType.Wordlist)) {
+                    WordListDataEntity wordListDataEntity = (WordListDataEntity) field.getData();
                     if (field.getValue() != null){
-                        ComboBoxData.Option selectedOption = null;
-                        if (!wordListData.getOptions().isEmpty()) {
-                            for (ComboBoxData.Option option : wordListData.getOptions()) {
+                        ComboBoxDataEntity.Option selectedOption = null;
+                        if (!wordListDataEntity.getOptions().isEmpty()) {
+                            for (ComboBoxDataEntity.Option option : wordListDataEntity.getOptions()) {
                                 if (option.getValue().equals(field.getValue())) {
                                     selectedOption = option;
                                 }
@@ -934,18 +936,17 @@ public class WordBuilder {
                     return "";
                 }
             }
-            case "booleanDecision":
+            case BOOLEAN_DECISION:
                 if (field.getValue() != null && field.getValue().equals("true")) return "Yes";
                 if (field.getValue() != null && field.getValue().equals("false")) return "No";
                 return null;
-            case "radiobox":
+            case RADIO_BOX:
                 return field.getValue() != null ? field.getValue().toString() : null;
-            case "checkBox":
-                CheckBoxData data = (CheckBoxData) field.getData();
+            case CHECK_BOX:
+                CheckBoxDataEntity data = (CheckBoxDataEntity) field.getData();
                 if (field.getValue() == null || field.getValue().equals("false")) return null;
                 return data.getLabel();
-            case "datepicker":
-            case "datePicker":{
+            case DATE_PICKER:{
                 Instant instant;
                 if (!((String)field.getValue()).isEmpty()) {
                     try {
@@ -957,12 +958,12 @@ public class WordBuilder {
                 }
                 return (String) field.getValue();
             }
-            case "freetext":
-            case "textarea":
-            case "richTextarea":
+            case FREE_TEXT:
+            case TEXT_AREA:
+            case RICH_TEXT_AREA:
                 return field.getValue() != null ? field.getValue().toString(): "";
-            case "datasetIdentifier":
-            case "validation":
+            case DATASET_IDENTIFIER:
+            case VALIDATION:
                 if (field.getValue() != null && !field.getValue().toString().isEmpty()) {
                     Map<String, String> identifierData;
                     try {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/ExportXmlBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/ExportXmlBuilder.java
index c34504d31..1d828eed0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/ExportXmlBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/ExportXmlBuilder.java
@@ -3,7 +3,7 @@ package eu.eudat.logic.utilities.documents.xml;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import eu.eudat.logic.services.forms.VisibilityRuleService;
 import eu.eudat.commons.types.xml.XmlBuilder;
-import eu.eudat.models.data.components.commons.datafield.ExternalDatasetsData;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.ExternalDatasetDataEntity;
 import eu.eudat.models.data.user.components.datasetprofile.Field;
 import eu.eudat.models.data.user.components.datasetprofile.FieldSet;
 import eu.eudat.models.data.user.components.datasetprofile.Section;
@@ -101,8 +101,8 @@ public class ExportXmlBuilder {
             if (visibilityRuleService.isElementVisible(field.getId())) {
                 Element elementField = element.createElement("field");
                 elementField.setAttribute("id", field.getId());
-                if (field.getViewStyle().getRenderStyle().equals("externalDatasets")) {
-                    elementField.setAttribute("type", ((ExternalDatasetsData)field.getData()).getType());
+                if (field.getViewStyle().getFieldType().equals("externalDatasets")) {
+                    elementField.setAttribute("type", ((ExternalDatasetDataEntity)field.getData()).getType().getValue());
                 }
                 if (field.getValue() != null) {
                     Element valueField = element.createElement("value");
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 b826f6322..72d1e9f5f 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
@@ -1,9 +1,8 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml;
 
 
+import eu.eudat.commons.types.descriptiontemplate.fielddata.*;
 import eu.eudat.models.data.admin.components.datasetprofile.Page;
-import eu.eudat.models.data.components.commons.ViewStyle;
-import eu.eudat.models.data.components.commons.datafield.*;
 import eu.eudat.models.data.user.components.datasetprofile.Field;
 import eu.eudat.models.data.user.components.datasetprofile.FieldSet;
 import eu.eudat.models.data.user.components.datasetprofile.Section;
@@ -194,11 +193,8 @@ public class ExportXmlBuilderDatasetProfile {
                 visible.setAttribute("style", "" + field.getVisible().getStyle());
                 field.getVisible().getRules().forEach(rule -> {
                     Element ruleChild = element.createElement("rule");
-                    ruleChild.setAttribute("ruleStyle", "" + rule.getRuleStyle());
                     ruleChild.setAttribute("target", "" + rule.getTarget());
-                    ruleChild.setAttribute("type", "" + rule.getRuleType());
                     Element ruleChildValue = element.createElement("value");
-                    ruleChildValue.setAttribute("type", "" + rule.getValueType());
                     ruleChildValue.setTextContent(rule.getValue());
                     ruleChild.appendChild(ruleChildValue);
                     visible.appendChild(ruleChild);
@@ -209,39 +205,38 @@ public class ExportXmlBuilderDatasetProfile {
             if (field.getViewStyle() != null) {
                 Element viewStyle = element.createElement("viewStyle");
                 viewStyle.setAttribute("cssClass", field.getViewStyle().getCssClass());
-                viewStyle.setAttribute("renderStyle", field.getViewStyle().getRenderStyle());
+                viewStyle.setAttribute("renderStyle", field.getViewStyle().getFieldType().getValue());
                 elementField.appendChild(viewStyle);
             }
 
             if (field.getData() != null) {
                 Element dataOut = element.createElement("data");
-                ViewStyle.Type viewStyleType = ViewStyle.Type.fromName(field.getViewStyle().getRenderStyle());
-                switch (viewStyleType) {
+                switch (field.getViewStyle().getFieldType()) {
                     case COMBO_BOX:
-                        ComboBoxData comboBoxDataObject = (ComboBoxData) field.getData();
-                        if (comboBoxDataObject.getType().equals("wordlist")) {
-                            WordListData wordListDataObject = (WordListData) field.getData();
-                            dataOut.setAttribute("label", wordListDataObject.getLabel());
-                            dataOut.setAttribute("type", wordListDataObject.getType());
-                            dataOut.setAttribute("multiList", wordListDataObject.getMultiList().toString());
+                        ComboBoxDataEntity comboBoxDataEntityObject = (ComboBoxDataEntity) field.getData();
+                        if (comboBoxDataEntityObject.getType().equals("wordlist")) {
+                            WordListDataEntity wordListDataEntityObject = (WordListDataEntity) field.getData();
+                            dataOut.setAttribute("label", wordListDataEntityObject.getLabel());
+                            dataOut.setAttribute("type", wordListDataEntityObject.getType().getValue());
+                            dataOut.setAttribute("multiList", wordListDataEntityObject.getMultiList().toString());
                             Element options = element.createElement("options");
-                            wordListDataObject.getOptions().forEach(optionChildFor -> {
+                            wordListDataEntityObject.getOptions().forEach(optionChildFor -> {
                                 Element optionChild = element.createElement("option");
                                 optionChild.setAttribute("label", optionChildFor.getLabel());
                                 optionChild.setAttribute("value", optionChildFor.getValue());
                                 options.appendChild(optionChild);
                             });
                             dataOut.appendChild(options);
-                        } else if (comboBoxDataObject.getType().equals("autocomplete")) {
-                            AutoCompleteData autoCompleteDataObject = (AutoCompleteData) field.getData();
-                            dataOut.setAttribute("label", autoCompleteDataObject.getLabel());
-                            dataOut.setAttribute("type", autoCompleteDataObject.getType());
-                            dataOut.setAttribute("multiAutoComplete", autoCompleteDataObject.getMultiAutoComplete().toString());
-                            for (AutoCompleteData.AutoCompleteSingleData singleData: autoCompleteDataObject.getAutoCompleteSingleDataList()) {
+                        } else if (comboBoxDataEntityObject.getType().equals("autocomplete")) {
+                            AutoCompleteDataEntity autoCompleteDataEntityObject = (AutoCompleteDataEntity) field.getData();
+                            dataOut.setAttribute("label", autoCompleteDataEntityObject.getLabel());
+                            dataOut.setAttribute("type", autoCompleteDataEntityObject.getType().getValue());
+                            dataOut.setAttribute("multiAutoComplete", autoCompleteDataEntityObject.getMultiAutoComplete().toString());
+                            for (AutoCompleteDataEntity.AutoCompleteSingleData singleData: autoCompleteDataEntityObject.getAutoCompleteSingleDataList()) {
                                 Element singleItem = element.createElement("autocompleteSingle");
                                 singleItem.setAttribute("optionsRoot", singleData.getOptionsRoot());
                                 singleItem.setAttribute("url", singleData.getUrl());
-                                singleItem.setAttribute("autoCompleteType", Integer.toString(singleData.getAutocompleteType()));
+                                singleItem.setAttribute("autoCompleteType", Integer.toString(singleData.getAutocompleteType().getValue()));
                                 if (singleData.getAutoCompleteOptions() != null) {
                                     Element optionChild = element.createElement("option");
                                     optionChild.setAttribute("label", singleData.getAutoCompleteOptions().getLabel());
@@ -253,11 +248,11 @@ public class ExportXmlBuilderDatasetProfile {
                         }
                         break;
                     case UPLOAD:
-                        UploadData uploadDataObject = (UploadData) field.getData();
-                        dataOut.setAttribute("label", uploadDataObject.getLabel());
-                        dataOut.setAttribute("maxFileSizeInMB", String.valueOf(uploadDataObject.getMaxFileSizeInMB()));
+                        UploadDataEntity uploadEntityObject = (UploadDataEntity) field.getData();
+                        dataOut.setAttribute("label", uploadEntityObject.getLabel());
+                        dataOut.setAttribute("maxFileSizeInMB", String.valueOf(uploadEntityObject.getMaxFileSizeInMB()));
                         Element types = element.createElement("types");
-                        uploadDataObject.getTypes().forEach(type -> {
+                        uploadEntityObject.getTypes().forEach(type -> {
                             Element optionChild = element.createElement("option");
                             optionChild.setAttribute("label", type.getLabel());
                             optionChild.setAttribute("value", type.getValue());
@@ -266,15 +261,15 @@ public class ExportXmlBuilderDatasetProfile {
                         dataOut.appendChild(types);
                         break;
                     case BOOLEAN_DECISION:
-                        BooleanDecisionData booleanDecisionDataObject = (BooleanDecisionData) field.getData();
-                        dataOut.setAttribute("label", booleanDecisionDataObject.getLabel());
+                        BooleanDecisionDataEntity booleanDecisionDataEntityObject = (BooleanDecisionDataEntity) field.getData();
+                        dataOut.setAttribute("label", booleanDecisionDataEntityObject.getLabel());
                         break;
                     case RADIO_BOX:
-                        RadioBoxData radioBoxDataObject = (RadioBoxData) field.getData();
-                        dataOut.setAttribute("label", radioBoxDataObject.getLabel());
+                        RadioBoxDataEntity radioBoxDataEntityObject = (RadioBoxDataEntity) field.getData();
+                        dataOut.setAttribute("label", radioBoxDataEntityObject.getLabel());
 
                         Element options = element.createElement("options");
-                        radioBoxDataObject.getOptions().forEach(optionChildFor -> {
+                        radioBoxDataEntityObject.getOptions().forEach(optionChildFor -> {
                             Element optionChild = element.createElement("option");
                             optionChild.setAttribute("label", optionChildFor.getLabel());
                             optionChild.setAttribute("value", optionChildFor.getValue());
@@ -290,75 +285,75 @@ public class ExportXmlBuilderDatasetProfile {
                     case DATASET_IDENTIFIER:
                     case CURRENCY:
                     case TAGS:
-                        FieldData fieldDataObject = (FieldData) field.getData();
-                        dataOut.setAttribute("label", fieldDataObject.getLabel());
+                        BaseFieldDataEntity baseFieldDataObject = (BaseFieldDataEntity) field.getData();
+                        dataOut.setAttribute("label", baseFieldDataObject.getLabel());
                         break;
                     case INTERNAL_DMP_ENTRIES:
-                        InternalDmpEntitiesData internalDmpEntitiesData = (InternalDmpEntitiesData) field.getData();
+                        InternalDmpBaseDataEntity internalDmpEntitiesData = (InternalDmpBaseDataEntity) field.getData();
                         dataOut.setAttribute("label", internalDmpEntitiesData.getLabel());
-                        dataOut.setAttribute("type", internalDmpEntitiesData.getType());
+                        dataOut.setAttribute("type", internalDmpEntitiesData.getType().getValue());
                         switch (internalDmpEntitiesData.getType()) {
-                            case "researchers":
-                                ResearchersAutoCompleteData researchersAutoCompleteData = (ResearchersAutoCompleteData) internalDmpEntitiesData;
+                            case Researchers:
+                                ResearcherAutoCompleteDataEntity researchersAutoCompleteData = (ResearcherAutoCompleteDataEntity) internalDmpEntitiesData;
                                 dataOut.setAttribute("multiAutocomplete", researchersAutoCompleteData.getMultiAutoComplete().toString());
                                 break;
-                            case "datasets":
-                                DatasetsAutoCompleteData datasetsAutoCompleteData = (DatasetsAutoCompleteData) internalDmpEntitiesData;
-                                dataOut.setAttribute("multiAutocomplete", datasetsAutoCompleteData.getMultiAutoComplete().toString());
+                            case Datasets:
+                                DatasetAutoCompleteDataEntity datasetAutoCompleteDataEntity = (DatasetAutoCompleteDataEntity) internalDmpEntitiesData;
+                                dataOut.setAttribute("multiAutocomplete", datasetAutoCompleteDataEntity.getMultiAutoComplete().toString());
                                 break;
-                            case "dmps":
-                                DMPsAutoCompleteData dmPsAutoCompleteData = (DMPsAutoCompleteData) internalDmpEntitiesData;
-                                dataOut.setAttribute("multiAutocomplete", dmPsAutoCompleteData.getMultiAutoComplete().toString());
+                            case Dmps:
+                                DmpAutoCompleteDataEntity dmpAutoCompleteDataEntity = (DmpAutoCompleteDataEntity) internalDmpEntitiesData;
+                                dataOut.setAttribute("multiAutocomplete", dmpAutoCompleteDataEntity.getMultiAutoComplete().toString());
                                 break;
                         }
                         break;
                     case EXTERNAL_DATASETS:
-                        ExternalDatasetsData externalDatasetsData = (ExternalDatasetsData) field.getData();
-                        dataOut.setAttribute("label", externalDatasetsData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", externalDatasetsData.getMultiAutoComplete().toString());
-                        dataOut.setAttribute("type", externalDatasetsData.getType());
+                        ExternalDatasetDataEntity externalDatasetDataEntity = (ExternalDatasetDataEntity) field.getData();
+                        dataOut.setAttribute("label", externalDatasetDataEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", externalDatasetDataEntity.getMultiAutoComplete().toString());
+                        dataOut.setAttribute("type", externalDatasetDataEntity.getType().getValue());
                         break;
                     case DATA_REPOSITORIES:
                     case JOURNAL_REPOSITORIES:
                     case PUB_REPOSITORIES:
-                        DataRepositoriesData dataRepositoriesData = (DataRepositoriesData) field.getData();
-                        dataOut.setAttribute("label", dataRepositoriesData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", dataRepositoriesData.getMultiAutoComplete().toString());
+                        DataRepositoryDataEntity dataRepositoryDataEntity = (DataRepositoryDataEntity) field.getData();
+                        dataOut.setAttribute("label", dataRepositoryDataEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", dataRepositoryDataEntity.getMultiAutoComplete().toString());
                         break;
                     case TAXONOMIES:
-                        TaxonomiesData taxonomiesData = (TaxonomiesData) field.getData();
-                        dataOut.setAttribute("label", taxonomiesData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", taxonomiesData.getMultiAutoComplete().toString());
+                        TaxonomyDataEntity taxonomyDataEntity = (TaxonomyDataEntity) field.getData();
+                        dataOut.setAttribute("label", taxonomyDataEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", taxonomyDataEntity.getMultiAutoComplete().toString());
                         break;
                     case LICENSES:
-                        LicensesData licensesData = (LicensesData) field.getData();
+                        LicenseDataEntity licensesData = (LicenseDataEntity) field.getData();
                         dataOut.setAttribute("label", licensesData.getLabel());
                         dataOut.setAttribute("multiAutocomplete", licensesData.getMultiAutoComplete().toString());
                         break;
                     case PUBLICATIONS:
-                        PublicationsData publicationsData = (PublicationsData) field.getData();
-                        dataOut.setAttribute("label", publicationsData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", publicationsData.getMultiAutoComplete().toString());
+                        PublicationDataEntity publicationDataEntity = (PublicationDataEntity) field.getData();
+                        dataOut.setAttribute("label", publicationDataEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", publicationDataEntity.getMultiAutoComplete().toString());
                         break;
                     case ORGANIZATIONS:
-                        OrganizationsData organizationsData = (OrganizationsData) field.getData();
-                        dataOut.setAttribute("label", organizationsData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", organizationsData.getMultiAutoComplete().toString());
+                        OrganizationDataEntity organizationDataEntity = (OrganizationDataEntity) field.getData();
+                        dataOut.setAttribute("label", organizationDataEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", organizationDataEntity.getMultiAutoComplete().toString());
                         break;
                     case RESEARCHERS:
-                        ResearcherData researcherData = (ResearcherData) field.getData();
-                        dataOut.setAttribute("label", researcherData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", researcherData.getMultiAutoComplete().toString());
+                        ResearcherDataEntity researcherDataEntity = (ResearcherDataEntity) field.getData();
+                        dataOut.setAttribute("label", researcherDataEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", researcherDataEntity.getMultiAutoComplete().toString());
                         break;
                     case REGISTRIES:
-                        RegistriesData registriesData = (RegistriesData) field.getData();
-                        dataOut.setAttribute("label", registriesData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", registriesData.getMultiAutoComplete().toString());
+                        RegistryDataEntity registriesEntity = (RegistryDataEntity) field.getData();
+                        dataOut.setAttribute("label", registriesEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", registriesEntity.getMultiAutoComplete().toString());
                         break;
                     case SERVICES:
-                        ServicesData servicesData = (ServicesData) field.getData();
-                        dataOut.setAttribute("label", servicesData.getLabel());
-                        dataOut.setAttribute("multiAutocomplete", servicesData.getMultiAutoComplete().toString());
+                        ServiceDataEntity serviceDataEntity = (ServiceDataEntity) field.getData();
+                        dataOut.setAttribute("label", serviceDataEntity.getLabel());
+                        dataOut.setAttribute("multiAutocomplete", serviceDataEntity.getMultiAutoComplete().toString());
                         break;
 
                 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java
index 3bef7e122..52676158e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java
@@ -1,7 +1,7 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel;
 
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.commons.enums.DescriptionTemplateStatus;
 
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
@@ -57,7 +57,7 @@ public class DatasetProfile {
     public eu.eudat.models.data.admin.composite.DatasetProfile toAdminCompositeModel(String label){
         eu.eudat.models.data.admin.composite.DatasetProfile newDatasetEntityProfile = new eu.eudat.models.data.admin.composite.DatasetProfile();
         newDatasetEntityProfile.setLabel(label);
-        newDatasetEntityProfile.setStatus(DescriptionTemplate.Status.SAVED.getValue());
+        newDatasetEntityProfile.setStatus(DescriptionTemplateStatus.Draft.getValue());
         newDatasetEntityProfile.setDescription(description);
         newDatasetEntityProfile.setLanguage(language);
         newDatasetEntityProfile.setType(type);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/DefaultValue.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/DefaultValue.java
index f06ddd98e..b71634b25 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/DefaultValue.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/DefaultValue.java
@@ -1,5 +1,6 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.Fields;
 
+import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlRootElement;
 
@@ -27,8 +28,8 @@ public class DefaultValue {
         this.value = value;
     }
 
-    public eu.eudat.models.data.components.commons.DefaultValue toAdminCompositeModelSection(){
-        eu.eudat.models.data.components.commons.DefaultValue defaultValueEntity =new eu.eudat.models.data.components.commons.DefaultValue();
+    public DefaultValueEntity toAdminCompositeModelSection(){
+        DefaultValueEntity defaultValueEntity =new DefaultValueEntity();
         defaultValueEntity.setValue(value);
         defaultValueEntity.setType(type);
         return defaultValueEntity;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java
index dd6dde0e9..e05f420bf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java
@@ -1,7 +1,8 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.Fields;
 
-import eu.eudat.logic.utilities.builders.ModelBuilder;
-import eu.eudat.models.data.components.commons.datafield.FieldData;
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.FieldDataHelper;
 import org.w3c.dom.Element;
 
 import jakarta.xml.bind.annotation.XmlAttribute;
@@ -125,7 +126,7 @@ public class Field {
         fieldEntity.setDefaultValue(this.defaultValue.toAdminCompositeModelSection());
         fieldEntity.setVisible(this.visible.toAdminCompositeModelSection());
         fieldEntity.setViewStyle(this.viewStyle.toAdminCompositeModelSection());
-        FieldData data = new ModelBuilder().toFieldData(null, this.viewStyle.getRenderStyle(), (Element) this.data);
+        BaseFieldDataEntity data = new FieldDataHelper().toFieldData(null, FieldType.of(this.viewStyle.getRenderStyle()), (Element) this.data);
 //        fieldEntity.setData( data.fromXml((Element) this.data));
         if (data != null) {
             fieldEntity.setData(data.toMap((Element) this.data));
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Rule.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Rule.java
index b314edb11..ae9e43e11 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Rule.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Rule.java
@@ -1,11 +1,12 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.Fields;
 
+import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "rule")
-public class Rule{
+public class Rule {
 
     private String ruleStyle;
     private String target;
@@ -45,12 +46,9 @@ public class Rule{
         this.value = value;
     }
 
-    public eu.eudat.models.data.components.commons.Rule toAdminCompositeModelSection(){
-        eu.eudat.models.data.components.commons.Rule ruleEntity = new eu.eudat.models.data.components.commons.Rule();
-        ruleEntity.setRuleStyle(ruleStyle);
+    public RuleEntity toAdminCompositeModelSection(){
+        RuleEntity ruleEntity = new RuleEntity();
         ruleEntity.setTarget(target);
-        ruleEntity.setRuleType(type);
-        ruleEntity.setValueType(value.getType());
         ruleEntity.setValue(value.getValue());
     return ruleEntity;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/ViewStyle.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/ViewStyle.java
index 97d6092fe..93fb78183 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/ViewStyle.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/ViewStyle.java
@@ -1,6 +1,8 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.Fields;
 
 
+import eu.eudat.commons.enums.FieldType;
+import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlRootElement;
 
@@ -27,10 +29,10 @@ public class ViewStyle {
         this.renderStyle = renderStyle;
     }
 
-    public eu.eudat.models.data.components.commons.ViewStyle toAdminCompositeModelSection(){
-        eu.eudat.models.data.components.commons.ViewStyle viewStyleEntity = new eu.eudat.models.data.components.commons.ViewStyle();
-        viewStyleEntity.setCssClass(this.cssClass);
-        viewStyleEntity.setRenderStyle(this.renderStyle);
-        return viewStyleEntity;
+    public FieldDescriptionEntity toAdminCompositeModelSection(){
+        FieldDescriptionEntity fieldDescriptionEntity = new FieldDescriptionEntity();
+        fieldDescriptionEntity.setCssClass(this.cssClass);
+        fieldDescriptionEntity.setFieldType(FieldType.of(this.renderStyle));
+        return fieldDescriptionEntity;
     }
 }
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Visible.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Visible.java
index 31a4317e1..786196c46 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Visible.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Visible.java
@@ -1,5 +1,7 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel.Fields;
 
+import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
+import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
@@ -29,11 +31,11 @@ public class Visible {
         this.rule = rule;
     }
 
-    public eu.eudat.models.data.components.commons.Visibility toAdminCompositeModelSection(){
-        eu.eudat.models.data.components.commons.Visibility visibilityEntity = new eu.eudat.models.data.components.commons.Visibility();
+    public VisibilityEntity toAdminCompositeModelSection(){
+        VisibilityEntity visibilityEntity = new VisibilityEntity();
         visibilityEntity.setStyle(this.style);
         if(this.rule!=null) {
-            List<eu.eudat.models.data.components.commons.Rule> ruleListEntity = new LinkedList<>();
+            List<RuleEntity> ruleListEntity = new LinkedList<>();
             for (Rule xmlRule : this.rule) {
                 ruleListEntity.add(xmlRule.toAdminCompositeModelSection());
             }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java
index fee53ef9c..5af8e9470 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Multiplicity.java
@@ -1,5 +1,6 @@
 package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel;
 
+import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlRootElement;
 
@@ -47,8 +48,8 @@ public class Multiplicity {
         this.tableView = tableView;
     }
 
-    public eu.eudat.models.data.components.commons.Multiplicity toAdminCompositeModelSection() {
-        eu.eudat.models.data.components.commons.Multiplicity multiplicityEntity = new eu.eudat.models.data.components.commons.Multiplicity();
+    public MultiplicityEntity toAdminCompositeModelSection() {
+        MultiplicityEntity multiplicityEntity = new MultiplicityEntity();
         multiplicityEntity.setMax(max);
         multiplicityEntity.setMin(min);
         multiplicityEntity.setPlaceholder(placeholder);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelBuilderCollector.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelBuilderCollector.java
index b0c6d99ec..4b1102b2f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelBuilderCollector.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelBuilderCollector.java
@@ -1,5 +1,7 @@
 package eu.eudat.logic.utilities.helpers;
 
+import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
+import eu.eudat.commons.types.descriptiontemplate.SectionEntity;
 import eu.eudat.models.data.user.components.commons.Rule;
 
 import java.util.LinkedList;
@@ -10,21 +12,20 @@ public class ModelBuilderCollector {
 
 
     /**
-     * @param sections
+     * @param sectionEntities
      * @return
      */
-    public static List<Rule> collectRules(List<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section> sections) {
+    public static List<Rule> collectRules(List<SectionEntity> sectionEntities) {
         List<Rule> rules = new LinkedList();
-        for (eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section section : sections) {
-            if (!section.getSections().isEmpty()) {
-                rules.addAll(collectRules(section.getSections()));
+        for (SectionEntity sectionEntity : sectionEntities) {
+            if (!sectionEntity.getSections().isEmpty()) {
+                rules.addAll(collectRules(sectionEntity.getSections()));
             }
             rules.addAll(
-                    section.getFieldSets().stream()
+                    sectionEntity.getFieldSets().stream()
                             .map(fieldset -> fieldset.getFields())
                             .flatMap(List::stream)
-                            .map(field -> getRulesFromField(field.getId(), field.getVisible()
-                                    .getRules()))
+                            .map(field -> getRulesFromField(field.getId(), field.getVisibilityRules()))
                             .flatMap(List::stream)
                             .collect(Collectors.toList()));
         }
@@ -32,9 +33,9 @@ public class ModelBuilderCollector {
         return rules;
     }
 
-    private static List<Rule> getRulesFromField(String id, List<eu.eudat.models.data.components.commons.Rule> rules) {
+    private static List<Rule> getRulesFromField(String id, List<RuleEntity> rules) {
         List<Rule> modelRules = new LinkedList();
-        for (eu.eudat.models.data.components.commons.Rule rule : rules) {
+        for (RuleEntity rule : rules) {
             Rule modelRule = new Rule().fromDefinitionRule(rule);
             modelRule.setSourceField(id);
             modelRules.add(modelRule);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelSerializer.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelSerializer.java
index b6b975c66..aa35505f5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelSerializer.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/helpers/ModelSerializer.java
@@ -1,9 +1,8 @@
 package eu.eudat.logic.utilities.helpers;
 
 
-import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition;
-import eu.eudat.models.data.entities.xmlmodels.modeldefinition.DatabaseModelDefinition;
+import eu.eudat.commons.types.common.DatabaseModelDefinition;
 
-public interface ModelSerializer<T extends DatabaseViewStyleDefinition, U extends DatabaseModelDefinition> {
+public interface ModelSerializer<T, U extends DatabaseModelDefinition> {
     void fromDatabaseDefinition(T viewStyle, U model);
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/DatabaseDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/DatabaseDefinition.java
deleted file mode 100644
index c28614949..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/DatabaseDefinition.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.eudat.logic.utilities.interfaces;
-
-
-public interface DatabaseDefinition {
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelDefinition.java
index b788896f4..b5540a349 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelDefinition.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelDefinition.java
@@ -1,6 +1,6 @@
 package eu.eudat.logic.utilities.interfaces;
 
-import eu.eudat.models.data.entities.xmlmodels.modeldefinition.DatabaseModelDefinition;
+import eu.eudat.commons.types.common.DatabaseModelDefinition;
 
 public interface ModelDefinition<T extends DatabaseModelDefinition> {
     T toDatabaseDefinition(T item);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelSerializer.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelSerializer.java
index 0762250d2..a3d624094 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelSerializer.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ModelSerializer.java
@@ -1,9 +1,8 @@
 package eu.eudat.logic.utilities.interfaces;
 
 
-import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition;
-import eu.eudat.models.data.entities.xmlmodels.modeldefinition.DatabaseModelDefinition;
+import eu.eudat.commons.types.common.DatabaseModelDefinition;
 
-public interface ModelSerializer<T extends DatabaseViewStyleDefinition, U extends DatabaseModelDefinition> {
+public interface ModelSerializer<T, U extends DatabaseModelDefinition> {
     void fromDatabaseDefinition(T viewStyle, U model);
 }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ViewStyleDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ViewStyleDefinition.java
index 096c6d43c..999c1a994 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ViewStyleDefinition.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/interfaces/ViewStyleDefinition.java
@@ -1,9 +1,7 @@
 package eu.eudat.logic.utilities.interfaces;
 
 
-import eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.DatabaseViewStyleDefinition;
-
-public interface ViewStyleDefinition<T extends DatabaseViewStyleDefinition> {
+public interface ViewStyleDefinition<T> {
     T toDatabaseDefinition(T item);
 
     void fromDatabaseDefinition(T item);
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 63bd89b6d..4d3ab475e 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
@@ -1,59 +1,31 @@
 package eu.eudat.models.data.admin.components.datasetprofile;
 
-import eu.eudat.models.data.components.commons.DefaultValue;
-import eu.eudat.models.data.components.commons.ViewStyle;
-import eu.eudat.models.data.components.commons.Visibility;
+import eu.eudat.commons.enums.FieldValidationType;
+import eu.eudat.commons.types.common.DatabaseViewStyleDefinition;
+import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity;
+import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity;
+import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.FieldDataHelper;
+import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
 import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 import org.apache.commons.lang3.RandomStringUtils;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class Field implements ViewStyleDefinition<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field>, Comparable {
-
-    public enum ValidationType {
-        NONE((short) 0), REQUIRED((short) 1), URL((short) 2);
-        private short value;
-
-        private ValidationType(short value) {
-            this.value = value;
-        }
-
-        public short getValue() {
-            return value;
-        }
-
-        public static ValidationType fromInteger(int value) {
-            switch (value) {
-                case 0:
-                    return NONE;
-                case 1:
-                    return REQUIRED;
-                case 2:
-                    return URL;
-                default:
-                    return NONE;
-
-            }
-        }
-
-        public static List<ValidationType> fromIntegers(List<Integer> values) {
-            return values.stream().map(ValidationType::fromInteger).collect(Collectors.toList());
-        }
-    }
+public class Field implements DatabaseViewStyleDefinition, ViewStyleDefinition<FieldEntity>, Comparable {
 
     private String id;
     private Integer ordinal;
     private List<String> schematics;
     private String value;
-    private ViewStyle viewStyle;
+    private FieldDescriptionEntity viewStyle;
     private String datatype;
     private int page;
-    private DefaultValue defaultValue;
+    private DefaultValueEntity defaultValue;
     private Object data;
-    private Visibility visible;
-    private List<ValidationType> validations;
+    private VisibilityEntity visible;
+    private List<FieldValidationType> validations;
     private Boolean export;
 
     public String getId() {
@@ -85,10 +57,10 @@ public class Field implements ViewStyleDefinition<eu.eudat.models.data.entities.
         this.value = value;
     }
 
-    public ViewStyle getViewStyle() {
+    public FieldDescriptionEntity getViewStyle() {
         return viewStyle;
     }
-    public void setViewStyle(ViewStyle viewStyle) {
+    public void setViewStyle(FieldDescriptionEntity viewStyle) {
         this.viewStyle = viewStyle;
     }
 
@@ -99,10 +71,10 @@ public class Field implements ViewStyleDefinition<eu.eudat.models.data.entities.
         this.page = page;
     }
 
-    public DefaultValue getDefaultValue() {
+    public DefaultValueEntity getDefaultValue() {
         return defaultValue;
     }
-    public void setDefaultValue(DefaultValue defaultValue) {
+    public void setDefaultValue(DefaultValueEntity defaultValue) {
         this.defaultValue = defaultValue;
     }
 
@@ -120,10 +92,10 @@ public class Field implements ViewStyleDefinition<eu.eudat.models.data.entities.
         this.data = data;
     }
 
-    public Visibility getVisible() {
+    public VisibilityEntity getVisible() {
         return visible;
     }
-    public void setVisible(Visibility visible) {
+    public void setVisible(VisibilityEntity visible) {
         this.visible = visible;
     }
 
@@ -131,7 +103,7 @@ public class Field implements ViewStyleDefinition<eu.eudat.models.data.entities.
         return this.validations.stream().map(item -> (int) item.getValue()).collect(Collectors.toList());
     }
     public void setValidations(List<Integer> validations) {
-        this.validations = ValidationType.fromIntegers(validations);
+        this.validations = validations.stream().map(x-> FieldValidationType.of(x.shortValue())).collect(Collectors.toList());
     }
 
     public Boolean getExport() {
@@ -143,32 +115,38 @@ public class Field implements ViewStyleDefinition<eu.eudat.models.data.entities.
     }
 
     @Override
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field toDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field field) {
+    public FieldEntity toDatabaseDefinition(FieldEntity fieldEntity) {
         if (this.id == null || this.id.isEmpty()) this.id = "field_" + RandomStringUtils.random(5, true, true);
 
-        field.setId(this.id);
-        field.setOrdinal(this.ordinal);
-        field.setViewStyle(this.viewStyle);
-        field.setData(new ModelBuilder().toFieldData(data, this.viewStyle.getRenderStyle()));
-        field.setVisible(this.visible);
-        field.setDefaultValue(this.defaultValue);
-        field.setValidations(this.validations);
-        field.setSchematics(this.schematics);
-        field.setExport(this.export);
-        return field;
+        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());
+        fieldEntity.setValidations(this.validations);
+        fieldEntity.setSchematics(this.schematics);
+        fieldEntity.setIncludeInExport(this.export);
+        return fieldEntity;
     }
 
     @Override
-    public void fromDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field item) {
+    public void fromDatabaseDefinition(FieldEntity item) {
         this.id = item.getId();
         this.ordinal = item.getOrdinal();
-        this.viewStyle = item.getViewStyle();
+        FieldDescriptionEntity fieldDescription = new FieldDescriptionEntity();
+        fieldDescription.setFieldType(item.getFieldType());
+        this.viewStyle =  fieldDescription;
         this.data = item.getData();
-        this.visible = item.getVisible();
-        this.defaultValue = item.getDefaultValue();
+        VisibilityEntity visibilityEntity = new VisibilityEntity();
+        visibilityEntity.setRules(item.getVisibilityRules());
+        this.visible = visibilityEntity;
+        DefaultValueEntity defaultValueEntity = new DefaultValueEntity();
+        defaultValueEntity.setValue(item.getDefaultValue());
+        this.defaultValue = defaultValueEntity;
         this.validations = item.getValidations();
         this.schematics = item.getSchematics();
-        this.export = item.getExport();
+        this.export = item.getIncludeInExport();
     }
 
     @Override
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/FieldSet.java
index 9a267b585..6ae66a7fa 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/FieldSet.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/FieldSet.java
@@ -1,17 +1,19 @@
 package eu.eudat.models.data.admin.components.datasetprofile;
 
-import eu.eudat.models.data.components.commons.Multiplicity;
-import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
+import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity;
+import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
+import eu.eudat.commons.types.descriptiontemplate.FieldSetEntity;
 import eu.eudat.logic.utilities.builders.ModelBuilder;
+import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
 import org.apache.commons.lang3.RandomStringUtils;
 
 import java.util.Collections;
 import java.util.List;
 
-public class FieldSet implements Comparable, ViewStyleDefinition<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet> {
+public class FieldSet implements Comparable, ViewStyleDefinition<FieldSetEntity> {
     private String id;
     private Integer ordinal;
-    private Multiplicity multiplicity;
+    private MultiplicityEntity multiplicity;
     private String title;
     private String description;
     private String extendedDescription;
@@ -43,10 +45,10 @@ public class FieldSet implements Comparable, ViewStyleDefinition<eu.eudat.models
         this.ordinal = ordinal;
     }
 
-    public Multiplicity getMultiplicity() {
+    public MultiplicityEntity getMultiplicity() {
         return multiplicity;
     }
-    public void setMultiplicity(Multiplicity multiplicity) {
+    public void setMultiplicity(MultiplicityEntity multiplicity) {
         this.multiplicity = multiplicity;
     }
 
@@ -86,10 +88,10 @@ public class FieldSet implements Comparable, ViewStyleDefinition<eu.eudat.models
     }
 
     @Override
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet toDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet item) {
+    public FieldSetEntity toDatabaseDefinition(FieldSetEntity item) {
         if (this.id == null || this.id.isEmpty()) this.id = "fieldSet_" + RandomStringUtils.random(5, true, true);
-        List<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field> viewStyleFields = new ModelBuilder().toViewStyleDefinition(this.fields, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field.class);
-        item.setFields(viewStyleFields);
+        List<FieldEntity> viewStyleFieldEntities = new ModelBuilder().toViewStyleDefinition(this.fields, FieldEntity.class);
+        item.setFields(viewStyleFieldEntities);
         item.setId(this.id);
         item.setDescription(this.description);
         item.setTitle(this.title);
@@ -103,7 +105,7 @@ public class FieldSet implements Comparable, ViewStyleDefinition<eu.eudat.models
     }
 
     @Override
-    public void fromDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet item) {
+    public void fromDatabaseDefinition(FieldSetEntity item) {
         this.fields = new ModelBuilder().fromViewStyleDefinition(item.getFields(), Field.class);
         this.id = item.getId();
         this.ordinal = item.getOrdinal();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Page.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Page.java
index 890407786..1efae128e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Page.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Page.java
@@ -1,9 +1,10 @@
 package eu.eudat.models.data.admin.components.datasetprofile;
 
+import eu.eudat.commons.types.descriptiontemplate.PageEntity;
 import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
 
 
-public class Page implements Comparable, ViewStyleDefinition<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Page> {
+public class Page implements Comparable, ViewStyleDefinition<PageEntity> {
     private String id;
     private Integer ordinal;
     private String title;
@@ -33,7 +34,7 @@ public class Page implements Comparable, ViewStyleDefinition<eu.eudat.models.dat
     }
 
     @Override
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Page toDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Page item) {
+    public PageEntity toDatabaseDefinition(PageEntity item) {
         item.setId(this.id);
         item.setOrdinal(this.ordinal);
         item.setTitle(this.title);
@@ -41,7 +42,7 @@ public class Page implements Comparable, ViewStyleDefinition<eu.eudat.models.dat
     }
 
     @Override
-    public void fromDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Page item) {
+    public void fromDatabaseDefinition(PageEntity item) {
         this.title = item.getTitle();
         this.ordinal = item.getOrdinal();
         this.id = item.getId();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Section.java
index 415814fba..fa79d3ec2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Section.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Section.java
@@ -1,13 +1,15 @@
 package eu.eudat.models.data.admin.components.datasetprofile;
 
-import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
+import eu.eudat.commons.types.descriptiontemplate.FieldSetEntity;
+import eu.eudat.commons.types.descriptiontemplate.SectionEntity;
 import eu.eudat.logic.utilities.builders.ModelBuilder;
+import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
 import org.apache.commons.lang3.RandomStringUtils;
 
 import java.util.Collections;
 import java.util.List;
 
-public class Section implements Comparable, ViewStyleDefinition<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section> {
+public class Section implements Comparable, ViewStyleDefinition<SectionEntity> {
     private List<Section> sections;
     private List<FieldSet> fieldSets;
     private Boolean defaultVisibility;
@@ -91,24 +93,24 @@ public class Section implements Comparable, ViewStyleDefinition<eu.eudat.models.
     }
 
     @Override
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section toDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section item) {
+    public SectionEntity toDatabaseDefinition(SectionEntity item) {
         if (this.id == null || this.id.isEmpty()) this.id = "section_" + RandomStringUtils.random(5, true, true);
         item.setDefaultVisibility(this.defaultVisibility);
         item.setDescription(this.description);
         item.setMultiplicity(this.multiplicity);
         if (this.fieldSets != null)
-            item.setFieldSets(new ModelBuilder().toViewStyleDefinition(this.fieldSets, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet.class));
+            item.setFieldSets(new ModelBuilder().toViewStyleDefinition(this.fieldSets, FieldSetEntity.class));
         item.setId(this.id);
         item.setOrdinal(this.ordinal);
         item.setPage(this.page);
         if (this.sections != null)
-            item.setSections(new ModelBuilder().toViewStyleDefinition(this.sections, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section.class));
+            item.setSections(new ModelBuilder().toViewStyleDefinition(this.sections, SectionEntity.class));
         item.setTitle(this.title);
         return item;
     }
 
     @Override
-    public void fromDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section item) {
+    public void fromDatabaseDefinition(SectionEntity item) {
 
         this.defaultVisibility = item.isDefaultVisibility();
         this.description = item.getDescription();
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java
index 146a4acc5..3811c6698 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/composite/DatasetProfile.java
@@ -1,8 +1,10 @@
 package eu.eudat.models.data.admin.composite;
 
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
+import eu.eudat.commons.types.descriptiontemplate.SectionEntity;
+import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.models.data.admin.components.datasetprofile.Page;
 import eu.eudat.models.data.admin.components.datasetprofile.Section;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.models.data.listingmodels.UserInfoListingModel;
 
 import java.util.ArrayList;
@@ -79,7 +81,7 @@ public class DatasetProfile {
         this.users = users;
     }
 
-    public void buildProfile(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewStyle) {
+    public void buildProfile(DefinitionEntity viewStyle) {
         this.sections = new ModelBuilder().fromViewStyleDefinition(viewStyle.getSections(), Section.class);
         this.pages = new ModelBuilder().fromViewStyleDefinition(viewStyle.getPages(), Page.class);
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Rule.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Rule.java
deleted file mode 100644
index f41aa62eb..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/Rule.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package eu.eudat.models.data.components.commons;
-
-import eu.eudat.models.data.entities.xmlmodels.modeldefinition.DatabaseModelDefinition;
-import eu.eudat.commons.types.xml.XmlSerializable;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class Rule implements XmlSerializable<Rule>, DatabaseModelDefinition {
-    private String ruleType;
-    private String target;
-    private String ruleStyle;
-    private String value;
-    private String valueType;
-
-    public String getRuleType() {
-        return ruleType;
-    }
-
-    public void setRuleType(String ruleType) {
-        this.ruleType = ruleType;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public String getRuleStyle() {
-        return ruleStyle;
-    }
-
-    public void setRuleStyle(String ruleStyle) {
-        this.ruleStyle = ruleStyle;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getValueType() {
-        return valueType;
-    }
-
-    public void setValueType(String valueType) {
-        this.valueType = valueType;
-    }
-
-    @Override
-    public Element toXml(Document doc) {
-        Element rule = doc.createElement("rule");
-        rule.setAttribute("type", this.ruleType);
-        rule.setAttribute("target", this.target);
-        rule.setAttribute("ruleStyle", this.ruleStyle);
-
-        Element value = doc.createElement("value");
-        value.setAttribute("type", this.valueType);
-        value.setTextContent(this.value);
-
-        rule.appendChild(value);
-        return rule;
-    }
-
-    @Override
-    public Rule fromXml(Element item) {
-        this.ruleType = item.getAttribute("type");
-        this.target = item.getAttribute("target");
-        this.ruleStyle = item.getAttribute("ruleStyle");
-
-        Element value = (Element) item.getElementsByTagName("value").item(0);
-        if (value != null) {
-            this.valueType = value.getAttribute("type");
-            this.value = value.getTextContent();
-        }
-
-        return this;
-    }
-
-
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/ViewStyle.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/ViewStyle.java
deleted file mode 100644
index f4565a447..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/ViewStyle.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package eu.eudat.models.data.components.commons;
-
-public class ViewStyle {
-    private String renderStyle;
-    private String cssClass;
-
-    public String getRenderStyle() {
-        return renderStyle;
-    }
-
-    public void setRenderStyle(String renderStyle) {
-        this.renderStyle = renderStyle;
-    }
-
-    public String getCssClass() {
-        return cssClass;
-    }
-
-    public void setCssClass(String cssClass) {
-        this.cssClass = cssClass;
-    }
-
-    public enum Type {
-        COMBO_BOX("combobox"),
-        BOOLEAN_DECISION("booleanDecision"),
-        RADIO_BOX("radiobox"),
-        INTERNAL_DMP_ENTRIES("internalDmpEntities"),
-        CHECK_BOX("checkBox"),
-        FREE_TEXT("freetext"),
-        TEXT_AREA("textarea"),
-        RICH_TEXT_AREA("richTextarea"),
-        UPLOAD("upload"),
-//        TABLE("table"),
-        DATE_PICKER("datePicker"),
-        EXTERNAL_DATASETS("externalDatasets"),
-        DATA_REPOSITORIES("dataRepositories"),
-        JOURNAL_REPOSITORIES("journalRepositories"),
-        PUB_REPOSITORIES("pubRepositories"),
-        LICENSES("licenses"),
-        TAXONOMIES("taxonomies"),
-        PUBLICATIONS("publications"),
-        REGISTRIES("registries"),
-        SERVICES("services"),
-        TAGS("tags"),
-        RESEARCHERS("researchers"),
-        ORGANIZATIONS("organizations"),
-        DATASET_IDENTIFIER("datasetIdentifier"),
-        CURRENCY("currency"),
-        VALIDATION("validation");
-
-        private final String name;
-
-        Type(String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public static Type fromName(String name) {
-            for (Type type: Type.values()) {
-                if (name.equals(type.getName())) {
-                    return type;
-                }
-            }
-            throw new IllegalArgumentException("View Style Type [" + name + "] is not valid");
-        }
-    }
-
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ValidationData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ValidationData.java
deleted file mode 100644
index 32d3102e8..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ValidationData.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package eu.eudat.models.data.components.commons.datafield;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ValidationData extends FieldData<ValidationData> {
-    @Override
-    public ValidationData fromData(Object data) {
-        if (data != null) {
-            this.setLabel((String) ((Map<String, Object>) data).get("label"));
-        }
-        return this;
-    }
-
-    @Override
-    public Object toData() {
-        return null;
-    }
-
-    @Override
-    public Element toXml(Document doc) {
-        Element root = doc.createElement("data");
-        root.setAttribute("label", this.getLabel());
-        return root;
-    }
-
-    @Override
-    public ValidationData fromXml(Element item) {
-        this.setLabel(item != null ? item.getAttribute("label") : "");
-        return this;
-    }
-
-    @Override
-    public Map<String, Object> toMap(Element item) {
-        HashMap dataMap = new HashMap();
-        dataMap.put("label", item != null ? item.getAttribute("label") : "");
-        return dataMap;
-    }
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetImport/DatasetImportField.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetImport/DatasetImportField.java
index 2169c863a..36e9ecd5d 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetImport/DatasetImportField.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetImport/DatasetImportField.java
@@ -1,5 +1,6 @@
 package eu.eudat.models.data.datasetImport;
 
+import eu.eudat.commons.enums.FieldValidationType;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import jakarta.xml.bind.annotation.XmlElement;
 import jakarta.xml.bind.annotation.XmlRootElement;
@@ -21,7 +22,7 @@ public class DatasetImportField implements Comparable{
     private DatasetImportMultiplicity multiplicity;
     private Object data;
     private List<DatasetImportFields> multiplicityItems;
-    private List<eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType> validations;
+    private List<FieldValidationType> validations;
     private DatasetImportVisibility visible;
 
     public List<DatasetImportFields> getMultiplicityItems() {
@@ -107,7 +108,7 @@ public class DatasetImportField implements Comparable{
         return this.validations.stream().map(item -> (int) item.getValue()).collect(Collectors.toList());
     }
     public void setValidations(List<Integer> validations) {
-        this.validations = eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType.fromIntegers(validations);
+        this.validations = validations.stream().map(x-> FieldValidationType.of(x.shortValue())).collect(Collectors.toList());
     }
 
     public String getNumbering() {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java
index 12d950e36..668a3df85 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileAutocompleteItem.java
@@ -1,12 +1,12 @@
 package eu.eudat.models.data.datasetprofile;
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.models.DataModel;
 
 import java.util.UUID;
 
 
-public class DatasetProfileAutocompleteItem implements DataModel<DescriptionTemplate, DatasetProfileAutocompleteItem> {
+public class DatasetProfileAutocompleteItem implements DataModel<DescriptionTemplateEntity, DatasetProfileAutocompleteItem> {
 
     private UUID id;
     private String label;
@@ -34,7 +34,7 @@ public class DatasetProfileAutocompleteItem implements DataModel<DescriptionTemp
     }
 
     @Override
-    public DatasetProfileAutocompleteItem fromDataModel(DescriptionTemplate entity) {
+    public DatasetProfileAutocompleteItem fromDataModel(DescriptionTemplateEntity entity) {
         this.id = entity.getId();
         this.label = entity.getLabel();
         this.description = entity.getDescription();
@@ -42,8 +42,8 @@ public class DatasetProfileAutocompleteItem implements DataModel<DescriptionTemp
     }
 
     @Override
-    public DescriptionTemplate toDataModel() {
-        DescriptionTemplate profile = new DescriptionTemplate();
+    public DescriptionTemplateEntity toDataModel() {
+        DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
         profile.setId(this.id);
         return profile;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileListingModel.java
index a6e31b96c..ede623854 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileListingModel.java
@@ -1,12 +1,12 @@
 package eu.eudat.models.data.datasetprofile;
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.models.DataModel;
 
 import java.util.Date;
 import java.util.UUID;
 
-public class DatasetProfileListingModel implements DataModel<DescriptionTemplate, DatasetProfileListingModel> {
+public class DatasetProfileListingModel implements DataModel<DescriptionTemplateEntity, DatasetProfileListingModel> {
 
     private UUID id;
     private String label;
@@ -66,12 +66,12 @@ public class DatasetProfileListingModel implements DataModel<DescriptionTemplate
     public void setGroupId(UUID groupId) { this.groupId = groupId; }
 
     @Override
-    public DatasetProfileListingModel fromDataModel(DescriptionTemplate entity) {
+    public DatasetProfileListingModel fromDataModel(DescriptionTemplateEntity entity) {
         this.id = entity.getId();
         this.label = entity.getLabel();
-        this.status = entity.getStatus();
-        this.created = entity.getCreated();
-        this.modified = entity.getModified();
+        this.status = entity.getStatus().getValue();
+        this.created = Date.from(entity.getCreatedAt());
+        this.modified = Date.from(entity.getUpdatedAt());
         this.description = entity.getDescription();
         this.version = entity.getVersion();
         this.groupId = entity.getGroupId();
@@ -79,8 +79,8 @@ public class DatasetProfileListingModel implements DataModel<DescriptionTemplate
     }
 
     @Override
-    public DescriptionTemplate toDataModel() {
-        DescriptionTemplate profile = new DescriptionTemplate();
+    public DescriptionTemplateEntity toDataModel() {
+        DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
         profile.setId(this.id);
         return profile;
     }
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileOverviewModel.java
index 55e679d54..30643f1a8 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileOverviewModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetprofile/DatasetProfileOverviewModel.java
@@ -1,11 +1,11 @@
 package eu.eudat.models.data.datasetprofile;
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.models.DataModel;
 
 import java.util.UUID;
 
-public class DatasetProfileOverviewModel implements DataModel<DescriptionTemplate, DatasetProfileOverviewModel> {
+public class DatasetProfileOverviewModel implements DataModel<DescriptionTemplateEntity, DatasetProfileOverviewModel> {
     private UUID id;
     private String label;
 
@@ -24,15 +24,15 @@ public class DatasetProfileOverviewModel implements DataModel<DescriptionTemplat
     }
 
     @Override
-    public DatasetProfileOverviewModel fromDataModel(DescriptionTemplate entity) {
+    public DatasetProfileOverviewModel fromDataModel(DescriptionTemplateEntity entity) {
         this.id = entity.getId();
         this.label = entity.getLabel();
         return this;
     }
 
     @Override
-    public DescriptionTemplate toDataModel() {
-        DescriptionTemplate entity = new DescriptionTemplate();
+    public DescriptionTemplateEntity toDataModel() {
+        DescriptionTemplateEntity entity = new DescriptionTemplateEntity();
         entity.setId(this.getId());
         entity.setLabel(this.getLabel());
         return entity;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
index 92a913389..b5968274e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datasetwizard/DatasetWizardModel.java
@@ -1,5 +1,6 @@
 package eu.eudat.models.data.datasetwizard;
 
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.*;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.models.DataModel;
@@ -255,7 +256,7 @@ public class DatasetWizardModel implements DataModel<Dataset, DatasetWizardModel
         entity.setDescription(this.description);
         entity.setCreated(this.created != null ? this.created : new Date());
         entity.setModified(new Date());
-        DescriptionTemplate profile = new DescriptionTemplate();
+        DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
         profile.setId(this.profile.getId());
         entity.setProfile(profile);
         if (this.registries != null && !this.registries.isEmpty()) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java
index 7819a03bd..09dbda22e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java
@@ -1,6 +1,6 @@
 package eu.eudat.models.data.dmp;
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -62,14 +62,14 @@ public class AssociatedProfile implements XmlSerializable<AssociatedProfile> {
         return this;
     }
 
-    public DescriptionTemplate toData() {
-        DescriptionTemplate profile = new DescriptionTemplate();
+    public DescriptionTemplateEntity toData() {
+        DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
         profile.setId(this.descriptionTemplateId);
         profile.setLabel(this.label);
         return profile;
     }
 
-    public AssociatedProfile fromData(DescriptionTemplate entity) {
+    public AssociatedProfile fromData(DescriptionTemplateEntity entity) {
         this.descriptionTemplateId = entity.getId();
         this.label = entity.getLabel();
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java
deleted file mode 100644
index 31a372665..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition;
-
-import eu.eudat.logic.utilities.interfaces.DatabaseDefinition;
-
-public interface DatabaseViewStyleDefinition extends DatabaseDefinition {
-
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java
deleted file mode 100644
index 1e47fd7c9..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.eudat.models.data.entities.xmlmodels.modeldefinition;
-
-import eu.eudat.logic.utilities.interfaces.DatabaseDefinition;
-
-public interface DatabaseModelDefinition extends DatabaseDefinition {
-
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/helpers/common/AutoCompleteOptionsLookupItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/helpers/common/AutoCompleteOptionsLookupItem.java
index 6e3abcc30..d164a95ce 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/helpers/common/AutoCompleteOptionsLookupItem.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/helpers/common/AutoCompleteOptionsLookupItem.java
@@ -1,18 +1,18 @@
 package eu.eudat.models.data.helpers.common;
 
 import eu.eudat.data.dao.criteria.Criteria;
-import eu.eudat.models.data.components.commons.datafield.AutoCompleteData;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.AutoCompleteDataEntity;
 
 import java.util.List;
 
 public class AutoCompleteOptionsLookupItem extends Criteria<AutoCompleteOptionsLookupItem> {
 
-    private List<AutoCompleteData.AutoCompleteSingleData> autoCompleteSingleDataList;
+    private List<AutoCompleteDataEntity.AutoCompleteSingleData> autoCompleteSingleDataList;
 
-    public List<AutoCompleteData.AutoCompleteSingleData> getAutoCompleteSingleDataList() {
+    public List<AutoCompleteDataEntity.AutoCompleteSingleData> getAutoCompleteSingleDataList() {
         return autoCompleteSingleDataList;
     }
-    public void setAutoCompleteSingleDataList(List<AutoCompleteData.AutoCompleteSingleData> autoCompleteSingleDataList) {
+    public void setAutoCompleteSingleDataList(List<AutoCompleteDataEntity.AutoCompleteSingleData> autoCompleteSingleDataList) {
         this.autoCompleteSingleDataList = autoCompleteSingleDataList;
     }
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/login/Credentials.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/login/Credentials.java
deleted file mode 100644
index 249c6c7d5..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/login/Credentials.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package eu.eudat.models.data.login;
-
-
-public class Credentials {
-    private String username;
-    private String secret;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getSecret() {
-        return secret;
-    }
-
-    public void setSecret(String secret) {
-        this.secret = secret;
-    }
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/login/LoginInfo.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/login/LoginInfo.java
deleted file mode 100644
index a8a5d92c2..000000000
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/login/LoginInfo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package eu.eudat.models.data.login;
-
-
-public class LoginInfo {
-    private String ticket;
-    private Object data;
-
-    public String getTicket() {
-        return ticket;
-    }
-
-    public void setTicket(String ticket) {
-        this.ticket = ticket;
-    }
-
-
-    public Object getData() {
-        return data;
-    }
-
-    public void setData(Object data) {
-        this.data = data;
-    }
-}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DatasetDescriptionQuickWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DatasetDescriptionQuickWizardModel.java
index 6facaa3fe..7372c810f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DatasetDescriptionQuickWizardModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DatasetDescriptionQuickWizardModel.java
@@ -1,7 +1,7 @@
 package eu.eudat.models.data.quickwizard;
 
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 import eu.eudat.models.data.dmp.DataManagementPlan;
 import eu.eudat.models.data.datasetwizard.DatasetWizardModel;
@@ -22,7 +22,7 @@ public class DatasetDescriptionQuickWizardModel extends PagedDatasetProfile {
     }
 
 
-    public  DatasetWizardModel  toDataModel(DataManagementPlan dmp, DescriptionTemplate profile){
+    public  DatasetWizardModel  toDataModel(DataManagementPlan dmp, DescriptionTemplateEntity profile){
         DatasetWizardModel newDataset = new  DatasetWizardModel();
         newDataset.setLabel(datasetLabel);
         newDataset.setCreated(new Date());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java
index 5da3da906..75ae5241e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/quickwizard/DmpQuickWizardModel.java
@@ -1,7 +1,7 @@
 package eu.eudat.models.data.quickwizard;
 
 import eu.eudat.commons.scope.user.UserScope;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.Grant;
 import eu.eudat.data.old.Project;
 import eu.eudat.models.data.dmp.AssociatedProfile;
@@ -109,12 +109,12 @@ public class DmpQuickWizardModel {
 	}
 
 
-	public DescriptionTemplate getDatasetProfile() {
-		DescriptionTemplate descriptionTemplate = new DescriptionTemplate();
-		descriptionTemplate.setDefinition(this.datasetProfile.getLabel());
-		descriptionTemplate.setLabel(this.datasetProfile.getLabel());
-		descriptionTemplate.setId(this.datasetProfile.getDescriptionTemplateId());
-		return descriptionTemplate;
+	public DescriptionTemplateEntity getDatasetProfile() {
+		DescriptionTemplateEntity descriptionTemplateEntity = new DescriptionTemplateEntity();
+		descriptionTemplateEntity.setDefinition(this.datasetProfile.getLabel());
+		descriptionTemplateEntity.setLabel(this.datasetProfile.getLabel());
+		descriptionTemplateEntity.setId(this.datasetProfile.getDescriptionTemplateId());
+		return descriptionTemplateEntity;
 	}
 
 
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/commons/Rule.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/commons/Rule.java
index f3f91b629..f8ebe0b6c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/commons/Rule.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/commons/Rule.java
@@ -1,5 +1,7 @@
 package eu.eudat.models.data.user.components.commons;
 
+import eu.eudat.commons.types.descriptiontemplate.RuleEntity;
+
 public class Rule {
     private String sourceField;
     private String targetField;
@@ -38,10 +40,9 @@ public class Rule {
         this.type = type;
     }
 
-    public Rule fromDefinitionRule(eu.eudat.models.data.components.commons.Rule rule) {
+    public Rule fromDefinitionRule(RuleEntity rule) {
         this.targetField = rule.getTarget();
         this.requiredValue = rule.getValue();
-        this.type = rule.getRuleStyle();
         return this;
     }
 
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 3a277ce3e..7ba848536 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
@@ -2,18 +2,18 @@ package eu.eudat.models.data.user.components.datasetprofile;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.eudat.models.data.components.commons.DefaultValue;
-import eu.eudat.models.data.components.commons.Multiplicity;
-import eu.eudat.models.data.components.commons.ViewStyle;
-import eu.eudat.models.data.components.commons.Visibility;
+import eu.eudat.commons.enums.FieldValidationType;
+import eu.eudat.commons.types.descriptiontemplate.todelete.DefaultValueEntity;
+import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity;
+import eu.eudat.commons.types.descriptiontemplate.todelete.FieldDescriptionEntity;
+import eu.eudat.commons.types.descriptiontemplate.todelete.VisibilityEntity;
+import eu.eudat.commons.types.descriptiontemplate.fielddata.FieldDataHelper;
+import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
 import eu.eudat.models.data.properties.PropertiesGenerator;
 import eu.eudat.models.data.user.composite.PropertiesModelBuilder;
 import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 
-import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,21 +24,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefinition<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field>, PropertiesGenerator {
+public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefinition<FieldEntity>, PropertiesGenerator {
     private static final Logger logger = LoggerFactory.getLogger(Field.class);
     private String id;
     private Integer ordinal;
     private Object value;
-    private ViewStyle viewStyle;
+    private FieldDescriptionEntity viewStyle;
     private String datatype;
     private String numbering;
-    private int page;
-    private DefaultValue defaultValue;
-    private Multiplicity multiplicity;
+    private int page; 
+    private DefaultValueEntity defaultValue;
+    private MultiplicityEntity multiplicity;
     private Object data;
     private List<Field> multiplicityItems;
-    private List<eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType> validations;
-    private Visibility visible;
+    private List<FieldValidationType> validations;
+    private VisibilityEntity visible;
     private List<String> schematics;
 
     private Boolean export;
@@ -79,11 +79,11 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
         this.value = value;
     }
 
-    public ViewStyle getViewStyle() {
+    public FieldDescriptionEntity getViewStyle() {
         return viewStyle;
     }
 
-    public void setViewStyle(ViewStyle viewStyle) {
+    public void setViewStyle(FieldDescriptionEntity viewStyle) {
         this.viewStyle = viewStyle;
     }
 
@@ -95,11 +95,11 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
         this.page = page;
     }
 
-    public DefaultValue getDefaultValue() {
+    public DefaultValueEntity getDefaultValue() {
         return defaultValue;
     }
 
-    public void setDefaultValue(DefaultValue defaultValue) {
+    public void setDefaultValue(DefaultValueEntity defaultValue) {
         this.defaultValue = defaultValue;
     }
 
@@ -111,11 +111,11 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
         this.datatype = datatype;
     }
 
-    public Multiplicity getMultiplicity() {
+    public MultiplicityEntity getMultiplicity() {
         return multiplicity;
     }
 
-    public void setMultiplicity(Multiplicity multiplicity) {
+    public void setMultiplicity(MultiplicityEntity multiplicity) {
         this.multiplicity = multiplicity;
     }
 
@@ -127,11 +127,11 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
         this.data = data;
     }
 
-    public Visibility getVisible() {
+    public VisibilityEntity getVisible() {
         return visible;
     }
 
-    public void setVisible(Visibility visible) {
+    public void setVisible(VisibilityEntity visible) {
         this.visible = visible;
     }
 
@@ -143,7 +143,7 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
     }
 
     public void setValidations(List<Integer> validations) {
-        this.validations = eu.eudat.models.data.admin.components.datasetprofile.Field.ValidationType.fromIntegers(validations);
+        this.validations = validations.stream().map(x-> FieldValidationType.of(x.shortValue())).collect(Collectors.toList());
     }
 
     public String getNumbering() {
@@ -188,31 +188,38 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
     }
 
     @Override
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field toDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field field) {
-        field.setId(this.id);
-        field.setOrdinal(this.ordinal);
-        field.setViewStyle(this.viewStyle);
-        field.setData(new ModelBuilder().toFieldData(data, this.viewStyle.getRenderStyle()));
-        field.setDefaultValue(this.defaultValue);
-        field.setVisible(this.visible);
-        field.setValidations(this.validations);
-        field.setSchematics(this.schematics);
-        field.setExport(this.export);
-        return field;
+    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());
+        fieldEntity.setValidations(this.validations);
+        fieldEntity.setSchematics(this.schematics);
+        fieldEntity.setIncludeInExport(this.export);
+        return fieldEntity;
     }
 
     @Override
-    public void fromDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field item) {
+    public void fromDatabaseDefinition(FieldEntity item) {
         this.id = item.getId();
         this.ordinal = item.getOrdinal();
-        this.viewStyle = item.getViewStyle();
+        FieldDescriptionEntity fieldDescription = new FieldDescriptionEntity();
+        fieldDescription.setFieldType(item.getFieldType());
+        this.viewStyle =  fieldDescription;
         this.numbering = item.getNumbering();
         this.data = item.getData();
-        this.defaultValue = item.getDefaultValue();
-        this.visible = item.getVisible();
+
+        DefaultValueEntity defaultValueEntity = new DefaultValueEntity();
+        defaultValueEntity.setValue(item.getDefaultValue());
+        this.defaultValue = defaultValueEntity;
+        VisibilityEntity visibilityEntity = new VisibilityEntity();
+        visibilityEntity.setRules(item.getVisibilityRules());
+        this.visible = visibilityEntity;
         this.validations = item.getValidations();
         this.schematics = item.getSchematics();
-        this.export = item.getExport();
+        this.export = item.getIncludeInExport();
     }
 
     @Override
@@ -256,7 +263,7 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
     @Override
     public void toMap(Map<String, Object> fieldValues) {
         if (this.value != null) {
-            if ((this.viewStyle != null && this.viewStyle.getRenderStyle().equals("datasetIdentifier") && this.value instanceof Map || this.value instanceof Collection)) {
+            if ((this.viewStyle != null && this.viewStyle.getFieldType().equals("datasetIdentifier") && this.value instanceof Map || this.value instanceof Collection)) {
                 ObjectMapper mapper = new ObjectMapper();
                 String valueString = null;
                 try {
@@ -278,7 +285,7 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin
                valueBuilder.append("]");
                fieldValues.put(this.id, valueBuilder.toString());
             }*/
-            else if ((this.viewStyle != null && this.viewStyle.getRenderStyle().equals("upload"))) {
+            else if ((this.viewStyle != null && this.viewStyle.getFieldType().equals("upload"))) {
                 fieldValues.put(this.id, this.value);
             }
             else {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/FieldSet.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/FieldSet.java
index 80ece4c30..49d94ccd4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/FieldSet.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/FieldSet.java
@@ -1,16 +1,17 @@
 package eu.eudat.models.data.user.components.datasetprofile;
 
-import eu.eudat.models.data.components.commons.Multiplicity;
+import eu.eudat.commons.types.descriptiontemplate.MultiplicityEntity;
+import eu.eudat.commons.types.descriptiontemplate.FieldEntity;
+import eu.eudat.commons.types.descriptiontemplate.FieldSetEntity;
+import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.models.data.properties.PropertiesGenerator;
 import eu.eudat.models.data.user.composite.PropertiesModelBuilder;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
 
-import java.security.Key;
 import java.util.*;
 import java.util.stream.Collectors;
 
-public class FieldSet implements Comparable, PropertiesModelBuilder, ViewStyleDefinition<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet>, PropertiesGenerator {
+public class FieldSet implements Comparable, PropertiesModelBuilder, ViewStyleDefinition<FieldSetEntity>, PropertiesGenerator {
     private String id;
     private Integer ordinal;
     private String title;
@@ -18,7 +19,7 @@ public class FieldSet implements Comparable, PropertiesModelBuilder, ViewStyleDe
     private String description;
     private String extendedDescription;
     private String additionalInformation;
-    private Multiplicity multiplicity;
+    private MultiplicityEntity multiplicity;
     private List<Field> fields;
     private List<FieldSet> multiplicityItems;
     private boolean hasCommentField;
@@ -73,11 +74,11 @@ public class FieldSet implements Comparable, PropertiesModelBuilder, ViewStyleDe
         this.ordinal = ordinal;
     }
 
-    public Multiplicity getMultiplicity() {
+    public MultiplicityEntity getMultiplicity() {
         return multiplicity;
     }
 
-    public void setMultiplicity(Multiplicity multiplicity) {
+    public void setMultiplicity(MultiplicityEntity multiplicity) {
         this.multiplicity = multiplicity;
     }
 
@@ -127,19 +128,19 @@ public class FieldSet implements Comparable, PropertiesModelBuilder, ViewStyleDe
     }
 
     @Override
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet toDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet item) {
-        List<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field> viewStylefields = new ModelBuilder().toViewStyleDefinition(this.fields, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Field.class);
+    public FieldSetEntity toDatabaseDefinition(FieldSetEntity item) {
+        List<FieldEntity> viewStylefields = new ModelBuilder().toViewStyleDefinition(this.fields, FieldEntity.class);
         item.setFields(viewStylefields);
         item.setId(this.id);
         item.setOrdinal(this.ordinal);
         item.setHasCommentField(this.hasCommentField);
         item.setMultiplicity(this.multiplicity);
-        item.setCommentFieldValue(this.commentFieldValue);
+//        item.setCommentFieldValue(this.commentFieldValue);
         return item;
     }
 
     @Override
-    public void fromDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet item) {
+    public void fromDatabaseDefinition(FieldSetEntity item) {
         this.fields = new ModelBuilder().fromViewStyleDefinition(item.getFields(), Field.class);
         this.id = item.getId();
         this.ordinal = item.getOrdinal();
@@ -150,7 +151,7 @@ public class FieldSet implements Comparable, PropertiesModelBuilder, ViewStyleDe
         this.extendedDescription = item.getExtendedDescription();
         this.hasCommentField = item.getHasCommentField();
         this.multiplicity = item.getMultiplicity();
-        this.commentFieldValue = item.getCommentFieldValue();
+//        this.commentFieldValue = item.getCommentFieldValue();
     }
 
     @Override
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Section.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Section.java
index 48de511d9..21e0b157c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Section.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Section.java
@@ -1,15 +1,17 @@
 package eu.eudat.models.data.user.components.datasetprofile;
 
+import eu.eudat.commons.types.descriptiontemplate.FieldSetEntity;
+import eu.eudat.commons.types.descriptiontemplate.SectionEntity;
+import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.models.data.properties.PropertiesGenerator;
 import eu.eudat.models.data.user.composite.PropertiesModelBuilder;
 import eu.eudat.logic.utilities.interfaces.ViewStyleDefinition;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-public class Section implements Comparable, ViewStyleDefinition<eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section>, PropertiesModelBuilder, PropertiesGenerator {
+public class Section implements Comparable, ViewStyleDefinition<SectionEntity>, PropertiesModelBuilder, PropertiesGenerator {
     private List<Section> sections;
     private List<FieldSet> compositeFields;
     private Boolean defaultVisibility;
@@ -104,23 +106,23 @@ public class Section implements Comparable, ViewStyleDefinition<eu.eudat.models.
     }
 
     @Override
-    public eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section toDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section item) {
+    public SectionEntity toDatabaseDefinition(SectionEntity item) {
         item.setDefaultVisibility(this.defaultVisibility);
         item.setDescription(this.description);
         if (this.compositeFields != null)
-            item.setFieldSets(new ModelBuilder().toViewStyleDefinition(this.compositeFields, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.FieldSet.class));
+            item.setFieldSets(new ModelBuilder().toViewStyleDefinition(this.compositeFields, FieldSetEntity.class));
         item.setId(this.id);
         item.setOrdinal(this.ordinal);
         item.setPage(this.page);
         if (this.sections != null)
-            item.setSections(new ModelBuilder().toViewStyleDefinition(this.sections, eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section.class));
+            item.setSections(new ModelBuilder().toViewStyleDefinition(this.sections, SectionEntity.class));
         item.setTitle(this.title);
         item.setMultiplicity(this.multiplicity);
         return item;
     }
 
     @Override
-    public void fromDatabaseDefinition(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.Section item) {
+    public void fromDatabaseDefinition(SectionEntity item) {
         this.defaultVisibility = item.isDefaultVisibility();
         this.description = item.getDescription();
         this.compositeFields = new ModelBuilder().fromViewStyleDefinition(item.getFieldSets(), FieldSet.class);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/composite/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/composite/DatasetProfile.java
index 115c8cc7d..9aed4b8eb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/composite/DatasetProfile.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/composite/DatasetProfile.java
@@ -1,9 +1,10 @@
 package eu.eudat.models.data.user.composite;
 
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
+import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.models.data.admin.components.datasetprofile.Page;
 import eu.eudat.models.data.user.components.commons.Rule;
 import eu.eudat.models.data.user.components.datasetprofile.Section;
-import eu.eudat.logic.utilities.builders.ModelBuilder;
 import eu.eudat.logic.utilities.helpers.ModelBuilderCollector;
 
 import java.util.List;
@@ -75,7 +76,7 @@ public class DatasetProfile implements PropertiesModelBuilder {
         this.pages = pages;
     }
 
-    public void buildProfile(eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewStyle) {
+    public void buildProfile(DefinitionEntity viewStyle) {
         this.sections = new ModelBuilder().fromViewStyleDefinition(viewStyle.getSections(), Section.class);
         this.pages = new ModelBuilder().fromViewStyleDefinition(viewStyle.getPages(), Page.class);
         this.rules = ModelBuilderCollector.collectRules(viewStyle.getSections());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
index 6b5bc6ac9..8f1badcf3 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java
@@ -3,7 +3,7 @@ package eu.eudat.models.rda.mapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.elastic.criteria.DatasetCriteria;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.logic.managers.DatasetManager;
@@ -280,12 +280,12 @@ public class DatasetRDAMapper {
 	}
 
 
-	public eu.eudat.data.old.Dataset toEntity(Dataset rda, DescriptionTemplate defaultProfile) {
+	public eu.eudat.data.old.Dataset toEntity(Dataset rda, DescriptionTemplateEntity defaultProfile) {
 		eu.eudat.data.old.Dataset entity = new eu.eudat.data.old.Dataset();
 		entity.setLabel(rda.getTitle());
 		entity.setDescription(rda.getDescription());
 		try {
-			DescriptionTemplate profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(rda.getAdditionalProperties().get("template").toString()));
+			DescriptionTemplateEntity profile = apiContext.getOperationsContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(rda.getAdditionalProperties().get("template").toString()));
 			entity.setProfile(profile);
 		}catch(Exception e) {
 			logger.warn(e.getMessage(), e);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java
index 7701dd0e7..f0ddaafe5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java
@@ -1,5 +1,6 @@
 package eu.eudat.models.rda.mapper;
 
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.EntityDoiEntity;
 import eu.eudat.data.old.*;
 import eu.eudat.logic.services.ApiContext;
@@ -169,7 +170,7 @@ public class DmpRDAMapper {
 		entity.setCreated(rda.getCreated());
 		entity.setModified(rda.getModified());
 		entity.setDescription(rda.getDescription());
-		DescriptionTemplate defaultProfile = ((DescriptionTemplate)entity.getAssociatedDmps().toArray()[0]);
+		DescriptionTemplateEntity defaultProfile = ((DescriptionTemplateEntity)entity.getAssociatedDmps().toArray()[0]);
 		entity.setDataset(rda.getDataset().stream().map(rda1 -> datasetRDAMapper.toEntity(rda1, defaultProfile)).collect(Collectors.toSet()));
 		if (rda.getProject().size() > 0) {
 			Map<String, Object> result = ProjectRDAMapper.toEntity(rda.getProject().get(0), apiContext);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java
index a218e4646..f3a922522 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java
@@ -1,7 +1,8 @@
 package eu.eudat.publicapi.managers;
 
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
 import eu.eudat.data.old.Dataset;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.query.definition.helpers.ColumnOrderings;
 import eu.eudat.elastic.criteria.DatasetCriteria;
 import eu.eudat.elastic.repository.DatasetRepository;
@@ -163,10 +164,10 @@ public class DatasetPublicManager {
         return pagedDatasetProfile;
     }
 
-    private eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplate profile) {
+    private eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplateEntity profile) {
         Document viewStyleDoc = XmlBuilder.fromXml(profile.getDefinition());
         Element root = (Element) viewStyleDoc.getDocumentElement();
-        eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewstyle = new eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel().fromXml(root);
+        DefinitionEntity viewstyle = new DefinitionEntity().fromXml(root);
 
         eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = new eu.eudat.models.data.user.composite.DatasetProfile();
         datasetprofile.buildProfile(viewstyle);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java
index f25676782..e62d8410a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java
@@ -1,6 +1,6 @@
 package eu.eudat.publicapi.models.associatedprofile;
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.commons.types.xml.XmlSerializable;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -61,14 +61,14 @@ public class AssociatedProfilePublicModel implements XmlSerializable<AssociatedP
         return this;
     }
 
-    public DescriptionTemplate toData() {
-        DescriptionTemplate profile = new DescriptionTemplate();
+    public DescriptionTemplateEntity toData() {
+        DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
         profile.setId(this.descriptionTemplateId);
         profile.setLabel(this.label);
         return profile;
     }
 
-    public AssociatedProfilePublicModel fromData(DescriptionTemplate entity) {
+    public AssociatedProfilePublicModel fromData(DescriptionTemplateEntity entity) {
         this.descriptionTemplateId = entity.getId();
         this.label = entity.getLabel();
         return this;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java
index bb9d2f486..6936eac5b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java
@@ -1,11 +1,11 @@
 package eu.eudat.publicapi.models.datasetprofile;
 
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.models.DataModel;
 
 import java.util.UUID;
 
-public class DatasetProfilePublicModel implements DataModel<DescriptionTemplate, DatasetProfilePublicModel>  {
+public class DatasetProfilePublicModel implements DataModel<DescriptionTemplateEntity, DatasetProfilePublicModel>  {
     private UUID id;
     private String label;
 
@@ -24,15 +24,15 @@ public class DatasetProfilePublicModel implements DataModel<DescriptionTemplate,
     }
 
     @Override
-    public DatasetProfilePublicModel fromDataModel(DescriptionTemplate entity) {
+    public DatasetProfilePublicModel fromDataModel(DescriptionTemplateEntity entity) {
         this.id = entity.getId();
         this.label = entity.getLabel();
         return this;
     }
 
     @Override
-    public DescriptionTemplate toDataModel() {
-        DescriptionTemplate entity = new DescriptionTemplate();
+    public DescriptionTemplateEntity toDataModel() {
+        DescriptionTemplateEntity entity = new DescriptionTemplateEntity();
         entity.setId(this.getId());
         entity.setLabel(this.getLabel());
         return entity;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java
index 317e85ffb..2ea6acb06 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java
@@ -2,10 +2,11 @@ package eu.eudat.publicapi.models.overviewmodels;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.eudat.commons.types.descriptiontemplate.DefinitionEntity;
 import eu.eudat.data.old.DMP;
 import eu.eudat.data.old.DMPDatasetProfile;
 import eu.eudat.data.old.Dataset;
-import eu.eudat.data.old.DescriptionTemplate;
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.commons.types.xml.XmlBuilder;
 import eu.eudat.models.DataModel;
 import eu.eudat.models.data.user.composite.PagedDatasetProfile;
@@ -229,10 +230,10 @@ public class DataManagementPlanPublicModel implements DataModel<DMP, DataManagem
         return pagedDatasetProfile;
     }
 
-    private eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplate profile) {
+    private eu.eudat.models.data.user.composite.DatasetProfile generateDatasetProfileModel(DescriptionTemplateEntity profile) {
         Document viewStyleDoc = XmlBuilder.fromXml(profile.getDefinition());
         Element root = (Element) viewStyleDoc.getDocumentElement();
-        eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewstyle = new eu.eudat.models.data.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel().fromXml(root);
+        DefinitionEntity viewstyle = new DefinitionEntity().fromXml(root);
 
         eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = new eu.eudat.models.data.user.composite.DatasetProfile();
         datasetprofile.buildProfile(viewstyle);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java
index ec0ca0d59..ba7eb2967 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java
@@ -1,5 +1,6 @@
 package eu.eudat.publicapi.models.overviewmodels;
 
+import eu.eudat.data.DescriptionTemplateEntity;
 import eu.eudat.data.old.*;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.models.DataModel;
@@ -232,7 +233,7 @@ public class DatasetPublicModel implements DataModel<Dataset, DatasetPublicModel
         entity.setDescription(this.description);
         entity.setCreated(this.createdAt != null ? this.createdAt : new Date());
         entity.setModified(new Date());
-        DescriptionTemplate profile = new DescriptionTemplate();
+        DescriptionTemplateEntity profile = new DescriptionTemplateEntity();
         profile.setId(this.profile.getId());
         entity.setProfile(profile);
         if (this.registries != null && !this.registries.isEmpty()) {
diff --git a/dmp-backend/web/src/main/resources/config/permissions.yml b/dmp-backend/web/src/main/resources/config/permissions.yml
index 271d7dc52..8367f63eb 100644
--- a/dmp-backend/web/src/main/resources/config/permissions.yml
+++ b/dmp-backend/web/src/main/resources/config/permissions.yml
@@ -88,6 +88,26 @@ permissions:
       clients: [ ]
       allowAnonymous: false
       allowAuthenticated: false
+    # DescriptionTemplate
+    BrowseDescriptionTemplate:
+      roles:
+        - Admin
+      clients: [ ]
+      allowAnonymous: false
+      allowAuthenticated: false
+    EditDescriptionTemplate:
+      roles:
+        - Admin
+      clients: [ ]
+      allowAnonymous: false
+      allowAuthenticated: false
+    DeleteDescriptionTemplate:
+      roles:
+        - Admin
+      claims: [ ]
+      clients: [ ]
+      allowAnonymous: false
+      allowAuthenticated: false
     # DmpBlueprint
     BrowseDmpBlueprint:
       roles:
diff --git a/dmp-db-scema/updates/00.01.005_Align_DescriptionTemplatet_table.sql b/dmp-db-scema/updates/00.01.005_Align_DescriptionTemplatet_table.sql
new file mode 100644
index 000000000..9591c887a
--- /dev/null
+++ b/dmp-db-scema/updates/00.01.005_Align_DescriptionTemplatet_table.sql
@@ -0,0 +1,34 @@
+ALTER TABLE public."DescriptionTemplate" RENAME "ID" TO id;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Label" TO label;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Definition" TO definition;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Status" TO status;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Created" TO created_at;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Modified" TO updated_at;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Description" TO description;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "GroupId" TO group_id;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Version" TO version;
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Language" TO "language";
+
+ALTER TABLE public."DescriptionTemplate" RENAME "Type" TO "type";
+
+ALTER TABLE public."DescriptionTemplate" ALTER COLUMN created_at TYPE timestamp without time zone ;
+
+ALTER TABLE public."DescriptionTemplate" ALTER COLUMN updated_at TYPE timestamp without time zone ;
+
+ALTER TABLE public."DescriptionTemplate" ADD COLUMN is_active smallint;
+
+UPDATE public."DescriptionTemplate" SET is_active = 1;
+
+UPDATE public."DescriptionTemplate" SET is_active = 0 where status = 99;
+UPDATE public."DescriptionTemplate" SET status = 0 where is_active = 0;
+
+ALTER TABLE public."DescriptionTemplate" ALTER COLUMN is_active SET NOT NULL;
\ No newline at end of file