diff --git a/local/templates/composition/Sozialstrukturelle Merkmale.oet b/local/templates/composition/Sozialstrukturelle Merkmale.oet
index 3ec61a9e..2b6b53d4 100644
--- a/local/templates/composition/Sozialstrukturelle Merkmale.oet	
+++ b/local/templates/composition/Sozialstrukturelle Merkmale.oet	
@@ -53,7 +53,7 @@
             </item>
             <item>
                 <key>sem_ver</key>
-                <value>23.1.0</value>
+                <value>24.0.0</value>
             </item>
             <item>
                 <key>build_uid</key>
@@ -61,7 +61,7 @@
             </item>
             <item>
                 <key>MD5-CAM-1.0.1</key>
-                <value>e27652be86a59e1a49bd377ad9d208eb</value>
+                <value>be0bcb05a1c3f59a36b9b19398cf9798</value>
             </item>
             <item>
                 <key>PARENT:MD5-CAM-1.0.1</key>
@@ -83,21 +83,17 @@
         name="Sozialstrukturelle Merkmale"
         xmlns:tem="openEHR/v1/Template"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:COMPOSITION">
-        <Content archetype_id="openEHR-EHR-SECTION.adhoc.v1"
-            concept_name="Ad hoc Überschrift" max="1" name="Geburtsland"
-            path="/content" xsi:type="tem:SECTION">
-            <Item archetype_id="openEHR-EHR-EVALUATION.absence.v2"
-                concept_name="Fehlen von Informationen" max="1"
-                name="Geburtsland" path="/items" xsi:type="tem:EVALUATION">
-                <Rule name="Sind Sie in Deutschland geboren?" path="/data[at0001]/items[at0002]">
-                    <constraint xsi:type="tem:textConstraint">
-                        <includedValues>Ja</includedValues>
-                        <includedValues>Nein</includedValues>
-                    </constraint>
-                </Rule>
-                <Rule max="1" name="Anderes Land" path="/data[at0001]/items[at0005]"/>
-                <Rule max="0" path="/protocol[at0003]/items[at0004]"/>
-            </Item>
+        <Content archetype_id="openEHR-EHR-EVALUATION.absence.v2"
+            concept_name="Fehlen von Informationen" max="1"
+            name="Geburtsland" path="/content" xsi:type="tem:EVALUATION">
+            <Rule name="Sind Sie in Deutschland geboren?" path="/data[at0001]/items[at0002]">
+                <constraint xsi:type="tem:textConstraint">
+                    <includedValues>Ja</includedValues>
+                    <includedValues>Nein</includedValues>
+                </constraint>
+            </Rule>
+            <Rule max="1" name="Anderes Land" path="/data[at0001]/items[at0005]"/>
+            <Rule max="0" path="/protocol[at0003]/items[at0004]"/>
         </Content>
         <Content archetype_id="openEHR-EHR-EVALUATION.social_network.v1"
             concept_name="Soziales Netzwerk" max="1"
@@ -119,41 +115,37 @@
             </Rule>
             <Rule max="0" path="/protocol[at0010]/items[at0011]"/>
         </Content>
-        <Content archetype_id="openEHR-EHR-SECTION.adhoc.v1"
-            concept_name="Ad hoc Überschrift" max="1"
-            name="Familienbeziehung" path="/content" xsi:type="tem:SECTION">
-            <Item archetype_id="openEHR-EHR-EVALUATION.absence.v2"
-                concept_name="Fehlen von Informationen" max="1"
-                name="Kinder" path="/items" xsi:type="tem:EVALUATION">
-                <Rule name="Haben Sie Kinder?" path="/data[at0001]/items[at0002]">
-                    <constraint xsi:type="tem:textConstraint">
-                        <includedValues>Ja</includedValues>
-                        <includedValues>Nein</includedValues>
-                    </constraint>
-                </Rule>
-                <Rule max="1" name="Anzahl der Kinder" path="/data[at0001]/items[at0005]">
-                    <constraint xsi:type="tem:textConstraint">
-                        <includedValues>1</includedValues>
-                        <includedValues>2</includedValues>
-                        <includedValues>3</includedValues>
-                        <includedValues>4</includedValues>
-                        <includedValues>5</includedValues>
-                        <includedValues>6</includedValues>
-                        <includedValues>7</includedValues>
-                        <includedValues>8</includedValues>
-                        <includedValues>9</includedValues>
-                        <includedValues>10</includedValues>
-                        <includedValues>11</includedValues>
-                        <includedValues>12</includedValues>
-                        <includedValues>13</includedValues>
-                        <includedValues>14</includedValues>
-                        <includedValues>15</includedValues>
-                        <includedValues>16</includedValues>
-                        <includedValues>17</includedValues>
-                    </constraint>
-                </Rule>
-                <Rule max="0" path="/protocol[at0003]/items[at0004]"/>
-            </Item>
+        <Content archetype_id="openEHR-EHR-EVALUATION.absence.v2"
+            concept_name="Fehlen von Informationen" max="1"
+            name="Kinder" path="/content" xsi:type="tem:EVALUATION">
+            <Rule name="Haben Sie Kinder?" path="/data[at0001]/items[at0002]">
+                <constraint xsi:type="tem:textConstraint">
+                    <includedValues>Ja</includedValues>
+                    <includedValues>Nein</includedValues>
+                </constraint>
+            </Rule>
+            <Rule max="1" name="Anzahl der Kinder" path="/data[at0001]/items[at0005]">
+                <constraint xsi:type="tem:textConstraint">
+                    <includedValues>1</includedValues>
+                    <includedValues>2</includedValues>
+                    <includedValues>3</includedValues>
+                    <includedValues>4</includedValues>
+                    <includedValues>5</includedValues>
+                    <includedValues>6</includedValues>
+                    <includedValues>7</includedValues>
+                    <includedValues>8</includedValues>
+                    <includedValues>9</includedValues>
+                    <includedValues>10</includedValues>
+                    <includedValues>11</includedValues>
+                    <includedValues>12</includedValues>
+                    <includedValues>13</includedValues>
+                    <includedValues>14</includedValues>
+                    <includedValues>15</includedValues>
+                    <includedValues>16</includedValues>
+                    <includedValues>17</includedValues>
+                </constraint>
+            </Rule>
+            <Rule max="0" path="/protocol[at0003]/items[at0004]"/>
         </Content>
         <Content
             archetype_id="openEHR-EHR-EVALUATION.education_summary.v1"
@@ -292,11 +284,6 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
         <digest id="MD5-CAM-1.0.1">CD5C7EF669BF9300C4CE104319009B71</digest>
     </integrity_checks>
-    <integrity_checks archetype_id="openEHR-EHR-SECTION.adhoc.v1"
-        xmlns:tem="openEHR/v1/Template"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
-        <digest id="MD5-CAM-1.0.1">8FE80F3E80C594AAF99D3BA540A53D73</digest>
-    </integrity_checks>
     <integrity_checks archetype_id="openEHR-EHR-EVALUATION.absence.v2"
         xmlns:tem="openEHR/v1/Template"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
@@ -306,7 +293,7 @@
         archetype_id="openEHR-EHR-EVALUATION.social_network.v1"
         xmlns:tem="openEHR/v1/Template"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="tem:ArchetypeIntegrity">
-        <digest id="MD5-CAM-1.0.1">8D51C7D41FE769FA1AAEA7155A8B7447</digest>
+        <digest id="MD5-CAM-1.0.1">DB7D4B698449B0D99CB352CDB935B693</digest>
     </integrity_checks>
     <integrity_checks
         archetype_id="openEHR-EHR-EVALUATION.education_summary.v1"