diff --git a/.vscode/settings.json b/.vscode/settings.json
index 904da8e..414bf71 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -43,4 +43,6 @@
         "xs:documentation"
     ],
     "xml.format.spaceBeforeEmptyCloseTag": true,
+    "editor.formatOnSave": true,
+    "editor.formatOnSaveMode": "modificationsIfAvailable",
 }
diff --git a/3.2/itop_design.xsd b/3.2/itop_design.xsd
index d7d005d..8385939 100644
--- a/3.2/itop_design.xsd
+++ b/3.2/itop_design.xsd
@@ -519,22 +519,32 @@
                                                                 <xs:complexType>
                                                                     <xs:all>
                                                                         <xs:element name="hidden" minOccurs="0">
-                                                                            <xs:complexType />
+                                                                            <xs:complexType>
+                                                                                <xs:attributeGroup ref="alteredNode" />
+                                                                            </xs:complexType>
                                                                         </xs:element>
                                                                         <xs:element name="read_only" minOccurs="0">
-                                                                            <xs:complexType />
+                                                                            <xs:complexType>
+                                                                                <xs:attributeGroup ref="alteredNode" />
+                                                                            </xs:complexType>
                                                                         </xs:element>
                                                                         <xs:element name="must_prompt" minOccurs="0">
-                                                                            <xs:complexType />
+                                                                            <xs:complexType>
+                                                                                <xs:attributeGroup ref="alteredNode" />
+                                                                            </xs:complexType>
                                                                         </xs:element>
                                                                         <xs:element name="must_change" minOccurs="0">
-                                                                            <xs:complexType />
+                                                                            <xs:complexType>
+                                                                                <xs:attributeGroup ref="alteredNode" />
+                                                                            </xs:complexType>
                                                                         </xs:element>
                                                                         <xs:element name="mandatory" minOccurs="0">
-                                                                            <xs:complexType />
+                                                                            <xs:complexType>
+                                                                                <xs:attributeGroup ref="alteredNode" />
+                                                                            </xs:complexType>
                                                                         </xs:element>
                                                                     </xs:all>
-                                                                    <xs:attribute name="id" type="xs:string" use="required" />
+                                                                    <xs:attributeGroup ref="alteredIdNode" />
                                                                 </xs:complexType>
                                                             </xs:element>
                                                         </xs:sequence>
@@ -554,19 +564,27 @@
                                                                                         <xs:complexType>
                                                                                             <xs:all>
                                                                                                 <xs:element name="mandatory" minOccurs="0">
-                                                                                                    <xs:complexType />
+                                                                                                    <xs:complexType>
+                                                                                                        <xs:attributeGroup ref="alteredNode" />
+                                                                                                    </xs:complexType>
                                                                                                 </xs:element>
                                                                                                 <xs:element name="must_change" minOccurs="0">
-                                                                                                    <xs:complexType />
+                                                                                                    <xs:complexType>
+                                                                                                        <xs:attributeGroup ref="alteredNode" />
+                                                                                                    </xs:complexType>
                                                                                                 </xs:element>
                                                                                                 <xs:element name="must_prompt" minOccurs="0">
-                                                                                                    <xs:complexType />
+                                                                                                    <xs:complexType>
+                                                                                                        <xs:attributeGroup ref="alteredNode" />
+                                                                                                    </xs:complexType>
                                                                                                 </xs:element>
                                                                                                 <xs:element name="read_only" minOccurs="0">
-                                                                                                    <xs:complexType />
+                                                                                                    <xs:complexType>
+                                                                                                        <xs:attributeGroup ref="alteredNode" />
+                                                                                                    </xs:complexType>
                                                                                                 </xs:element>
                                                                                             </xs:all>
-                                                                                            <xs:attribute name="id" type="xs:string" use="required" />
+                                                                                            <xs:attributeGroup ref="alteredIdNode" />
                                                                                         </xs:complexType>
                                                                                     </xs:element>
                                                                                 </xs:sequence>
@@ -595,16 +613,14 @@
                                                                             </xs:complexType>
                                                                         </xs:element>
                                                                     </xs:all>
-                                                                    <xs:attribute name="id" type="xs:string" use="required" />
-                                                                    <xs:attributeGroup ref="alteredNode" />
+                                                                    <xs:attributeGroup ref="alteredIdNode" />
                                                                 </xs:complexType>
                                                             </xs:element>
                                                         </xs:sequence>
                                                     </xs:complexType>
                                                 </xs:element>
                                             </xs:all>
-                                            <xs:attribute name="id" type="xs:string" use="required" />
-                                            <xs:attributeGroup ref="alteredNode" />
+                                            <xs:attributeGroup ref="alteredIdNode" />
                                         </xs:complexType>
                                     </xs:element>
                                 </xs:sequence>
diff --git a/test/datamodel.must-validate.xml b/test/datamodel.must-validate.xml
index cd3d92f..a2d83e7 100644
--- a/test/datamodel.must-validate.xml
+++ b/test/datamodel.must-validate.xml
@@ -111,11 +111,11 @@
                 <field id="enumTest" xsi:type="AttributeEnum" _delta="define">
                     <sql>enum_test</sql>
                     <values>
-                        <value id="enum1">
-                            <code>enum1</code>
-                            <rank>10</rank>
-                            <style>
-                                <decoration_classes>decoration</decoration_classes>
+                        <value id="enum1" _delta="define">
+                            <code _delta="define">enum1</code>
+                            <rank _delta="define">10</rank>
+                            <style _delta="define">
+                                <decoration_classes _delta="define">decoration</decoration_classes>
                                 <main_color _delta="define">$ibo-lifecycle-active-state-primary-color</main_color>
                                 <complementary_color _delta="define">$ibo-lifecycle-active-state-secondary-color</complementary_color>
                             </style>
@@ -456,6 +456,27 @@
                 </method>
                 <method id="TestMethod2" _delta="delete_if_exists" />
             </methods>
+            <lifecycle>
+                <states>
+                    <state id="state1" _delta="must_exist">
+                        <flags>
+                            <attribute id="attribute1" _delta="define">
+                                <mandatory _delta="define" />
+                            </attribute>
+                        </flags>
+                        <transitions>
+                            <transition id="transition1" _delta="define">
+                                <target>state2</target>
+                                <flags>
+                                    <attribute id="attribute1" _delta="define">
+                                        <mandatory _delta="define" />
+                                    </attribute>
+                                </flags>
+                            </transition>
+                        </transitions>
+                    </state>
+                </states>
+            </lifecycle>
             <presentation>
                 <details>
                     <items>