diff --git a/src/folia_properties.cxx b/src/folia_properties.cxx
index fbf6223..0f983f7 100644
--- a/src/folia_properties.cxx
+++ b/src/folia_properties.cxx
@@ -32,7 +32,7 @@
 #include "libfolia/folia_properties.h"
 
 //foliaspec:header
-//This file was last updated according to the FoLiA specification for version 2.5.3 on 2024-11-05 17:44:08, using foliaspec.py
+//This file was last updated according to the FoLiA specification for version 2.5.3 on 2024-12-03 10:03:34, using foliaspec.py
 //Code blocks after a foliaspec comment (until the next newline) are automatically generated. **DO NOT EDIT THOSE** and **DO NOT REMOVE ANY FOLIASPEC COMMENTS** !!!
 
 namespace folia {
@@ -198,6 +198,7 @@ namespace folia {
   const map<ElementType,string> et_s_map = {
     { BASE, "FoLiA" },
     { AbstractFeature_t, "_AbstractFeature" },
+    { AbstractWord_t, "_AbstractWord" },
     { AbstractAnnotationLayer_t,  "_AbstractAnnotationLayer" },
     { AbstractContentAnnotation_t,  "_AbstractContentAnnotation" },
     { AbstractCorrectionChild_t,  "_AbstractCorrectionChild" },
@@ -206,7 +207,6 @@ namespace folia {
     { AbstractSpanAnnotation_t,  "_AbstractSpanAnnotation" },
     { AbstractSpanRole_t,  "_AbstractSpanRole" },
     { AbstractStructureElement_t,  "_AbstractStructureElement" },
-    { AbstractWord_t,  "_AbstractWord" },
     { AbstractSubtokenAnnotation_t,  "_AbstractSubtokenAnnotation" },
     { AbstractTextMarkup_t,  "_AbstractTextMarkup" },
     { ActorFeature_t,  "actor" },
@@ -338,6 +338,7 @@ namespace folia {
   const map<string,ElementType> s_et_map = {
     { "FoLiA", BASE },
     { "_AbstractFeature", AbstractFeature_t },
+    { "_AbstractWord", AbstractWord_t },
     { "_AbstractAnnotationLayer", AbstractAnnotationLayer_t  },
     { "_AbstractContentAnnotation", AbstractContentAnnotation_t  },
     { "_AbstractCorrectionChild", AbstractCorrectionChild_t  },
@@ -346,7 +347,6 @@ namespace folia {
     { "_AbstractSpanAnnotation", AbstractSpanAnnotation_t  },
     { "_AbstractSpanRole", AbstractSpanRole_t  },
     { "_AbstractStructureElement", AbstractStructureElement_t  },
-    { "_AbstractWord", AbstractWord_t  },
     { "_AbstractSubtokenAnnotation", AbstractSubtokenAnnotation_t  },
     { "_AbstractTextMarkup", AbstractTextMarkup_t  },
     { "actor", ActorFeature_t  },
@@ -676,18 +676,18 @@ namespace folia {
     DCOI::PROPS.ACCEPTED_DATA += { Text_t, Speech_t };
 
     //foliaspec:begin:setelementproperties
+//------ AbstractFeature -------
+    ABSTRACT_FEATURE_PROPERTIES = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
+    ABSTRACT_FEATURE_PROPERTIES.ELEMENT_ID = AbstractFeature_t;
+    ABSTRACT_FEATURE_PROPERTIES.LABEL = "AbstractFeature";
+    element_props[AbstractFeature_t] = &ABSTRACT_FEATURE_PROPERTIES;
+//------ AbstractWord -------
     ABSTRACT_WORD_PROPERTIES = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     ABSTRACT_WORD_PROPERTIES.ELEMENT_ID = AbstractWord_t;
     ABSTRACT_WORD_PROPERTIES.LABEL = "AbstractWord";
-    ABSTRACT_WORD_PROPERTIES.XMLTAG = "AbstractWord";
     ABSTRACT_WORD_PROPERTIES.PRINTABLE = true;
     ABSTRACT_WORD_PROPERTIES.SPEAKABLE = true;
     element_props[AbstractWord_t] = &ABSTRACT_WORD_PROPERTIES;
-    //------ AbstractFeature -------
-    ABSTRACT_FEATURE_PROPERTIES = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
-    ABSTRACT_FEATURE_PROPERTIES.ELEMENT_ID = AbstractFeature_t;
-    ABSTRACT_FEATURE_PROPERTIES.LABEL = "AbstractFeature";
-    element_props[AbstractFeature_t] = &ABSTRACT_FEATURE_PROPERTIES;
 //------ AbstractAnnotationLayer -------
     ABSTRACT_ANNOTATION_LAYER_PROPERTIES.ELEMENT_ID = AbstractAnnotationLayer_t;
     ABSTRACT_ANNOTATION_LAYER_PROPERTIES.ACCEPTED_DATA += {Comment_t, Correction_t, Description_t, ForeignData_t};
@@ -717,7 +717,7 @@ namespace folia {
     element_props[AbstractHigherOrderAnnotation_t] = &ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
 //------ AbstractInlineAnnotation -------
     ABSTRACT_INLINE_ANNOTATION_PROPERTIES.ELEMENT_ID = AbstractInlineAnnotation_t;
-    ABSTRACT_INLINE_ANNOTATION_PROPERTIES.ACCEPTED_DATA += {Comment_t, Description_t, Feature_t, ForeignData_t, Metric_t, AbstractFeature_t};
+    ABSTRACT_INLINE_ANNOTATION_PROPERTIES.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Description_t, ForeignData_t, Metric_t};
     ABSTRACT_INLINE_ANNOTATION_PROPERTIES.OCCURRENCES_PER_SET = 1;
     ABSTRACT_INLINE_ANNOTATION_PROPERTIES.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::TEXTCLASS|Attrib::METADATA|Attrib::TAG;
     ABSTRACT_INLINE_ANNOTATION_PROPERTIES.REQUIRED_ATTRIBS = Attrib::CLASS;
@@ -732,12 +732,12 @@ namespace folia {
 //------ AbstractSpanRole -------
     ABSTRACT_SPAN_ROLE_PROPERTIES = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     ABSTRACT_SPAN_ROLE_PROPERTIES.ELEMENT_ID = AbstractSpanRole_t;
-    ABSTRACT_SPAN_ROLE_PROPERTIES.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    ABSTRACT_SPAN_ROLE_PROPERTIES.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, WordReference_t};
     ABSTRACT_SPAN_ROLE_PROPERTIES.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::TAG;
     element_props[AbstractSpanRole_t] = &ABSTRACT_SPAN_ROLE_PROPERTIES;
 //------ AbstractStructureElement -------
     ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES.ELEMENT_ID = AbstractStructureElement_t;
-    ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Metric_t, Part_t, Relation_t, AbstractFeature_t};
+    ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Metric_t, Part_t, Relation_t};
     ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES.AUTO_GENERATE_ID = true;
     ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::SPACE|Attrib::TAG;
     ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES.PRINTABLE = true;
@@ -747,7 +747,7 @@ namespace folia {
     element_props[AbstractStructureElement_t] = &ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
 //------ AbstractSubtokenAnnotation -------
     ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES.ELEMENT_ID = AbstractSubtokenAnnotation_t;
-    ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t, Relation_t, AbstractFeature_t};
+    ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, ForeignData_t, Metric_t, Part_t, Relation_t};
     ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES.AUTO_GENERATE_ID = true;
     ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
     ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES.PRINTABLE = true;
@@ -757,7 +757,7 @@ namespace folia {
     element_props[AbstractSubtokenAnnotation_t] = &ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES;
 //------ AbstractTextMarkup -------
     ABSTRACT_TEXT_MARKUP_PROPERTIES.ELEMENT_ID = AbstractTextMarkup_t;
-    ABSTRACT_TEXT_MARKUP_PROPERTIES.ACCEPTED_DATA += {AbstractTextMarkup_t, Comment_t, Description_t, Feature_t, Linebreak_t, AbstractFeature_t, XmlText_t};
+    ABSTRACT_TEXT_MARKUP_PROPERTIES.ACCEPTED_DATA += {AbstractFeature_t, AbstractTextMarkup_t, Comment_t, Description_t, Linebreak_t, XmlText_t};
     ABSTRACT_TEXT_MARKUP_PROPERTIES.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
     ABSTRACT_TEXT_MARKUP_PROPERTIES.PRINTABLE = true;
     ABSTRACT_TEXT_MARKUP_PROPERTIES.TEXTCONTAINER = true;
@@ -796,7 +796,7 @@ namespace folia {
     Caption::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Caption_t] = AbstractStructureElement_t;
     Caption::PROPS.ELEMENT_ID = Caption_t;
-    Caption::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t, AbstractFeature_t};
+    Caption::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t};
     Caption::PROPS.LABEL = "Caption";
     Caption::PROPS.OCCURRENCES = 1;
     Caption::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::SPACE|Attrib::TAG;
@@ -806,7 +806,7 @@ namespace folia {
     Cell::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Cell_t] = AbstractStructureElement_t;
     Cell::PROPS.ELEMENT_ID = Cell_t;
-    Cell::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, External_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Head_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Cell::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, External_t, Figure_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t};
     Cell::PROPS.LABEL = "Cell";
     Cell::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::SPACE|Attrib::TAG;
     Cell::PROPS.TEXTDELIMITER = " | ";
@@ -816,7 +816,7 @@ namespace folia {
     Chunk::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Chunk_t] = AbstractSpanAnnotation_t;
     Chunk::PROPS.ELEMENT_ID = Chunk_t;
-    Chunk::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    Chunk::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, WordReference_t};
     Chunk::PROPS.ANNOTATIONTYPE = AnnotationType::CHUNKING;
     Chunk::PROPS.LABEL = "Chunk";
     Chunk::PROPS.XMLTAG = "chunk";
@@ -853,7 +853,7 @@ namespace folia {
     CoreferenceChain::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[CoreferenceChain_t] = AbstractSpanAnnotation_t;
     CoreferenceChain::PROPS.ELEMENT_ID = CoreferenceChain_t;
-    CoreferenceChain::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, CoreferenceLink_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, AbstractFeature_t};
+    CoreferenceChain::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, Comment_t, CoreferenceLink_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t};
     CoreferenceChain::PROPS.ANNOTATIONTYPE = AnnotationType::COREFERENCE;
     CoreferenceChain::PROPS.LABEL = "Coreference Chain";
     CoreferenceChain::PROPS.REQUIRED_DATA += {CoreferenceLink_t};
@@ -871,7 +871,7 @@ namespace folia {
     CoreferenceLink::PROPS = ABSTRACT_SPAN_ROLE_PROPERTIES;
     abstract_parents[CoreferenceLink_t] = AbstractSpanRole_t;
     CoreferenceLink::PROPS.ELEMENT_ID = CoreferenceLink_t;
-    CoreferenceLink::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, Headspan_t, LevelFeature_t, LinkReference_t, Metric_t, ModalityFeature_t, Relation_t, TimeFeature_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    CoreferenceLink::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, Headspan_t, LevelFeature_t, LinkReference_t, Metric_t, ModalityFeature_t, Morpheme_t, Phoneme_t, Relation_t, TimeFeature_t, WordReference_t};
     CoreferenceLink::PROPS.ANNOTATIONTYPE = AnnotationType::COREFERENCE;
     CoreferenceLink::PROPS.LABEL = "Coreference Link";
     CoreferenceLink::PROPS.XMLTAG = "coreferencelink";
@@ -880,7 +880,7 @@ namespace folia {
     Correction::PROPS = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
     abstract_parents[Correction_t] = AbstractHigherOrderAnnotation_t;
     Correction::PROPS.ELEMENT_ID = Correction_t;
-    Correction::PROPS.ACCEPTED_DATA += {Comment_t, Current_t, Description_t, ErrorDetection_t, Feature_t, ForeignData_t, Metric_t, New_t, Original_t, Suggestion_t, AbstractFeature_t};
+    Correction::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Current_t, Description_t, ErrorDetection_t, ForeignData_t, Metric_t, New_t, Original_t, Suggestion_t};
     Correction::PROPS.ANNOTATIONTYPE = AnnotationType::CORRECTION;
     Correction::PROPS.LABEL = "Correction";
     Correction::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
@@ -910,7 +910,7 @@ namespace folia {
     Definition::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Definition_t] = AbstractStructureElement_t;
     Definition::PROPS.ELEMENT_ID = Definition_t;
-    Definition::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, Figure_t, ForeignData_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Definition::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Figure_t, ForeignData_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t};
     Definition::PROPS.ANNOTATIONTYPE = AnnotationType::DEFINITION;
     Definition::PROPS.LABEL = "Definition";
     Definition::PROPS.XMLTAG = "def";
@@ -927,7 +927,7 @@ namespace folia {
     Dependency::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Dependency_t] = AbstractSpanAnnotation_t;
     Dependency::PROPS.ELEMENT_ID = Dependency_t;
-    Dependency::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, DependencyDependent_t, Description_t, Feature_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, Relation_t, AbstractFeature_t};
+    Dependency::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, Comment_t, DependencyDependent_t, Description_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, Relation_t};
     Dependency::PROPS.ANNOTATIONTYPE = AnnotationType::DEPENDENCY;
     Dependency::PROPS.LABEL = "Dependency";
     Dependency::PROPS.REQUIRED_DATA += {DependencyDependent_t, Headspan_t};
@@ -955,7 +955,7 @@ namespace folia {
     Division::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Division_t] = AbstractStructureElement_t;
     Division::PROPS.ELEMENT_ID = Division_t;
-    Division::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Division::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, Figure_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, Table_t, TextContent_t, Utterance_t, Whitespace_t};
     Division::PROPS.ANNOTATIONTYPE = AnnotationType::DIVISION;
     Division::PROPS.LABEL = "Division";
     Division::PROPS.TEXTDELIMITER = "\n\n\n";
@@ -982,7 +982,7 @@ namespace folia {
     Entity::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Entity_t] = AbstractSpanAnnotation_t;
     Entity::PROPS.ELEMENT_ID = Entity_t;
-    Entity::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    Entity::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, WordReference_t};
     Entity::PROPS.ANNOTATIONTYPE = AnnotationType::ENTITY;
     Entity::PROPS.LABEL = "Entity";
     Entity::PROPS.XMLTAG = "entity";
@@ -991,7 +991,7 @@ namespace folia {
     Entry::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Entry_t] = AbstractStructureElement_t;
     Entry::PROPS.ELEMENT_ID = Entry_t;
-    Entry::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Definition_t, Description_t, Example_t, External_t, Feature_t, ForeignData_t, Metric_t, Part_t, Relation_t, String_t, Term_t, TextContent_t, AbstractFeature_t};
+    Entry::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Definition_t, Description_t, Example_t, External_t, ForeignData_t, Metric_t, Part_t, Relation_t, String_t, Term_t, TextContent_t};
     Entry::PROPS.ANNOTATIONTYPE = AnnotationType::ENTRY;
     Entry::PROPS.LABEL = "Entry";
     Entry::PROPS.XMLTAG = "entry";
@@ -1017,7 +1017,7 @@ namespace folia {
     Event::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Event_t] = AbstractStructureElement_t;
     Event::PROPS.ELEMENT_ID = Event_t;
-    Event::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, ActorFeature_t, Alternative_t, AlternativeLayers_t, BegindatetimeFeature_t, Comment_t, Correction_t, Description_t, Division_t, EnddatetimeFeature_t, Entry_t, Event_t, Example_t, External_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Head_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Event::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, ActorFeature_t, Alternative_t, AlternativeLayers_t, BegindatetimeFeature_t, Comment_t, Correction_t, Description_t, Division_t, EnddatetimeFeature_t, Entry_t, Event_t, Example_t, External_t, Figure_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t};
     Event::PROPS.ANNOTATIONTYPE = AnnotationType::EVENT;
     Event::PROPS.LABEL = "Event";
     Event::PROPS.XMLTAG = "event";
@@ -1026,7 +1026,7 @@ namespace folia {
     Example::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Example_t] = AbstractStructureElement_t;
     Example::PROPS.ELEMENT_ID = Example_t;
-    Example::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, Figure_t, ForeignData_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Example::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Figure_t, ForeignData_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t};
     Example::PROPS.ANNOTATIONTYPE = AnnotationType::EXAMPLE;
     Example::PROPS.LABEL = "Example";
     Example::PROPS.XMLTAG = "ex";
@@ -1076,7 +1076,7 @@ namespace folia {
     Figure::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Figure_t] = AbstractStructureElement_t;
     Figure::PROPS.ELEMENT_ID = Figure_t;
-    Figure::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alternative_t, AlternativeLayers_t, Caption_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Linebreak_t, Metric_t, Part_t, Relation_t, String_t, TextContent_t, AbstractFeature_t};
+    Figure::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, Alternative_t, AlternativeLayers_t, Caption_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Linebreak_t, Metric_t, Part_t, Relation_t, String_t, TextContent_t};
     Figure::PROPS.ANNOTATIONTYPE = AnnotationType::FIGURE;
     Figure::PROPS.LABEL = "Figure";
     Figure::PROPS.SPEAKABLE = false;
@@ -1107,7 +1107,7 @@ namespace folia {
     Gap::PROPS = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
     abstract_parents[Gap_t] = AbstractHigherOrderAnnotation_t;
     Gap::PROPS.ELEMENT_ID = Gap_t;
-    Gap::PROPS.ACCEPTED_DATA += {Comment_t, Content_t, Description_t, Feature_t, ForeignData_t, Metric_t, Part_t, AbstractFeature_t};
+    Gap::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Content_t, Description_t, ForeignData_t, Metric_t, Part_t};
     Gap::PROPS.ANNOTATIONTYPE = AnnotationType::GAP;
     Gap::PROPS.LABEL = "Gap";
     Gap::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::METADATA|Attrib::TAG;
@@ -1117,7 +1117,7 @@ namespace folia {
     Head::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Head_t] = AbstractStructureElement_t;
     Head::PROPS.ELEMENT_ID = Head_t;
-    Head::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Event_t, External_t, Feature_t, ForeignData_t, Gap_t, Hiddenword_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Head::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Event_t, External_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t};
     Head::PROPS.ANNOTATIONTYPE = AnnotationType::HEAD;
     Head::PROPS.LABEL = "Head";
     Head::PROPS.TEXTDELIMITER = "\n\n";
@@ -1142,7 +1142,7 @@ namespace folia {
     Hiddenword::PROPS = ABSTRACT_WORD_PROPERTIES;
     abstract_parents[Hiddenword_t] = AbstractWord_t;
     Hiddenword::PROPS.ELEMENT_ID = Hiddenword_t;
-    Hiddenword::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t, AbstractFeature_t};
+    Hiddenword::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t};
     Hiddenword::PROPS.ANNOTATIONTYPE = AnnotationType::HIDDENTOKEN;
     Hiddenword::PROPS.HIDDEN = true;
     Hiddenword::PROPS.LABEL = "Hidden Word/Token";
@@ -1165,7 +1165,7 @@ namespace folia {
     Label::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Label_t] = AbstractStructureElement_t;
     Label::PROPS.ELEMENT_ID = Label_t;
-    Label::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Hiddenword_t, Linebreak_t, Metric_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Label::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Linebreak_t, Metric_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t, Whitespace_t};
     Label::PROPS.LABEL = "Label";
     Label::PROPS.XMLTAG = "label";
     element_props[Label_t] = &Label::PROPS;
@@ -1212,7 +1212,7 @@ namespace folia {
     List::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[List_t] = AbstractStructureElement_t;
     List::PROPS.ELEMENT_ID = List_t;
-    List::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Caption_t, Comment_t, Correction_t, Description_t, Event_t, External_t, Feature_t, ForeignData_t, Linebreak_t, ListItem_t, Metric_t, Note_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t, AbstractFeature_t};
+    List::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Caption_t, Comment_t, Correction_t, Description_t, Event_t, External_t, ForeignData_t, Linebreak_t, ListItem_t, Metric_t, Note_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t};
     List::PROPS.ANNOTATIONTYPE = AnnotationType::LIST;
     List::PROPS.LABEL = "List";
     List::PROPS.TEXTDELIMITER = "\n\n";
@@ -1222,7 +1222,7 @@ namespace folia {
     ListItem::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[ListItem_t] = AbstractStructureElement_t;
     ListItem::PROPS.ELEMENT_ID = ListItem_t;
-    ListItem::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Event_t, External_t, Feature_t, ForeignData_t, Gap_t, Hiddenword_t, Label_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    ListItem::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Event_t, External_t, ForeignData_t, Gap_t, Label_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t};
     ListItem::PROPS.LABEL = "List Item";
     ListItem::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
     ListItem::PROPS.TEXTDELIMITER = "\n";
@@ -1232,7 +1232,7 @@ namespace folia {
     Metric::PROPS = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
     abstract_parents[Metric_t] = AbstractHigherOrderAnnotation_t;
     Metric::PROPS.ELEMENT_ID = Metric_t;
-    Metric::PROPS.ACCEPTED_DATA += {Comment_t, Description_t, Feature_t, ForeignData_t, ValueFeature_t, AbstractFeature_t};
+    Metric::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Description_t, ForeignData_t, ValueFeature_t};
     Metric::PROPS.ANNOTATIONTYPE = AnnotationType::METRIC;
     Metric::PROPS.LABEL = "Metric";
     Metric::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
@@ -1250,7 +1250,7 @@ namespace folia {
     Modality::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Modality_t] = AbstractSpanAnnotation_t;
     Modality::PROPS.ELEMENT_ID = Modality_t;
-    Modality::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Cue_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, PolarityFeature_t, Relation_t, Scope_t, Source_t, StrengthFeature_t, Target_t, AbstractFeature_t};
+    Modality::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, Comment_t, Cue_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, PolarityFeature_t, Relation_t, Scope_t, Source_t, StrengthFeature_t, Target_t};
     Modality::PROPS.ANNOTATIONTYPE = AnnotationType::MODALITY;
     Modality::PROPS.LABEL = "Modality";
     Modality::PROPS.XMLTAG = "modality";
@@ -1266,7 +1266,7 @@ namespace folia {
     Morpheme::PROPS = ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES;
     abstract_parents[Morpheme_t] = AbstractSubtokenAnnotation_t;
     Morpheme::PROPS.ELEMENT_ID = Morpheme_t;
-    Morpheme::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Feature_t, ForeignData_t, FunctionFeature_t, Metric_t, Morpheme_t, Part_t, PhonContent_t, Relation_t, String_t, TextContent_t, AbstractFeature_t};
+    Morpheme::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, ForeignData_t, FunctionFeature_t, Metric_t, Morpheme_t, Part_t, PhonContent_t, Relation_t, String_t, TextContent_t};
     Morpheme::PROPS.ANNOTATIONTYPE = AnnotationType::MORPHOLOGICAL;
     Morpheme::PROPS.LABEL = "Morpheme";
     Morpheme::PROPS.TEXTDELIMITER = "";
@@ -1294,7 +1294,7 @@ namespace folia {
     Note::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Note_t] = AbstractStructureElement_t;
     Note::PROPS.ELEMENT_ID = Note_t;
-    Note::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Example_t, External_t, Feature_t, Figure_t, ForeignData_t, Head_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Note::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Example_t, External_t, Figure_t, ForeignData_t, Head_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t};
     Note::PROPS.ANNOTATIONTYPE = AnnotationType::NOTE;
     Note::PROPS.LABEL = "Note";
     Note::PROPS.XMLTAG = "note";
@@ -1303,7 +1303,7 @@ namespace folia {
     Observation::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Observation_t] = AbstractSpanAnnotation_t;
     Observation::PROPS.ELEMENT_ID = Observation_t;
-    Observation::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    Observation::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, WordReference_t};
     Observation::PROPS.ANNOTATIONTYPE = AnnotationType::OBSERVATION;
     Observation::PROPS.LABEL = "Observation";
     Observation::PROPS.XMLTAG = "observation";
@@ -1330,7 +1330,7 @@ namespace folia {
     Paragraph::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Paragraph_t] = AbstractStructureElement_t;
     Paragraph::PROPS.ELEMENT_ID = Paragraph_t;
-    Paragraph::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, External_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Head_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Paragraph::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, External_t, Figure_t, ForeignData_t, Gap_t, Head_t, Linebreak_t, List_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Whitespace_t};
     Paragraph::PROPS.ANNOTATIONTYPE = AnnotationType::PARAGRAPH;
     Paragraph::PROPS.LABEL = "Paragraph";
     Paragraph::PROPS.TEXTDELIMITER = "\n\n";
@@ -1340,7 +1340,7 @@ namespace folia {
     Part::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Part_t] = AbstractStructureElement_t;
     Part::PROPS.ELEMENT_ID = Part_t;
-    Part::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, AbstractStructureElement_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Relation_t, TextContent_t, AbstractFeature_t};
+    Part::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractStructureElement_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Relation_t, TextContent_t};
     Part::PROPS.ANNOTATIONTYPE = AnnotationType::PART;
     Part::PROPS.LABEL = "Part";
     Part::PROPS.TEXTDELIMITER = " ";
@@ -1350,7 +1350,7 @@ namespace folia {
     PhonContent::PROPS = ABSTRACT_CONTENT_ANNOTATION_PROPERTIES;
     abstract_parents[PhonContent_t] = AbstractContentAnnotation_t;
     PhonContent::PROPS.ELEMENT_ID = PhonContent_t;
-    PhonContent::PROPS.ACCEPTED_DATA += {Comment_t, Description_t, Feature_t, AbstractFeature_t, XmlText_t};
+    PhonContent::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Description_t, XmlText_t};
     PhonContent::PROPS.ANNOTATIONTYPE = AnnotationType::PHON;
     PhonContent::PROPS.LABEL = "Phonetic Content";
     PhonContent::PROPS.PHONCONTAINER = true;
@@ -1362,7 +1362,7 @@ namespace folia {
     Phoneme::PROPS = ABSTRACT_SUBTOKEN_ANNOTATION_PROPERTIES;
     abstract_parents[Phoneme_t] = AbstractSubtokenAnnotation_t;
     Phoneme::PROPS.ELEMENT_ID = Phoneme_t;
-    Phoneme::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Feature_t, ForeignData_t, FunctionFeature_t, Metric_t, Part_t, PhonContent_t, Phoneme_t, Relation_t, String_t, TextContent_t, AbstractFeature_t};
+    Phoneme::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, ForeignData_t, FunctionFeature_t, Metric_t, Part_t, PhonContent_t, Phoneme_t, Relation_t, String_t, TextContent_t};
     Phoneme::PROPS.ANNOTATIONTYPE = AnnotationType::PHONOLOGICAL;
     Phoneme::PROPS.LABEL = "Phoneme";
     Phoneme::PROPS.TEXTDELIMITER = "";
@@ -1388,7 +1388,7 @@ namespace folia {
     PosAnnotation::PROPS = ABSTRACT_INLINE_ANNOTATION_PROPERTIES;
     abstract_parents[PosAnnotation_t] = AbstractInlineAnnotation_t;
     PosAnnotation::PROPS.ELEMENT_ID = PosAnnotation_t;
-    PosAnnotation::PROPS.ACCEPTED_DATA += {Comment_t, Description_t, Feature_t, ForeignData_t, HeadFeature_t, Metric_t, AbstractFeature_t};
+    PosAnnotation::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Description_t, ForeignData_t, HeadFeature_t, Metric_t};
     PosAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::POS;
     PosAnnotation::PROPS.LABEL = "Part-of-Speech";
     PosAnnotation::PROPS.XMLTAG = "pos";
@@ -1397,7 +1397,7 @@ namespace folia {
     Predicate::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Predicate_t] = AbstractSpanAnnotation_t;
     Predicate::PROPS.ELEMENT_ID = Predicate_t;
-    Predicate::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, SemanticRole_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    Predicate::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, SemanticRole_t, WordReference_t};
     Predicate::PROPS.ANNOTATIONTYPE = AnnotationType::PREDICATE;
     Predicate::PROPS.LABEL = "Predicate";
     Predicate::PROPS.XMLTAG = "predicate";
@@ -1406,7 +1406,7 @@ namespace folia {
     Quote::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Quote_t] = AbstractStructureElement_t;
     Quote::PROPS.ELEMENT_ID = Quote_t;
-    Quote::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, External_t, Feature_t, ForeignData_t, Gap_t, Hiddenword_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Quote::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, External_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Utterance_t, Whitespace_t};
     Quote::PROPS.ANNOTATIONTYPE = AnnotationType::QUOTE;
     Quote::PROPS.LABEL = "Quote";
     Quote::PROPS.XMLTAG = "quote";
@@ -1415,7 +1415,7 @@ namespace folia {
     Reference::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Reference_t] = AbstractStructureElement_t;
     Reference::PROPS.ELEMENT_ID = Reference_t;
-    Reference::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Hiddenword_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Relation_t, Sentence_t, String_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Reference::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Linebreak_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Relation_t, Sentence_t, String_t, TextContent_t, Utterance_t, Whitespace_t};
     Reference::PROPS.ANNOTATIONTYPE = AnnotationType::REFERENCE;
     Reference::PROPS.LABEL = "Reference";
     Reference::PROPS.TEXTDELIMITER = " ";
@@ -1426,7 +1426,7 @@ namespace folia {
     Relation::PROPS = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
     abstract_parents[Relation_t] = AbstractHigherOrderAnnotation_t;
     Relation::PROPS.ELEMENT_ID = Relation_t;
-    Relation::PROPS.ACCEPTED_DATA += {Comment_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, AbstractFeature_t};
+    Relation::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Description_t, ForeignData_t, LinkReference_t, Metric_t};
     Relation::PROPS.ANNOTATIONTYPE = AnnotationType::RELATION;
     Relation::PROPS.LABEL = "Relation";
     Relation::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
@@ -1440,7 +1440,7 @@ namespace folia {
     Row::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Row_t] = AbstractStructureElement_t;
     Row::PROPS.ELEMENT_ID = Row_t;
-    Row::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Cell_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Metric_t, Part_t, Relation_t, AbstractFeature_t};
+    Row::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Cell_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Metric_t, Part_t, Relation_t};
     Row::PROPS.LABEL = "Table Row";
     Row::PROPS.TEXTDELIMITER = "\n";
     Row::PROPS.XMLTAG = "row";
@@ -1449,7 +1449,7 @@ namespace folia {
     Scope::PROPS = ABSTRACT_SPAN_ROLE_PROPERTIES;
     abstract_parents[Scope_t] = AbstractSpanRole_t;
     Scope::PROPS.ELEMENT_ID = Scope_t;
-    Scope::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Cue_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, Source_t, Target_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    Scope::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Cue_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, Source_t, Target_t, WordReference_t};
     Scope::PROPS.LABEL = "Scope";
     Scope::PROPS.OCCURRENCES = 1;
     Scope::PROPS.XMLTAG = "scope";
@@ -1458,7 +1458,7 @@ namespace folia {
     SemanticRole::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[SemanticRole_t] = AbstractSpanAnnotation_t;
     SemanticRole::PROPS.ELEMENT_ID = SemanticRole_t;
-    SemanticRole::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, Relation_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    SemanticRole::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, WordReference_t};
     SemanticRole::PROPS.ANNOTATIONTYPE = AnnotationType::SEMROLE;
     SemanticRole::PROPS.LABEL = "Semantic Role";
     SemanticRole::PROPS.REQUIRED_ATTRIBS = Attrib::CLASS;
@@ -1476,7 +1476,7 @@ namespace folia {
     SenseAnnotation::PROPS = ABSTRACT_INLINE_ANNOTATION_PROPERTIES;
     abstract_parents[SenseAnnotation_t] = AbstractInlineAnnotation_t;
     SenseAnnotation::PROPS.ELEMENT_ID = SenseAnnotation_t;
-    SenseAnnotation::PROPS.ACCEPTED_DATA += {Comment_t, Description_t, Feature_t, ForeignData_t, Metric_t, SynsetFeature_t, AbstractFeature_t};
+    SenseAnnotation::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Description_t, ForeignData_t, Metric_t, SynsetFeature_t};
     SenseAnnotation::PROPS.ANNOTATIONTYPE = AnnotationType::SENSE;
     SenseAnnotation::PROPS.LABEL = "Semantic Sense";
     SenseAnnotation::PROPS.OCCURRENCES_PER_SET = 0;
@@ -1486,7 +1486,7 @@ namespace folia {
     Sentence::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Sentence_t] = AbstractStructureElement_t;
     Sentence::PROPS.ELEMENT_ID = Sentence_t;
-    Sentence::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, External_t, Feature_t, ForeignData_t, Gap_t, Hiddenword_t, Linebreak_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, String_t, TextContent_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Sentence::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Entry_t, Event_t, Example_t, External_t, ForeignData_t, Gap_t, Linebreak_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, String_t, TextContent_t, Whitespace_t};
     Sentence::PROPS.ANNOTATIONTYPE = AnnotationType::SENTENCE;
     Sentence::PROPS.LABEL = "Sentence";
     Sentence::PROPS.TEXTDELIMITER = " ";
@@ -1496,7 +1496,7 @@ namespace folia {
     Sentiment::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Sentiment_t] = AbstractSpanAnnotation_t;
     Sentiment::PROPS.ELEMENT_ID = Sentiment_t;
-    Sentiment::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, PolarityFeature_t, Relation_t, Source_t, StrengthFeature_t, Target_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    Sentiment::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, PolarityFeature_t, Relation_t, Source_t, StrengthFeature_t, Target_t, WordReference_t};
     Sentiment::PROPS.ANNOTATIONTYPE = AnnotationType::SENTIMENT;
     Sentiment::PROPS.LABEL = "Sentiment";
     Sentiment::PROPS.XMLTAG = "sentiment";
@@ -1528,7 +1528,7 @@ namespace folia {
     SpanRelation::PROPS = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
     abstract_parents[SpanRelation_t] = AbstractHigherOrderAnnotation_t;
     SpanRelation::PROPS.ELEMENT_ID = SpanRelation_t;
-    SpanRelation::PROPS.ACCEPTED_DATA += {Comment_t, Description_t, Feature_t, ForeignData_t, Metric_t, Relation_t, AbstractFeature_t};
+    SpanRelation::PROPS.ACCEPTED_DATA += {AbstractFeature_t, Comment_t, Description_t, ForeignData_t, Metric_t, Relation_t};
     SpanRelation::PROPS.ANNOTATIONTYPE = AnnotationType::SPANRELATION;
     SpanRelation::PROPS.LABEL = "Span Relation";
     SpanRelation::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
@@ -1549,7 +1549,7 @@ namespace folia {
     Speech::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Speech_t] = AbstractStructureElement_t;
     Speech::PROPS.ELEMENT_ID = Speech_t;
-    Speech::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, Feature_t, ForeignData_t, Gap_t, Hiddenword_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Utterance_t, AbstractWord_t, AbstractFeature_t};
+    Speech::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, ForeignData_t, Gap_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, Utterance_t};
     Speech::PROPS.LABEL = "Speech Body";
     Speech::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::ANNOTATOR|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::SPACE|Attrib::TAG;
     Speech::PROPS.TEXTDELIMITER = "\n\n\n";
@@ -1559,7 +1559,7 @@ namespace folia {
     Statement::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[Statement_t] = AbstractSpanAnnotation_t;
     Statement::PROPS.ELEMENT_ID = Statement_t;
-    Statement::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, Relation_t, Source_t, StatementRelation_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    Statement::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, Headspan_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, Source_t, StatementRelation_t, WordReference_t};
     Statement::PROPS.ANNOTATIONTYPE = AnnotationType::STATEMENT;
     Statement::PROPS.LABEL = "Statement";
     Statement::PROPS.XMLTAG = "statement";
@@ -1591,7 +1591,7 @@ namespace folia {
     String::PROPS = ABSTRACT_HIGHER_ORDER_ANNOTATION_PROPERTIES;
     abstract_parents[String_t] = AbstractHigherOrderAnnotation_t;
     String::PROPS.ELEMENT_ID = String_t;
-    String::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Correction_t, Description_t, Feature_t, ForeignData_t, Metric_t, PhonContent_t, Relation_t, TextContent_t, AbstractFeature_t};
+    String::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, Comment_t, Correction_t, Description_t, ForeignData_t, Metric_t, PhonContent_t, Relation_t, TextContent_t};
     String::PROPS.ANNOTATIONTYPE = AnnotationType::STRING;
     String::PROPS.LABEL = "String";
     String::PROPS.OCCURRENCES = 0;
@@ -1635,7 +1635,7 @@ namespace folia {
     SyntacticUnit::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[SyntacticUnit_t] = AbstractSpanAnnotation_t;
     SyntacticUnit::PROPS.ELEMENT_ID = SyntacticUnit_t;
-    SyntacticUnit::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, Comment_t, Description_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, SyntacticUnit_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    SyntacticUnit::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Comment_t, Description_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, SyntacticUnit_t, WordReference_t};
     SyntacticUnit::PROPS.ANNOTATIONTYPE = AnnotationType::SYNTAX;
     SyntacticUnit::PROPS.LABEL = "Syntactic Unit";
     SyntacticUnit::PROPS.XMLTAG = "su";
@@ -1652,7 +1652,7 @@ namespace folia {
     Table::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Table_t] = AbstractStructureElement_t;
     Table::PROPS.ELEMENT_ID = Table_t;
-    Table::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Linebreak_t, Metric_t, Part_t, Relation_t, Row_t, TableHead_t, AbstractFeature_t};
+    Table::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Linebreak_t, Metric_t, Part_t, Relation_t, Row_t, TableHead_t};
     Table::PROPS.ANNOTATIONTYPE = AnnotationType::TABLE;
     Table::PROPS.LABEL = "Table";
     Table::PROPS.XMLTAG = "table";
@@ -1661,7 +1661,7 @@ namespace folia {
     TableHead::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[TableHead_t] = AbstractStructureElement_t;
     TableHead::PROPS.ELEMENT_ID = TableHead_t;
-    TableHead::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Metric_t, Part_t, Relation_t, Row_t, AbstractFeature_t};
+    TableHead::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Metric_t, Part_t, Relation_t, Row_t};
     TableHead::PROPS.LABEL = "Table Header";
     TableHead::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::TAG;
     TableHead::PROPS.XMLTAG = "tablehead";
@@ -1678,7 +1678,7 @@ namespace folia {
     Term::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Term_t] = AbstractStructureElement_t;
     Term::PROPS.ELEMENT_ID = Term_t;
-    Term::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Event_t, External_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Term::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Event_t, External_t, Figure_t, ForeignData_t, Gap_t, Linebreak_t, List_t, Metric_t, Paragraph_t, Part_t, PhonContent_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Utterance_t, Whitespace_t};
     Term::PROPS.ANNOTATIONTYPE = AnnotationType::TERM;
     Term::PROPS.LABEL = "Term";
     Term::PROPS.XMLTAG = "term";
@@ -1687,7 +1687,7 @@ namespace folia {
     Text::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Text_t] = AbstractStructureElement_t;
     Text::PROPS.ELEMENT_ID = Text_t;
-    Text::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, Feature_t, Figure_t, ForeignData_t, Gap_t, Hiddenword_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Whitespace_t, AbstractWord_t, AbstractFeature_t};
+    Text::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, Division_t, Entry_t, Event_t, Example_t, External_t, Figure_t, ForeignData_t, Gap_t, Linebreak_t, List_t, Metric_t, Note_t, Paragraph_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, Table_t, TextContent_t, Whitespace_t};
     Text::PROPS.LABEL = "Text Body";
     Text::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::ANNOTATOR|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::METADATA|Attrib::SPACE|Attrib::TAG;
     Text::PROPS.TEXTDELIMITER = "\n\n\n";
@@ -1697,7 +1697,7 @@ namespace folia {
     TextContent::PROPS = ABSTRACT_CONTENT_ANNOTATION_PROPERTIES;
     abstract_parents[TextContent_t] = AbstractContentAnnotation_t;
     TextContent::PROPS.ELEMENT_ID = TextContent_t;
-    TextContent::PROPS.ACCEPTED_DATA += {AbstractTextMarkup_t, Comment_t, Description_t, Feature_t, Linebreak_t, AbstractFeature_t, XmlText_t};
+    TextContent::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractTextMarkup_t, Comment_t, Description_t, Linebreak_t, XmlText_t};
     TextContent::PROPS.ANNOTATIONTYPE = AnnotationType::TEXT;
     TextContent::PROPS.LABEL = "Text";
     TextContent::PROPS.PRINTABLE = true;
@@ -1761,7 +1761,7 @@ namespace folia {
     TextMarkupStyle::PROPS = ABSTRACT_TEXT_MARKUP_PROPERTIES;
     abstract_parents[TextMarkupStyle_t] = AbstractTextMarkup_t;
     TextMarkupStyle::PROPS.ELEMENT_ID = TextMarkupStyle_t;
-    TextMarkupStyle::PROPS.ACCEPTED_DATA += {AbstractTextMarkup_t, Comment_t, Description_t, Feature_t, FontFeature_t, Linebreak_t, SizeFeature_t, AbstractFeature_t};
+    TextMarkupStyle::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractTextMarkup_t, Comment_t, Description_t, FontFeature_t, Linebreak_t, SizeFeature_t};
     TextMarkupStyle::PROPS.ANNOTATIONTYPE = AnnotationType::STYLE;
     TextMarkupStyle::PROPS.XMLTAG = "t-style";
     element_props[TextMarkupStyle_t] = &TextMarkupStyle::PROPS;
@@ -1785,7 +1785,7 @@ namespace folia {
     TimeSegment::PROPS = ABSTRACT_SPAN_ANNOTATION_PROPERTIES;
     abstract_parents[TimeSegment_t] = AbstractSpanAnnotation_t;
     TimeSegment::PROPS.ELEMENT_ID = TimeSegment_t;
-    TimeSegment::PROPS.ACCEPTED_DATA += {AbstractInlineAnnotation_t, ActorFeature_t, BegindatetimeFeature_t, Comment_t, Description_t, EnddatetimeFeature_t, Feature_t, ForeignData_t, LinkReference_t, Metric_t, Relation_t, WordReference_t, AbstractFeature_t, Hiddenword_t, Morpheme_t, Phoneme_t, AbstractWord_t};
+    TimeSegment::PROPS.ACCEPTED_DATA += {AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, ActorFeature_t, BegindatetimeFeature_t, Comment_t, Description_t, EnddatetimeFeature_t, ForeignData_t, LinkReference_t, Metric_t, Morpheme_t, Phoneme_t, Relation_t, WordReference_t};
     TimeSegment::PROPS.ANNOTATIONTYPE = AnnotationType::TIMESEGMENT;
     TimeSegment::PROPS.LABEL = "Time Segment";
     TimeSegment::PROPS.XMLTAG = "timesegment";
@@ -1802,7 +1802,7 @@ namespace folia {
     Utterance::PROPS = ABSTRACT_STRUCTURE_ELEMENT_PROPERTIES;
     abstract_parents[Utterance_t] = AbstractStructureElement_t;
     Utterance::PROPS.ELEMENT_ID = Utterance_t;
-    Utterance::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Gap_t, Hiddenword_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t, AbstractWord_t, AbstractFeature_t};
+    Utterance::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, AbstractWord_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Gap_t, Metric_t, Note_t, Part_t, PhonContent_t, Quote_t, Reference_t, Relation_t, Sentence_t, String_t, TextContent_t};
     Utterance::PROPS.ANNOTATIONTYPE = AnnotationType::UTTERANCE;
     Utterance::PROPS.LABEL = "Utterance";
     Utterance::PROPS.TEXTDELIMITER = " ";
@@ -1829,7 +1829,7 @@ namespace folia {
     Word::PROPS = ABSTRACT_WORD_PROPERTIES;
     abstract_parents[Word_t] = AbstractWord_t;
     Word::PROPS.ELEMENT_ID = Word_t;
-    Word::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, Feature_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t, AbstractFeature_t};
+    Word::PROPS.ACCEPTED_DATA += {AbstractAnnotationLayer_t, AbstractFeature_t, AbstractInlineAnnotation_t, Alternative_t, AlternativeLayers_t, Comment_t, Correction_t, Description_t, External_t, ForeignData_t, Metric_t, Part_t, PhonContent_t, Reference_t, Relation_t, String_t, TextContent_t};
     Word::PROPS.ANNOTATIONTYPE = AnnotationType::TOKEN;
     Word::PROPS.LABEL = "Word/Token";
     Word::PROPS.OPTIONAL_ATTRIBS = Attrib::ID|Attrib::CLASS|Attrib::ANNOTATOR|Attrib::N|Attrib::CONFIDENCE|Attrib::DATETIME|Attrib::SRC|Attrib::BEGINTIME|Attrib::ENDTIME|Attrib::SPEAKER|Attrib::TEXTCLASS|Attrib::METADATA|Attrib::SPACE|Attrib::TAG;
@@ -1876,7 +1876,6 @@ namespace folia {
      { AbstractSpanAnnotation_t, {  } },
      { AbstractSpanRole_t, { AbstractSpanAnnotation_t } },
      { AbstractStructureElement_t, {  } },
-     { AbstractWord_t, { AbstractStructureElement_t } },
      { AbstractSubtokenAnnotation_t, {  } },
      { AbstractTextMarkup_t, {  } },
      { ActorFeature_t, { AbstractHigherOrderAnnotation_t,AbstractFeature_t } },
@@ -1920,7 +1919,7 @@ namespace folia {
      { Head_t, { AbstractStructureElement_t } },
      { HeadFeature_t, { AbstractHigherOrderAnnotation_t,AbstractFeature_t } },
      { Headspan_t, { AbstractSpanRole_t,AbstractSpanAnnotation_t } },
-     { Hiddenword_t, { AbstractWord_t, AbstractStructureElement_t } },
+     { Hiddenword_t, { AbstractStructureElement_t,AbstractWord_t } },
      { Hyphbreak_t, { AbstractTextMarkup_t } },
      { Label_t, { AbstractStructureElement_t } },
      { LangAnnotation_t, { AbstractInlineAnnotation_t } },
@@ -1996,7 +1995,7 @@ namespace folia {
      { Utterance_t, { AbstractStructureElement_t } },
      { ValueFeature_t, { AbstractHigherOrderAnnotation_t,AbstractFeature_t } },
      { Whitespace_t, { AbstractStructureElement_t } },
-     { Word_t, { AbstractWord_t, AbstractStructureElement_t } },
+     { Word_t, { AbstractStructureElement_t,AbstractWord_t } },
   };
 
   //foliaspec:oldtags_map