diff --git a/pom.xml b/pom.xml
index c1c3695ad..e15bab689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,14 +30,13 @@
 
     <properties>
         <java.version>17</java.version>
-        <compas.core.version>local-SNAPSHOT</compas.core.version>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.coverage.exclusions>sct-coverage/**</sonar.coverage.exclusions>
         <aggregate.report.dir>../sct-coverage/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
         <sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
-        <compas-core.version>0.13.0</compas-core.version>
+        <compas-core.version>0.14.0</compas-core.version>
         <compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
         <maven.plugin.javadoc>3.4.1</maven.plugin.javadoc>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
diff --git a/sct-app/src/test/resources/std_1.xml b/sct-app/src/test/resources/std_1.xml
index de295e154..076f9b3a5 100644
--- a/sct-app/src/test/resources/std_1.xml
+++ b/sct-app/src/test/resources/std_1.xml
@@ -34,7 +34,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518"
+                              IEDSystemVersioninstance="1" IEDSubstationinstance="1" VendorName="RTE" IEDredundancy="A"
+                              IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <Services nameLength="64">
             <ConfLNs fixPrefix="true" fixLnInst="true"/>
diff --git a/sct-app/src/test/resources/std_2.xml b/sct-app/src/test/resources/std_2.xml
index 42228c889..e646dcb2f 100644
--- a/sct-app/src/test/resources/std_2.xml
+++ b/sct-app/src/test/resources/std_2.xml
@@ -34,7 +34,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="PDB" ICDSystemVersionUUID="ad27d262-7c90-46df-b480-68088f9fe8a4" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="6b4d51eb-c391-4eef-b118-f516bc09f20c" headerVersion="01.00.00" headerRevision="01.00.00"/>
+            <compas:ICDHeader IEDType="PDB" ICDSystemVersionUUID="ad27d262-7c90-46df-b480-68088f9fe8a4"
+                              IEDSubstationinstance="1" IEDSystemVersioninstance="1" VendorName="RTE" IEDredundancy="A"
+                              IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="6b4d51eb-c391-4eef-b118-f516bc09f20c" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <Services nameLength="64">
             <ConfLNs fixPrefix="true" fixLnInst="true"/>
diff --git a/sct-app/src/test/resources/std_3.xml b/sct-app/src/test/resources/std_3.xml
index 38ce30c55..acf7a87f9 100644
--- a/sct-app/src/test/resources/std_3.xml
+++ b/sct-app/src/test/resources/std_3.xml
@@ -34,7 +34,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00" headerRevision="01.00.00"/>
+            <compas:ICDHeader IEDType="BCU" ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8"
+                              IEDSubstationinstance="1" IEDSystemVersioninstance="1" VendorName="RTE" IEDredundancy="A"
+                              IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <Services nameLength="64">
             <ConfLNs fixPrefix="true" fixLnInst="true"/>
diff --git a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_controlblock_network_configuration.xml b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_controlblock_network_configuration.xml
index 2686501b4..85f985873 100644
--- a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_controlblock_network_configuration.xml
+++ b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_controlblock_network_configuration.xml
@@ -12,10 +12,14 @@
     </Communication>
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME1" IEDType="BCU" IEDSubstationinstance="11" IEDName="IED_NAME1" VendorName="SCLE SFE" IEDmodel="ARKENS-SV1120-HGAAA-EB5" IEDredundancy="A" BayLabel="3THEIX2" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME1" IEDType="BCU" IEDSubstationinstance="11"
+                              IEDSystemVersioninstance="1" IEDName="IED_NAME1" VendorName="SCLE SFE"
+                              IEDmodel="ARKENS-SV1120-HGAAA-EB5" IEDredundancy="A" BayLabel="3THEIX2" hwRev="0.0.2."
+                              swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a"
+                              headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -56,7 +60,7 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -109,7 +113,7 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay2"/>
+            <compas:Bay UUID="UuidBay2" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_extref_errors.xml b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_extref_errors.xml
index 0aa4abf82..63047c685 100644
--- a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_extref_errors.xml
+++ b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_extref_errors.xml
@@ -7,10 +7,13 @@
     <Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -39,10 +42,13 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_ied_errors.xml b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_ied_errors.xml
index 2eac0b60f..61da3b513 100644
--- a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_ied_errors.xml
+++ b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_ied_errors.xml
@@ -8,7 +8,10 @@
     <!-- target IED (IED_NAME1) is missing compas:Bay@UUID -->
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -33,10 +36,13 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -57,10 +63,13 @@
     <!-- source IED (IED_NAME4) missing compas:Bay@UUID -->
     <IED name="IED_NAME3">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -85,7 +94,10 @@
     </IED>
     <IED name="IED_NAME4">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME4" ICDSystemVersionUUID="System_Version_IED_NAME4" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME4" ICDSystemVersionUUID="System_Version_IED_NAME4" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success.xml b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success.xml
index 1c6acbf12..e235d298a 100644
--- a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success.xml
+++ b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success.xml
@@ -7,10 +7,13 @@
     <Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -91,10 +94,13 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -122,10 +128,13 @@
     </IED>
     <IED name="IED_NAME3">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay2"/>
+            <compas:Bay UUID="UuidBay2" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_analyze.xml b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_analyze.xml
index 177659525..d14daf0f7 100644
--- a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_analyze.xml
+++ b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_analyze.xml
@@ -7,10 +7,13 @@
     <Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -41,10 +44,13 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <Services>
             <GSESettings datSet="Conf"/>
@@ -75,10 +81,13 @@
     </IED>
     <IED name="IED_NAME3">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_test_fcda_sort.xml b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_test_fcda_sort.xml
index 567eb21ac..fec1fb02d 100644
--- a/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_test_fcda_sort.xml
+++ b/sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success_test_fcda_sort.xml
@@ -7,10 +7,13 @@
     <Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -41,10 +44,13 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <Services>
             <GSESettings datSet="Conf"/>
@@ -75,10 +81,13 @@
     </IED>
     <IED name="IED_NAME3">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_success.xml b/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_success.xml
index c7869dfd7..7cd696da4 100644
--- a/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_success.xml
+++ b/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_success.xml
@@ -7,7 +7,10 @@
     <Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -33,7 +36,10 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_extref_errors.xml b/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_extref_errors.xml
index 3fd8ae780..f5a281d3d 100644
--- a/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_extref_errors.xml
+++ b/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_extref_errors.xml
@@ -7,7 +7,10 @@
     <Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -104,7 +107,10 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_ied_errors.xml b/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_ied_errors.xml
index 5955cca60..ad441a2cf 100644
--- a/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_ied_errors.xml
+++ b/sct-commons/src/test/resources/scd-extref-iedname/scd_set_extref_iedname_with_ied_errors.xml
@@ -8,7 +8,11 @@
     <!-- Duplicate ICDSystemVersionUUID -->
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="Duplicated_ICDSystemVersionUUID" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="Duplicated_ICDSystemVersionUUID"
+                              VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2."
+                              swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a"
+                              headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -21,7 +25,11 @@
     </IED>
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="Duplicated_ICDSystemVersionUUID" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="Duplicated_ICDSystemVersionUUID"
+                              VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2."
+                              swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a"
+                              headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -46,7 +54,10 @@
     <!-- Blank compas:ICDHeader iedName -->
     <IED name="IED_NAME4">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="" ICDSystemVersionUUID="System_Version_IED_NAME4" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="" ICDSystemVersionUUID="System_Version_IED_NAME4" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
@@ -60,7 +71,10 @@
     <!-- Blank compas:ICDHeader ICDSystemVersionUUID -->
     <IED name="IED_NAME5">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME5" ICDSystemVersionUUID="" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME5" ICDSystemVersionUUID="" VendorName="SCLE SFE" IEDredundancy="A"
+                              IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-hmi-create-report-cb/scd_create_dataset_and_controlblocks_for_hmi.xml b/sct-commons/src/test/resources/scd-hmi-create-report-cb/scd_create_dataset_and_controlblocks_for_hmi.xml
index 3e7491fd0..e50105482 100644
--- a/sct-commons/src/test/resources/scd-hmi-create-report-cb/scd_create_dataset_and_controlblocks_for_hmi.xml
+++ b/sct-commons/src/test/resources/scd-hmi-create-report-cb/scd_create_dataset_and_controlblocks_for_hmi.xml
@@ -8,7 +8,10 @@
     <!-- target IED (IedName1) is missing compas:Bay@UUID -->
     <IED name="IedName1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IedName1" ICDSystemVersionUUID="System_Version_IedName1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IedName1" ICDSystemVersionUUID="System_Version_IedName1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd.xml
index 61c829f27..f12214343 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd.xml
@@ -14,7 +14,8 @@
             <Voltage unit="V" multiplier="k">0</Voltage>
             <Bay name="BAY_1">
                 <Private type="COMPAS-Bay">
-                    <compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7"/>
+                    <compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
                 </Private>
                 <Private type="COMPAS-Criteria">
                     <compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID"/>
@@ -25,7 +26,13 @@
                     </Private>
                     <LNode iedName="None" ldInst="LDGW" lnClass="LLN0">
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" BayLabel="SITE1" IEDName="SITESITE1SCU0" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1SCU0"
+                                              ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                     </LNode>
                 </Function>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_lnode_with_many_compas_icdheader.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_lnode_with_many_compas_icdheader.xml
index e89ea6852..889ad177b 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_lnode_with_many_compas_icdheader.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_lnode_with_many_compas_icdheader.xml
@@ -14,7 +14,8 @@
             <Voltage unit="V" multiplier="k">0</Voltage>
             <Bay name="BAY_1">
                 <Private type="COMPAS-Bay">
-                    <compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7"/>
+                    <compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
                 </Private>
                 <Private type="COMPAS-Criteria">
                     <compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID"/>
@@ -25,13 +26,31 @@
                     </Private>
                     <LNode iedName="None" ldInst="LDGW" lnClass="LLN0">
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" BayLabel="SITE1" IEDName="SITESITE1SCU0" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1SCU0"
+                                              ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="1" BayLabel="SITE1" IEDName="SITESITE1SCU1" ICDSystemVersionUUID="53a72621-4f96-4cc5-b1da-3171c1705bea" VendorName="RTE" IEDredundancy="B" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="1" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1SCU1"
+                                              ICDSystemVersionUUID="53a72621-4f96-4cc5-b1da-3171c1705bea"
+                                              VendorName="RTE" IEDredundancy="B" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="2" BayLabel="SITE1" IEDName="SITESITE1SCU2" ICDSystemVersionUUID="03d7e1c7-d490-4768-a968-23c7a42cca28" VendorName="RTE" IEDredundancy="C" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="2" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1SCU2"
+                                              ICDSystemVersionUUID="03d7e1c7-d490-4768-a968-23c7a42cca28"
+                                              VendorName="RTE" IEDredundancy="C" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                     </LNode>
                 </Function>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_with_same_compas_icd_header_in_different_functions.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_with_same_compas_icd_header_in_different_functions.xml
index d06f64392..6740a061e 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_with_same_compas_icd_header_in_different_functions.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/scd_with_same_compas_icd_header_in_different_functions.xml
@@ -16,14 +16,26 @@
                 <Function name="FUNCTION_1">
                     <LNode iedName="None" ldInst="LDGW" lnClass="LLN0">
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" BayLabel="SITE1" IEDName="SITESITE1SCU0" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1SCU0"
+                                              ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                     </LNode>
                 </Function>
                 <Function name="FUNCTION_2">
                     <LNode iedName="None" ldInst="LDGW" lnClass="GAPC">
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" BayLabel="SITE1" IEDName="SITESITE1SCU0" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1SCU0"
+                                              ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                     </LNode>
                 </Function>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/ssd.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/ssd.xml
index 591e03dd0..b1d3c399f 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/ssd.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/ssd.xml
@@ -16,7 +16,13 @@
                 <Function name="FUNCTION_1">
                     <LNode iedName="None" ldInst="LDGW" lnClass="LLN0">
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" BayLabel="SITE1" IEDName="ied1" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="ABC" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="ied1"
+                                              ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef"
+                                              VendorName="ABC" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                     </LNode>
                 </Function>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std.xml
index 9428ba6d9..6037fdd5d 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std.xml
@@ -34,7 +34,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef"
+                              IEDSubstationinstance="1" IEDSystemVersioninstance="1" VendorName="RTE" IEDredundancy="A"
+                              IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <Services nameLength="64">
             <ConfLNs fixPrefix="true" fixLnInst="true"/>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU1.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU1.xml
index 33c6aa8bb..2d0d3367e 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU1.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU1.xml
@@ -34,7 +34,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="53a72621-4f96-4cc5-b1da-3171c1705bea" VendorName="RTE" IEDredundancy="B" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="53a72621-4f96-4cc5-b1da-3171c1705bea"
+                              IEDSubstationinstance="1" IEDSystemVersioninstance="1" VendorName="RTE" IEDredundancy="B"
+                              IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <Services nameLength="64">
             <ConfLNs fixPrefix="true" fixLnInst="true"/>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU2.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU2.xml
index 43b7712f7..06fe92ae0 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU2.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_SITESITE1SCU2.xml
@@ -34,7 +34,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="03d7e1c7-d490-4768-a968-23c7a42cca28" VendorName="RTE" IEDredundancy="C" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="03d7e1c7-d490-4768-a968-23c7a42cca28"
+                              IEDSubstationinstance="1" IEDSystemVersioninstance="1" VendorName="RTE" IEDredundancy="C"
+                              IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <Services nameLength="64">
             <ConfLNs fixPrefix="true" fixLnInst="true"/>
diff --git a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_with_same_ICDSystemVersionUUID.xml b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_with_same_ICDSystemVersionUUID.xml
index 54a7c0cb7..13c70c849 100644
--- a/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_with_same_ICDSystemVersionUUID.xml
+++ b/sct-commons/src/test/resources/scd-ied-dtt-com-import-stds/std_with_same_ICDSystemVersionUUID.xml
@@ -34,7 +34,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.001"/>
+            <compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef"
+                              IEDSystemVersioninstance="1" IEDSubstationinstance="1" VendorName="RTE" IEDredundancy="A"
+                              IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                              headerRevision="01.00.001"/>
         </Private>
         <Services nameLength="64">
             <ConfLNs fixPrefix="true" fixLnInst="true"/>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd
index cad226b1d..33fc9cba8 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test1_LD_STATUS_INACTIVE.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,12 +31,22 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -75,7 +86,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -112,7 +127,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -149,7 +168,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd
index 76dd3fce0..72b928c71 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test2_LD_STATUS_INACTIVE.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -70,7 +76,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -107,7 +117,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -144,7 +158,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd
index b29dcd927..9e88bb19e 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingBeh.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -60,7 +66,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd
index 09f288ffa..49cb8aac5 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivate.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -60,7 +66,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd
index 83961dcac..b592f569d 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingLDevicePrivateAttribute.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -60,7 +66,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd
index 41c519502..27b6c193d 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_KO_MissingMod.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+								MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+											  IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+											  IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+											  IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+											  headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+											  headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -60,7 +66,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+							  IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+							  IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+							  swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+							  headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd
index 5dc4b89f4..87ca28bf1 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_ACTIVE.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU"
+                                              IEDSubstationinstance="3" IEDSystemVersioninstance="1" IEDName="IedName2"
+                                              VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B"
+                                              BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -70,7 +76,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -107,7 +117,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -144,7 +158,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd
index 3cf0dad8e..c6f31cdb5 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_LD_STATUS_UNTESTED.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName2" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -70,7 +76,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -107,7 +117,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -144,7 +158,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_Template.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_Template.scd
index 7a79a5be2..f5107142e 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_Template.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue68_Test_Template.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -70,7 +76,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -107,7 +117,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -144,7 +158,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
diff --git a/sct-commons/src/test/resources/scd-refresh-lnode/issue_165_enhance_68_Test_Dai_Updatable.scd b/sct-commons/src/test/resources/scd-refresh-lnode/issue_165_enhance_68_Test_Dai_Updatable.scd
index e3fae2ae9..01a4b2e29 100644
--- a/sct-commons/src/test/resources/scd-refresh-lnode/issue_165_enhance_68_Test_Dai_Updatable.scd
+++ b/sct-commons/src/test/resources/scd-refresh-lnode/issue_165_enhance_68_Test_Dai_Updatable.scd
@@ -19,7 +19,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" />
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID" />
@@ -30,7 +31,12 @@
 					</Private>
 					<LNode iedName="IedName1" ldInst="LDSUIED" lnClass="LLN0" lnInst="">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+                            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed"
+                                              IEDSystemVersioninstance="1" IEDType="SAMU" IEDSubstationinstance="3"
+                                              IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling"
+                                              IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -70,7 +76,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eed" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName1" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="B" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -107,7 +117,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -144,7 +158,11 @@
 			<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
 		</Private>
 		<Private type="COMPAS-ICDHeader">
-			<compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName3" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
 		</Private>
 		<AccessPoint name="PROCESS_AP">
 			<Server>
@@ -176,7 +194,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <AccessPoint name="PROCESS_AP">
             <Server>
@@ -213,7 +235,11 @@
             <compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001" />
         </Private>
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE" IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00" swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00" headerRevision="01.00.00"></compas:ICDHeader>
+            <compas:ICDHeader ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" IEDSystemVersioninstance="1"
+                              IEDType="SAMU" IEDSubstationinstance="3" IEDName="IedName2" VendorName="RTE"
+                              IEDmodel="ICDfromModeling" IEDredundancy="A" BayLabel="SITE1" hwRev="01.00.00"
+                              swRev="01.00.00" headerId="cacfa2df-bdb2-47a7-b7ea-07916586ebdd" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <AccessPoint name="PROCESS_AP">
             <Server>
diff --git a/sct-commons/src/test/resources/scd-substation-import-ssd/scd_with_substation.xml b/sct-commons/src/test/resources/scd-substation-import-ssd/scd_with_substation.xml
index 60df1a663..362fd268f 100644
--- a/sct-commons/src/test/resources/scd-substation-import-ssd/scd_with_substation.xml
+++ b/sct-commons/src/test/resources/scd-substation-import-ssd/scd_with_substation.xml
@@ -10,7 +10,8 @@
             <Voltage unit="V" multiplier="k">90</Voltage>
             <Bay name="BAY_2">
                 <Private type="COMPAS-Bay">
-                    <compas:Bay BayCodif="CB00001101" UUID="4214a755-3420-42ed-ac2d-766c5149b58a" Version="1" MainShortLabel="BAY2" SecondLabel="SITE-P41-SS1.12" NumBay="1"/>
+                    <compas:Bay BayCodif="CB00001101" UUID="4214a755-3420-42ed-ac2d-766c5149b58a" Version="1"
+                                MainShortLabel="BAY2" SecondLabel="SITE-P41-SS1.12" NumBay="1" BayCount="1"/>
                 </Private>
                 <Private type="COMPAS-Criteria">
                     <compas:Criteria ObjectID="4214a755-3420-42ed-ac2d-766c5149b58a" CriteriaAssociationID="CriteriaAssociationID"/>
@@ -27,7 +28,13 @@
                     </Private>
                     <LNode iedName="None" ldInst="LDFUNCTION_3" lnClass="LLN0">
                         <Private type="COMPAS-ICDHeader">
-                            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="BAY2" IEDName="SITEBAY2BCU44" ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1"
+                                              BayLabel="BAY2" IEDName="SITEBAY2BCU44"
+                                              ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
                         </Private>
                     </LNode>
                 </Function>
diff --git a/sct-commons/src/test/resources/scd-substation-import-ssd/ssd.xml b/sct-commons/src/test/resources/scd-substation-import-ssd/ssd.xml
index 37b4f304d..9f05e267c 100644
--- a/sct-commons/src/test/resources/scd-substation-import-ssd/ssd.xml
+++ b/sct-commons/src/test/resources/scd-substation-import-ssd/ssd.xml
@@ -12,7 +12,8 @@
 			<Voltage unit="V" multiplier="k">0</Voltage>
 			<Bay name="BAY_1">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1" MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7"/>
+					<compas:Bay BayCodif="TG00000001" UUID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" Version="1"
+                                MainShortLabel="SITE1" SecondLabel="SITE-TGENE" NumBay="7" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="9cd6f05b-1bbd-4ba3-86c5-41c99103e06d" CriteriaAssociationID="CriteriaAssociationID"/>
@@ -23,14 +24,26 @@
 					</Private>
 					<LNode iedName="None" ldInst="LDGW" lnClass="LLN0">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader IEDType="SCU" IEDSubstationinstance="3" BayLabel="SITE1" IEDName="SITESITE1SCU0" ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="3" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1SCU0"
+                                              ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
 				<Function name="FUNCTION_2">
 					<LNode iedName="None" ldInst="LDPDB" lnClass="LLN0">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader IEDType="PDB" IEDSubstationinstance="4" BayLabel="SITE1" IEDName="SITESITE1PDB0" ICDSystemVersionUUID="ad27d262-7c90-46df-b480-68088f9fe8a4" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="6b4d51eb-c391-4eef-b118-f516bc09f20c" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="PDB" IEDSubstationinstance="4" IEDSystemVersioninstance="1"
+                                              BayLabel="SITE1" IEDName="SITESITE1PDB0"
+                                              ICDSystemVersionUUID="ad27d262-7c90-46df-b480-68088f9fe8a4"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="6b4d51eb-c391-4eef-b118-f516bc09f20c" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
@@ -40,7 +53,8 @@
 			<Voltage unit="V" multiplier="k">90</Voltage>
 			<Bay name="BAY_2">
 				<Private type="COMPAS-Bay">
-					<compas:Bay BayCodif="CB00001101" UUID="4214a755-3420-42ed-ac2d-766c5149b58a" Version="1" MainShortLabel="BAY2" SecondLabel="SITE-P41-SS1.12" NumBay="1"/>
+                    <compas:Bay BayCodif="CB00001101" UUID="4214a755-3420-42ed-ac2d-766c5149b58a" Version="1"
+                                MainShortLabel="BAY2" SecondLabel="SITE-P41-SS1.12" NumBay="1" BayCount="1"/>
 				</Private>
 				<Private type="COMPAS-Criteria">
 					<compas:Criteria ObjectID="4214a755-3420-42ed-ac2d-766c5149b58a" CriteriaAssociationID="CriteriaAssociationID"/>
@@ -57,14 +71,21 @@
 					</Private>
 					<LNode iedName="None" ldInst="LDFUNCTION_3" lnClass="LLN0">
 						<Private type="COMPAS-ICDHeader">
-							<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="BAY2" IEDName="SITEBAY2BCU44" ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00" headerRevision="01.00.00"/>
+                            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1"
+                                              BayLabel="BAY2" IEDName="SITEBAY2BCU44"
+                                              ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8"
+                                              VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling"
+                                              hwRev="01.00.00" swRev="01.00.00"
+                                              headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00"
+                                              headerRevision="01.00.00"/>
 						</Private>
 					</LNode>
 				</Function>
 			</Bay>
 			<Bay name="BAY_3">
 				<Private type="COMPAS-Bay">
-					<compas:Bay xmlns:compas="https://www.lfenergy.org/compas/extension/v1" BayCodif="RT00000001" UUID="319859a3-cdce-49ae-8b3a-d462ea7b4803" Version="1" MainShortLabel="BAY3" SecondLabel="SITE-P41-Y41141" NumBay="3"/>
+                    <compas:Bay BayCodif="RT00000001" UUID="319859a3-cdce-49ae-8b3a-d462ea7b4803" Version="1"
+                                MainShortLabel="BAY3" SecondLabel="SITE-P41-Y41141" NumBay="3" BayCount="1"/>
 				</Private>
 			</Bay>
 		</VoltageLevel>
diff --git a/sct-commons/src/test/resources/scl-ln-adapter/scd_with_ln.xml b/sct-commons/src/test/resources/scl-ln-adapter/scd_with_ln.xml
index d1493e76f..ff26c96d2 100644
--- a/sct-commons/src/test/resources/scl-ln-adapter/scd_with_ln.xml
+++ b/sct-commons/src/test/resources/scl-ln-adapter/scd_with_ln.xml
@@ -8,10 +8,13 @@
     <!-- has dataset creation capability -->
     <IED name="IED_NAME1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="T000001" MainShortLabel="aaa" NumBay="5" BayCount="1"/>
         </Private>
         <Services>
             <GSESettings datSet="Conf"/>
@@ -42,10 +45,13 @@
     <!-- missing dataset creation capability -->
     <IED name="IED_NAME2">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="21" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
+            <compas:ICDHeader IEDType="BCU" IEDSubstationinstance="21" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
+                              IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
+                              IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
         </Private>
         <Private type="COMPAS-Bay">
-            <compas:Bay UUID="UuidBay1"/>
+            <compas:Bay UUID="UuidBay1" BayCodif="T000001" MainShortLabel="aaa" NumBay="5" BayCount="1"/>
         </Private>
         <AccessPoint name="AP_NAME">
             <Server>
diff --git a/sct-commons/src/test/resources/scl-remove-controlBlocks-dataSet-extRefSrc/scl-with-control-blocks.xml b/sct-commons/src/test/resources/scl-remove-controlBlocks-dataSet-extRefSrc/scl-with-control-blocks.xml
index d395939f3..682334769 100644
--- a/sct-commons/src/test/resources/scl-remove-controlBlocks-dataSet-extRefSrc/scl-with-control-blocks.xml
+++ b/sct-commons/src/test/resources/scl-remove-controlBlocks-dataSet-extRefSrc/scl-with-control-blocks.xml
@@ -33,7 +33,11 @@
     </Communication>
     <IED name="ied1">
         <Private type="COMPAS-ICDHeader">
-            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" BayLabel="SITE1" IEDName="ied1" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="ABC" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
+            <compas:ICDHeader IEDType="SCU" IEDSubstationinstance="0" IEDSystemVersioninstance="1" BayLabel="SITE1"
+                              IEDName="ied1" ICDSystemVersionUUID="IED4d4fe1a8cda64cf88a5ee4176a1a0eef" VendorName="ABC"
+                              IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
+                              headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
+                              headerRevision="01.00.00"/>
         </Private>
         <AccessPoint name="PROCESS_AP">
             <Server>