diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ExtRefEditorService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ExtRefEditorService.java
index 55d426231..9ee47239c 100644
--- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ExtRefEditorService.java
+++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ExtRefEditorService.java
@@ -4,6 +4,7 @@
 
 package org.lfenergy.compas.sct.commons;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.api.ExtRefEditor;
@@ -15,6 +16,7 @@
 import org.lfenergy.compas.sct.commons.model.epf.TCBScopeType;
 import org.lfenergy.compas.sct.commons.model.epf.TChannel;
 import org.lfenergy.compas.sct.commons.model.epf.TChannelType;
+import org.lfenergy.compas.sct.commons.model.epf.TChannelLevMod;
 import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
 import org.lfenergy.compas.sct.commons.scl.ied.IEDAdapter;
 import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceAdapter;
@@ -34,12 +36,21 @@
 @RequiredArgsConstructor
 public class ExtRefEditorService implements ExtRefEditor {
     private static final String INVALID_OR_MISSING_ATTRIBUTES_IN_EXT_REF_BINDING_INFO = "Invalid or missing attributes in ExtRef binding info";
+    private static final List<DoNameAndDaName> DO_DA_MAPPINGS = List.of(
+            new DoNameAndDaName(CHNUM1_DO_NAME, DU_DA_NAME),
+            new DoNameAndDaName(LEVMOD_DO_NAME, SETVAL_DA_NAME),
+            new DoNameAndDaName(MOD_DO_NAME, STVAL_DA_NAME),
+            new DoNameAndDaName(SRCREF_DO_NAME, SETSRCREF_DA_NAME)
+    );
 
     private final IedService iedService;
     private final LdeviceService ldeviceService;
     private final LnEditor lnEditor;
     private final DataTypeTemplatesService dataTypeTemplatesService;
 
+    @Getter
+    private final List<SclReportItem> errorHandler = new ArrayList<>();
+
     /**
      * Provides valid IED sources according to EPF configuration.<br/>
      * EPF verification include:<br/>
@@ -76,17 +87,16 @@ private List<TIED> getIedSources(SclRootAdapter sclRootAdapter, TCompasBay compa
      * - The location of ExtRef should be in LDevice (inst=LDEPF) <br/>
      * - ExtRef that lacks Bay or ICDHeader Private is not returned <br/>
      *
-     * @param sclReportItems List of SclReportItem
      * @return list of ExtRef and associated Bay
      */
-    private List<ExtRefInfo.ExtRefWithBayReference> getExtRefWithBayReferenceInLDEPF(TDataTypeTemplates dataTypeTemplates, TIED tied, final TLDevice tlDevice, final List<SclReportItem> sclReportItems) {
+    private List<ExtRefInfo.ExtRefWithBayReference> getExtRefWithBayReferenceInLDEPF(TDataTypeTemplates dataTypeTemplates, TIED tied, final TLDevice tlDevice) {
         List<ExtRefInfo.ExtRefWithBayReference> extRefBayReferenceList = new ArrayList<>();
         String lDevicePath = "SCL/IED[@name=\"" + tied.getName() + "\"]/AccessPoint/Server/LDevice[@inst=\"" + tlDevice.getInst() + "\"]";
         Optional<TCompasBay> tCompasBay = PrivateUtils.extractCompasPrivate(tied, TCompasBay.class);
         if (tCompasBay.isEmpty()) {
-            sclReportItems.add(SclReportItem.error(lDevicePath, "The IED has no Private Bay"));
+            errorHandler.add(SclReportItem.error(lDevicePath, "The IED has no Private Bay"));
             if (PrivateUtils.extractCompasPrivate(tied, TCompasICDHeader.class).isEmpty()) {
-                sclReportItems.add(SclReportItem.error(lDevicePath, "The IED has no Private compas:ICDHeader"));
+                errorHandler.add(SclReportItem.error(lDevicePath, "The IED has no Private compas:ICDHeader"));
             }
             return Collections.emptyList();
         }
@@ -97,7 +107,7 @@ private List<ExtRefInfo.ExtRefWithBayReference> getExtRefWithBayReferenceInLDEPF
                     .getExtRef().stream()
                     .map(extRef -> new ExtRefInfo.ExtRefWithBayReference(tied.getName(), tCompasBay.get(), extRef)).toList());
         } else {
-            sclReportItems.add(SclReportItem.error(lDevicePath, "DO@name=Mod/DA@name=stVal not found in DataTypeTemplate"));
+            errorHandler.add(SclReportItem.error(lDevicePath, "DO@name=Mod/DA@name=stVal not found in DataTypeTemplate"));
         }
         return extRefBayReferenceList;
     }
@@ -114,7 +124,7 @@ private static Boolean doesExtRefMatchLDEPFChannel(TExtRef extRef, TChannel tCha
                 && extRef.getDesc().startsWith("DYN_LDEPF_ANALOG CHANNEL " + tChannel.getChannelNum() + "_1_AnalogueValue")
                 && extRef.getDesc().endsWith("_" + tChannel.getDAName() + "_1");
         Boolean doesExtRefDescMatchDigitalChannel = tChannel.getChannelType().equals(TChannelType.DIGITAL)
-                && extRef.getDesc().startsWith("DYN_LDEPF_DIGITAL CHANNEL " + tChannel.getChannelNum() + "_1_BOOLEEN")
+                && extRef.getDesc().startsWith("DYN_LDEPF_DIGITAL CHANNEL " + tChannel.getChannelNum() + "_1_BOOLEAN")
                 && extRef.getDesc().endsWith("_" + tChannel.getDAName() + "_1");
         return extRef.isSetDesc() && (doesExtRefDescMatchAnalogChannel || doesExtRefDescMatchDigitalChannel)
                 && extRef.isSetPLN() && Utils.lnClassEquals(extRef.getPLN(), tChannel.getLNClass())
@@ -263,29 +273,29 @@ public TExtRef updateExtRefSource(SCL scd, ExtRefInfo extRefInfo) throws ScdExce
 
     @Override
     public List<SclReportItem> manageBindingForLDEPF(SCL scd, EPF epf) {
-        List<SclReportItem> sclReportItems = new ArrayList<>();
+        errorHandler.clear();
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
-        if (!epf.isSetChannels()) return sclReportItems;
+        if (!epf.isSetChannels()) return errorHandler;
         iedService.getFilteredIeds(scd, ied -> !ied.getName().contains("TEST"))
                 .forEach(tied -> ldeviceService.findLdevice(tied, LDEVICE_LDEPF)
-                        .ifPresent(tlDevice -> getExtRefWithBayReferenceInLDEPF(scd.getDataTypeTemplates(), tied, tlDevice, sclReportItems)
+                        .ifPresent(tlDevice -> getExtRefWithBayReferenceInLDEPF(scd.getDataTypeTemplates(), tied, tlDevice)
                                 .forEach(extRefBayRef -> epf.getChannels().getChannel().stream().filter(tChannel -> doesExtRefMatchLDEPFChannel(extRefBayRef.extRef(), tChannel))
                                         .findFirst().ifPresent(channel -> {
                                             List<TIED> iedSources = getIedSources(sclRootAdapter, extRefBayRef.compasBay(), channel);
                                             if (iedSources.size() == 1) {
                                                 updateLDEPFExtRefBinding(extRefBayRef.extRef(), iedSources.getFirst(), channel);
                                                 LDeviceAdapter lDeviceAdapter = new LDeviceAdapter(new IEDAdapter(sclRootAdapter, tied.getName()), tlDevice);
-                                                sclReportItems.addAll(updateLDEPFDos(lDeviceAdapter, extRefBayRef.extRef(), channel));
+                                                updateLDEPFDos(lDeviceAdapter, extRefBayRef.extRef(), channel);
                                             } else {
                                                 if (iedSources.size() > 1) {
-                                                    sclReportItems.add(SclReportItem.warning(null, "There is more than one IED source to bind the signal " +
+                                                    errorHandler.add(SclReportItem.warning(null, "There is more than one IED source to bind the signal " +
                                                             "/IED@name=" + extRefBayRef.iedName() + "/LDevice@inst=LDEPF/LN0" +
                                                             "/ExtRef@desc=" + extRefBayRef.extRef().getDesc()));
                                                 }
                                                 // If the source IED is not found, there will be no update or report message.
                                             }
                                         }))));
-        return sclReportItems;
+        return errorHandler;
     }
 
     @Override
@@ -332,44 +342,44 @@ private void updateLDEPFExtRefBinding(TExtRef extRef, TIED iedSource, TChannel s
         extRef.setDoName(doName);
     }
 
-    private List<SclReportItem> updateLDEPFDos(LDeviceAdapter lDeviceAdapter, TExtRef extRef, TChannel setting) {
-        List<SclReportItem> sclReportItems = new ArrayList<>();
-        List<DoNameAndDaName> doNameAndDaNameList = List.of(
-                new DoNameAndDaName(CHNUM1_DO_NAME, DU_DA_NAME),
-                new DoNameAndDaName(LEVMOD_DO_NAME, SETVAL_DA_NAME),
-                new DoNameAndDaName(MOD_DO_NAME, STVAL_DA_NAME),
-                new DoNameAndDaName(SRCREF_DO_NAME, SETSRCREF_DA_NAME)
-        );
+    private void updateLDEPFDos(LDeviceAdapter lDeviceAdapter, TExtRef extRef, TChannel setting) {
         if (setting.getChannelType().equals(TChannelType.DIGITAL)) {
             //digital
             lDeviceAdapter.findLnAdapter(LN_RBDR, setting.getChannelNum(), null)
-                    .ifPresent(lnAdapter -> doNameAndDaNameList.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName.doName, doNameAndDaName.daName, extRef, setting).ifPresent(sclReportItems::add)));
+                    .ifPresent(lnAdapter -> DO_DA_MAPPINGS.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName, extRef, setting)));
             lDeviceAdapter.findLnAdapter(LN_RBDR, setting.getChannelNum(), LN_PREFIX_B)
-                    .ifPresent(lnAdapter -> doNameAndDaNameList.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName.doName, doNameAndDaName.daName, extRef, setting).ifPresent(sclReportItems::add)));
+                    .ifPresent(lnAdapter -> DO_DA_MAPPINGS.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName, extRef, setting)));
         }
         if (setting.getChannelType().equals(TChannelType.ANALOG)) {
             //analog
             lDeviceAdapter.findLnAdapter(LN_RADR, setting.getChannelNum(), null)
-                    .ifPresent(lnAdapter -> doNameAndDaNameList.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName.doName, doNameAndDaName.daName, extRef, setting).ifPresent(sclReportItems::add)));
+                    .ifPresent(lnAdapter -> DO_DA_MAPPINGS.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName, extRef, setting)));
             lDeviceAdapter.findLnAdapter(LN_RADR, setting.getChannelNum(), LN_PREFIX_A)
-                    .ifPresent(lnAdapter -> doNameAndDaNameList.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName.doName, doNameAndDaName.daName, extRef, setting).ifPresent(sclReportItems::add)));
+                    .ifPresent(lnAdapter -> DO_DA_MAPPINGS.forEach(doNameAndDaName -> updateVal(lnAdapter, doNameAndDaName, extRef, setting)));
         }
-        return sclReportItems;
     }
 
-    private Optional<SclReportItem> updateVal(AbstractLNAdapter<?> lnAdapter, String doName, String daName, TExtRef extRef, TChannel setting) {
-        String value = switch (daName) {
-            case DU_DA_NAME -> setting.getChannelShortLabel();
-            case SETVAL_DA_NAME -> LN_PREFIX_B.equals(lnAdapter.getPrefix()) || LN_PREFIX_A.equals(lnAdapter.getPrefix()) ? setting.getChannelLevModQ().value() : setting.getChannelLevMod().value();
-            case STVAL_DA_NAME -> ActiveStatus.ON.getValue();
-            case SETSRCREF_DA_NAME -> computeDaiValue(lnAdapter, extRef, setting.getDAName());
-            default -> null;
+    private void updateVal(AbstractLNAdapter<?> lnAdapter, DoNameAndDaName doDaName, TExtRef extRef, TChannel setting) {
+        String lnPrefix = lnAdapter.getPrefix();
+        Optional<SclReportItem> sclReportItem = switch (doDaName.daName) {
+            case DU_DA_NAME -> setting.isSetChannelShortLabel() ? lnAdapter.getDOIAdapterByName(doDaName.doName).updateDAI(doDaName.daName, setting.getChannelShortLabel()) :
+                    Optional.empty();
+            case SETVAL_DA_NAME -> {
+                if (LN_PREFIX_B.equals(lnPrefix) || LN_PREFIX_A.equals(lnPrefix)) {
+                    yield setting.isSetChannelLevModQ() && !setting.getChannelLevModQ().equals(TChannelLevMod.NA) ? lnAdapter.getDOIAdapterByName(doDaName.doName).updateDAI(doDaName.daName, setting.getChannelLevModQ().value()) : Optional.empty();
+                } else {
+                    yield setting.isSetChannelLevMod() && !setting.getChannelLevMod().equals(TChannelLevMod.NA) ? lnAdapter.getDOIAdapterByName(doDaName.doName).updateDAI(doDaName.daName, setting.getChannelLevMod().value()) : Optional.empty();
+                }
+            }
+            case STVAL_DA_NAME -> lnAdapter.getDOIAdapterByName(doDaName.doName).updateDAI(doDaName.daName, ActiveStatus.ON.getValue());
+            case SETSRCREF_DA_NAME -> lnAdapter.getDOIAdapterByName(doDaName.doName).updateDAI(doDaName.daName, computeDaiValue(lnPrefix, extRef, setting.getDAName()));
+            default -> throw new IllegalStateException("Unexpected value: " + doDaName.daName);
         };
-        return lnAdapter.getDOIAdapterByName(doName).updateDAI(daName, value);
+        sclReportItem.ifPresent(errorHandler::add);
     }
 
-    private String computeDaiValue(AbstractLNAdapter<?> lnAdapter, TExtRef extRef, String daName) {
-        if (LN_PREFIX_B.equals(lnAdapter.getPrefix()) || LN_PREFIX_A.equals(lnAdapter.getPrefix())) {
+    private String computeDaiValue(String lnPrefix, TExtRef extRef, String daName) {
+        if (LN_PREFIX_B.equals(lnPrefix) || LN_PREFIX_A.equals(lnPrefix)) {
             return extRef.getIedName() +
                     extRef.getLdInst() + "/" +
                     trimToEmpty(extRef.getPrefix()) +
diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/ExtRefEditorServiceTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/ExtRefEditorServiceTest.java
index 204c40a9f..47a00a872 100644
--- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/ExtRefEditorServiceTest.java
+++ b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/ExtRefEditorServiceTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.dto.*;
@@ -68,11 +69,11 @@ void manageBindingForLDEPF_whenFlowKindIsInternalAndAllExtRefInSameBay_should_re
         List<SclReportItem> sclReportItems = extRefEditorService.manageBindingForLDEPF(scd, epf);
         // Then
         assertThat(sclReportItems).isEmpty();
-        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef1.getIedName()).isEqualTo("IED_NAME1");
-        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef2.getIedName()).isEqualTo("IED_NAME2");
-        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef3.getIedName()).isEqualTo("IED_NAME1");
 
         assertExtRefIsBoundAccordingTOLDEPF(extRef1, channel);
@@ -138,7 +139,7 @@ void manageBindingForLDEPF_when_internalBindingMatchEPFChannel_should_update_suc
         // Then
         assertThat(sclReportItems).isEmpty();
         SclTestMarshaller.assertIsMarshallable(new SclRootAdapter(scd).getCurrentElem());
-        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef1.getIedName()).isEqualTo("IED_NAME1");
         assertExtRefIsBoundAccordingTOLDEPF(extRef1, channel);
 
@@ -201,13 +202,13 @@ void manageBindingForLDEPF_when_manyIedSourceFound_should_return_reportMassages(
         // Then
         assertThat(sclReportItems).hasSize(2)
                 .extracting(SclReportItem::message)
-                .isEqualTo(List.of("There is more than one IED source to bind the signal /IED@name=IED_NAME2/LDevice@inst=LDEPF/LN0/ExtRef@desc=DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1",
-                        "There is more than one IED source to bind the signal /IED@name=IED_NAME3/LDevice@inst=LDEPF/LN0/ExtRef@desc=DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"));
-        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+                .isEqualTo(List.of("There is more than one IED source to bind the signal /IED@name=IED_NAME2/LDevice@inst=LDEPF/LN0/ExtRef@desc=DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1",
+                        "There is more than one IED source to bind the signal /IED@name=IED_NAME3/LDevice@inst=LDEPF/LN0/ExtRef@desc=DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"));
+        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef1.isSetIedName()).isTrue();
-        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef2.isSetIedName()).isFalse();
-        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef3.isSetIedName()).isFalse();
 
         AbstractLNAdapter<?> lnRbdr = findLn(scd, "IED_NAME2", "LDEPF", "RBDR", "1", "");
@@ -241,8 +242,8 @@ void manageBindingForLDEPF_when_extRefMatchFlowKindInternalOrExternal_should_upd
         analogueChannel1WithBayInternalScope.setChannelType(TChannelType.ANALOG);
         analogueChannel1WithBayInternalScope.setChannelNum("1");
         analogueChannel1WithBayInternalScope.setChannelShortLabel("V0");
-        analogueChannel1WithBayInternalScope.setChannelLevMod(TChannelLevMod.NA);
-        analogueChannel1WithBayInternalScope.setChannelLevModQ(TChannelLevMod.NA);
+        analogueChannel1WithBayInternalScope.setChannelLevMod(TChannelLevMod.POSITIVE_OR_RISING);
+        analogueChannel1WithBayInternalScope.setChannelLevModQ(TChannelLevMod.OTHER);
         analogueChannel1WithBayInternalScope.setBAPVariant("8");
         analogueChannel1WithBayInternalScope.setBAPIgnoredValue("N/A");
         analogueChannel1WithBayInternalScope.setIEDType("SAMU");
@@ -262,8 +263,8 @@ void manageBindingForLDEPF_when_extRefMatchFlowKindInternalOrExternal_should_upd
         analogueChannel10WithBayExternalBayScope.setChannelType(TChannelType.ANALOG);
         analogueChannel10WithBayExternalBayScope.setChannelNum("10");
         analogueChannel10WithBayExternalBayScope.setChannelShortLabel("U101");
-        analogueChannel10WithBayExternalBayScope.setChannelLevMod(TChannelLevMod.NA);
-        analogueChannel10WithBayExternalBayScope.setChannelLevModQ(TChannelLevMod.NA);
+        analogueChannel10WithBayExternalBayScope.setChannelLevMod(TChannelLevMod.POSITIVE_OR_RISING);
+        analogueChannel10WithBayExternalBayScope.setChannelLevModQ(TChannelLevMod.OTHER);
         analogueChannel10WithBayExternalBayScope.setBAPVariant("8");
         analogueChannel10WithBayExternalBayScope.setBAPIgnoredValue("N/A");
         analogueChannel10WithBayExternalBayScope.setIEDType("SAMU");
@@ -299,7 +300,7 @@ void manageBindingForLDEPF_when_extRefMatchFlowKindInternalOrExternal_should_upd
                 .isEqualTo("V0");
         assertThat(getDaiValue(lnRadr, LEVMOD_DO_NAME, SETVAL_DA_NAME))
                 .isNotEqualTo("setVal_old_val")
-                .isEqualTo("NA");
+                .isEqualTo("Positive or Rising");
         assertThat(getDaiValue(lnRadr, MOD_DO_NAME, STVAL_DA_NAME))
                 .isNotEqualTo("off")
                 .isEqualTo("on");
@@ -313,7 +314,7 @@ void manageBindingForLDEPF_when_extRefMatchFlowKindInternalOrExternal_should_upd
                 .isEqualTo("V0");
         assertThat(getDaiValue(lnAradr, LEVMOD_DO_NAME, SETVAL_DA_NAME))
                 .isNotEqualTo("setVal_old_val")
-                .isEqualTo("NA");
+                .isEqualTo("Other");
         assertThat(getDaiValue(lnAradr, MOD_DO_NAME, STVAL_DA_NAME))
                 .isNotEqualTo("off")
                 .isEqualTo("on");
@@ -355,11 +356,11 @@ void manageBindingForLDEPF_when_DOI_Mod_and_DAI_stVal_notExists_should_precede()
         List<SclReportItem> sclReportItems = extRefEditorService.manageBindingForLDEPF(scd, epf);
         // Then
         assertThat(sclReportItems).isEmpty();
-        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef1.getIedName()).isEqualTo("IED_NAME1");
-        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef2.getIedName()).isEqualTo("IED_NAME2");
-        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef3.getIedName()).isEqualTo("IED_NAME1");
 
         assertExtRefIsBoundAccordingTOLDEPF(extRef1, channel);
@@ -396,11 +397,11 @@ void manageBindingForLDEPF_when_LDEPF_NotActive_should_precede() {
         List<SclReportItem> sclReportItems = extRefEditorService.manageBindingForLDEPF(scd, epf);
         // Then
         assertThat(sclReportItems).isEmpty();
-        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef1 = findExtRef(scd, "IED_NAME1", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef1.getIedName()).isEqualTo("IED_NAME1");
-        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef2 = findExtRef(scd, "IED_NAME2", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef2.getIedName()).isEqualTo("IED_NAME2");
-        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1");
+        TExtRef extRef3 = findExtRef(scd, "IED_NAME3", "LDEPF", "DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1");
         assertThat(extRef3.getIedName()).isEqualTo("IED_NAME1");
 
         assertExtRefIsBoundAccordingTOLDEPF(extRef1, channel);
@@ -709,4 +710,106 @@ void epfPostProcessing_when_exist_unused_channel_should_update_setSrcRef() {
         softly.assertThat(setSrcRefInInRef4.get().getVal().getFirst().getValue()).isEqualTo("IED_NAME1LDEPF/LPHD0.Proxy");
         softly.assertAll();
     }
+
+    @ParameterizedTest()
+    @CsvSource({"'',''", "NA,NA"})
+    void manageBindingForLDEPF_should_not_update_dai_setVal_when_channelLevMod_or_channelLevModq_are_empty_or_NA(String channelLevMod, String channelLevModq) {
+        //Given
+        SCL scd = SclTestMarshaller.getSCLFromFile("/scd-ldepf/scd_ldepf_processing_bind_dai_update.xml");
+        TChannel digitalChannel = new TChannel();
+        digitalChannel.setBayScope(TCBScopeType.BAY_INTERNAL);
+        digitalChannel.setChannelType(TChannelType.DIGITAL);
+        digitalChannel.setChannelNum("1");
+        digitalChannel.setChannelShortLabel("MR.PX1");
+        if(!channelLevMod.isEmpty()){
+            digitalChannel.setChannelLevMod(TChannelLevMod.valueOf(channelLevMod));
+        }
+        if(!channelLevModq.isEmpty()){
+            digitalChannel.setChannelLevModQ(TChannelLevMod.valueOf(channelLevModq));
+        }
+        digitalChannel.setIEDType("BCU");
+        digitalChannel.setIEDRedundancy(TIEDredundancy.NONE);
+        digitalChannel.setIEDSystemVersionInstance("1");
+        digitalChannel.setLDInst("LDPX");
+        digitalChannel.setLNClass("PTRC");
+        digitalChannel.setLNInst("0");
+        digitalChannel.setDOName("Str");
+        digitalChannel.setDOInst("0");
+        digitalChannel.setDAName("general");
+
+        TChannel analogChannel = new TChannel();
+        analogChannel.setBayScope(TCBScopeType.BAY_INTERNAL);
+        analogChannel.setChannelType(TChannelType.ANALOG);
+        analogChannel.setChannelNum("1");
+        analogChannel.setChannelShortLabel("MR.PX1");
+        if(!channelLevMod.isEmpty()){
+            analogChannel.setChannelLevMod(TChannelLevMod.valueOf(channelLevMod));
+        }
+        if(!channelLevModq.isEmpty()){
+            analogChannel.setChannelLevModQ(TChannelLevMod.valueOf(channelLevModq));
+        }
+        analogChannel.setIEDType("BCU");
+        analogChannel.setIEDRedundancy(TIEDredundancy.NONE);
+        analogChannel.setIEDSystemVersionInstance("1");
+        analogChannel.setLDInst("LDPX");
+        analogChannel.setLNClass("PTRC");
+        analogChannel.setLNInst("0");
+        analogChannel.setDOName("Str");
+        analogChannel.setDOInst("0");
+        analogChannel.setDAName("general");
+
+        EPF epf = new EPF();
+        Channels channels = new Channels();
+        channels.getChannel().addAll(List.of(digitalChannel, analogChannel));
+        epf.setChannels(channels);
+        // When
+        List<SclReportItem> sclReportItems = extRefEditorService.manageBindingForLDEPF(scd, epf);
+        // Then
+        assertThat(sclReportItems).isEmpty();
+        assertThat(scd.getIED())
+                .filteredOn(tied -> tied.getName().equals("IED_NAME1"))
+                .flatExtracting(TIED::getAccessPoint)
+                .extracting(TAccessPoint::getServer)
+                .flatExtracting(TServer::getLDevice)
+                .filteredOn(tlDevice -> tlDevice.getInst().equals(LDEVICE_LDEPF))
+                //LN class RBDR: with and without prefix 'b'
+                .allSatisfy(tlDevice -> {
+                    assertThat(tlDevice.getLN())
+                            .filteredOn(tln -> tln.getLnClass().contains("RBDR") && tln.getInst().equals("1") && !tln.isSetPrefix())
+                            .allSatisfy(tln -> {
+                                assertThat(getDaiValue(tln, CHNUM1_DO_NAME, DU_DA_NAME)).isEqualTo("MR.PX1");
+                                assertThat(getDaiValue(tln, MOD_DO_NAME, STVAL_DA_NAME)).isEqualTo("on");
+                                assertThat(getDaiValue(tln, LEVMOD_DO_NAME, SETVAL_DA_NAME)).isEqualTo("ADF");
+                                assertThat(getDaiValue(tln, SRCREF_DO_NAME, SETSRCREF_DA_NAME)).isEqualTo("IED_NAME1LDPX/PTRC0.Str.general");
+                            });
+                    assertThat(tlDevice.getLN())
+                            .filteredOn(tln -> tln.getLnClass().contains("RBDR") && tln.getInst().equals("1") &&  tln.getPrefix().equals("b"))
+                            .allSatisfy(tln -> {
+                                assertThat(getDaiValue(tln, CHNUM1_DO_NAME, DU_DA_NAME)).isEqualTo("MR.PX1");
+                                assertThat(getDaiValue(tln, MOD_DO_NAME, STVAL_DA_NAME)).isEqualTo("on");
+                                assertThat(getDaiValue(tln, LEVMOD_DO_NAME, SETVAL_DA_NAME)).isEqualTo("ADF");
+                                assertThat(getDaiValue(tln, SRCREF_DO_NAME, SETSRCREF_DA_NAME)).isEqualTo("IED_NAME1LDPX/PTRC0.Str.q");
+                            });
+                })
+                //LN class RADR: with and without prefix 'a'
+                .allSatisfy(tlDevice -> {
+                    assertThat(tlDevice.getLN())
+                            .filteredOn(tln -> tln.getLnClass().contains("RADR") && tln.getInst().equals("1") && !tln.isSetPrefix())
+                            .allSatisfy(tln -> {
+                                assertThat(getDaiValue(tln, CHNUM1_DO_NAME, DU_DA_NAME)).isEqualTo("MR.PX1");
+                                assertThat(getDaiValue(tln, MOD_DO_NAME, STVAL_DA_NAME)).isEqualTo("on");
+                                assertThat(getDaiValue(tln, LEVMOD_DO_NAME, SETVAL_DA_NAME)).isEqualTo("ADF");
+                                assertThat(getDaiValue(tln, SRCREF_DO_NAME, SETSRCREF_DA_NAME)).isEqualTo("IED_NAME1LDPX/PTRC0.Str.general");
+                            });
+                    assertThat(tlDevice.getLN())
+                            .filteredOn(tln -> tln.getLnClass().contains("RBDR") && tln.getInst().equals("1") &&  tln.getPrefix().equals("a"))
+                            .allSatisfy(tln -> {
+                                assertThat(getDaiValue(tln, CHNUM1_DO_NAME, DU_DA_NAME)).isEqualTo("MR.PX1");
+                                assertThat(getDaiValue(tln, MOD_DO_NAME, STVAL_DA_NAME)).isEqualTo("on");
+                                assertThat(getDaiValue(tln, LEVMOD_DO_NAME, SETVAL_DA_NAME)).isEqualTo("ADF");
+                                assertThat(getDaiValue(tln, SRCREF_DO_NAME, SETSRCREF_DA_NAME)).isEqualTo("IED_NAME1LDPX/PTRC0.Str.q");
+                            });
+                });
+    }
+
 }
diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/testhelpers/SclHelper.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/testhelpers/SclHelper.java
index 6ca8329cb..dea68e04c 100644
--- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/testhelpers/SclHelper.java
+++ b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/testhelpers/SclHelper.java
@@ -233,17 +233,18 @@ public static String getDaiValue(AbstractLNAdapter<?> ln, String doiName, String
         return ln.getDOIAdapterByName(doiName).getDataAdapterByName(daiName).getCurrentElem().getVal().getFirst().getValue();
     }
 
-    public static Stream<String> streamAllConnectedApGseP(SCL scd, String pType) {
-        return scd.getCommunication().getSubNetwork().stream()
-                .map(TSubNetwork::getConnectedAP)
-                .flatMap(List::stream)
-                .map(TConnectedAP::getGSE)
-                .flatMap(List::stream)
-                .map(TControlBlock::getAddress)
-                .map(TAddress::getP)
-                .flatMap(List::stream)
-                .filter(tp -> pType.equals(tp.getType()))
-                .map(TP::getValue);
+    public static Stream<TDAI> getDai(TAnyLN tAnyLN, String doiName, String daiName) {
+        return tAnyLN.getDOI().stream().filter(tdoi -> tdoi.getName().equals(doiName))
+                .flatMap(tdoi -> tdoi.getSDIOrDAI().stream())
+                .filter(TDAI.class::isInstance)
+                .map(TDAI.class::cast)
+                .filter(tdai -> daiName.equals(tdai.getName()));
+    }
+
+    public static String getDaiValue(TAnyLN tAnyLN, String doiName, String daiName) {
+        TDAI tdai = getDai(tAnyLN, doiName, daiName).findFirst()
+                .orElseThrow(() -> new AssertionFailedError(String.format("DAI %s.%s not found in LN", doiName, daiName)));
+        return getValue(tdai);
     }
 
     public static SclRootAdapter createSclRootAdapterWithIed(String iedName) {
diff --git a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_extref_with_IedType_BCU.xml b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_extref_with_IedType_BCU.xml
index 63a3ce64d..fcc4e3fc9 100644
--- a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_extref_with_IedType_BCU.xml
+++ b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_extref_with_IedType_BCU.xml
@@ -31,19 +31,19 @@
                         </DOI>
                         <Inputs> <!-- ExtRef check (pLN, pDO, desc) -->
                             <!-- Binding ExtRef : ExtRef match Channel.Digital.num 1 at IED_NAME1 -->
-                            <ExtRef pLN="PTRC" pDO="Str" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 2_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 3_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 4_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 5_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 6_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 7_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 8_1_BOOLEEN_1_general_1"/>
-                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 9_1_BOOLEEN_1_neut_1"/>
-                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 10_1_BOOLEEN_1_phsA_1"/>
-                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 11_1_BOOLEEN_1_phsB_1"/>
-                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 12_1_BOOLEEN_1_phsC_1"/>
-                            <ExtRef pLN="PTRC" pDO="Str" desc="DYN_LDEPF_DIGITAL CHANNEL 13_1_BOOLEEN_1_dirGeneral_1"/>
+                            <ExtRef pLN="PTRC" pDO="Str" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 2_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 3_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 4_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 5_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 6_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 7_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 8_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PDIS" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 9_1_BOOLEAN_1_neut_1"/>
+                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 10_1_BOOLEAN_1_phsA_1"/>
+                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 11_1_BOOLEAN_1_phsB_1"/>
+                            <ExtRef pLN="PTRC" pDO="Op" desc="DYN_LDEPF_DIGITAL CHANNEL 12_1_BOOLEAN_1_phsC_1"/>
+                            <ExtRef pLN="PTRC" pDO="Str" desc="DYN_LDEPF_DIGITAL CHANNEL 13_1_BOOLEAN_1_dirGeneral_1"/>
                         </Inputs>
                     </LN0>
                     <LN lnClass="RBDR" inst="1" lnType="RTE_RBDR">
diff --git a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_iedSources_in_different_bay.xml b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_iedSources_in_different_bay.xml
index 91f433303..5f336a57c 100644
--- a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_iedSources_in_different_bay.xml
+++ b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_iedSources_in_different_bay.xml
@@ -31,7 +31,7 @@
                         </DOI>
                         <Inputs>
                             <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC"
-                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                     <LN lnClass="RBDR" inst="1" lnType="RTE_RBDR">
@@ -146,7 +146,7 @@
                             </DAI>
                         </DOI>
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -190,7 +190,7 @@
                             </DAI>
                         </DOI>
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
diff --git a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_manyIedSources_in_same_bay.xml b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_manyIedSources_in_same_bay.xml
index a4b0d299b..bc2ea5083 100644
--- a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_manyIedSources_in_same_bay.xml
+++ b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_manyIedSources_in_same_bay.xml
@@ -31,7 +31,7 @@
                         </DOI>
                         <Inputs>
                             <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC"
-                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -71,7 +71,7 @@
                         </DOI>
                         <Inputs>
                             <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC"
-                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                     <LN lnClass="RBDR" inst="1" lnType="RTE_RBDR">
@@ -154,7 +154,7 @@
                             </DAI>
                         </DOI>
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
diff --git a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_processing_bind_dai_update.xml b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_processing_bind_dai_update.xml
new file mode 100644
index 000000000..9ea6a685e
--- /dev/null
+++ b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_processing_bind_dai_update.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- SPDX-FileCopyrightText: 2025 RTE FRANCE -->
+<!-- -->
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<SCL version="2007" revision="B" release="4" xmlns="http://www.iec.ch/61850/2003/SCL" xmlns:compas="https://www.lfenergy.org/compas/extension/v1">
+    <Private type="COMPAS-SclFileType">
+        <compas:SclFileType>SCD</compas:SclFileType>
+    </Private>
+    <Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
+    <IED name="IEDTEST">
+        <AccessPoint name="AP_NAME"/>
+    </IED>
+    <IED name="IED_NAME1">
+        <Private type="COMPAS-Bay"> <!-- BAY check (UUID) -->
+            <compas:Bay UUID="bayUUID1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
+        </Private>
+        <Private type="COMPAS-ICDHeader"> <!-- ICDHeader check (IEDType, IEDredundancy, IEDSystemVersioninstance) -->
+            <compas:ICDHeader IEDType="BCU" IEDredundancy="None" IEDSystemVersioninstance="1"
+                              ICDSystemVersionUUID="System_Version_UUID" VendorName="SCLE SFE" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="1.0" swRev="1.0"
+                              headerId="ARKENS-SV1120-HGAAA-EB5_SCU"/>
+        </Private>
+        <AccessPoint name="AP_NAME">
+            <Server>
+                <Authentication/>
+                <LDevice inst="LDEPF" ldName="IED_NAME1LDEPF">
+                    <LN0 lnClass="LLN0" inst="" lnType="LLN0_ID1">
+                        <DOI name="Mod">
+                            <DAI name="stVal" valImport="true">
+                                <Val>on</Val>
+                            </DAI>
+                        </DOI>
+                        <Inputs> <!-- ExtRef check (pLN, pDO, desc) -->
+                            <!-- Binding ExtRef : ExtRef match Channel.Digital.num 1 at IED_NAME1 -->
+                            <ExtRef pLN="PTRC" pDO="Str" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
+                            <ExtRef pLN="PTRC" pDO="Str" desc="DYN_LDEPF_ANALOG CHANNEL 1_1_AnalogueValue_1_general_1"/>
+                        </Inputs>
+                    </LN0>
+                    <LN lnClass="RADR" inst="1" lnType="RTE_RADR_Type">
+                        <DOI name="ChNum1">
+                            <DAI name="dU" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                                <!-- It is the Channel.ShortLabel column value of the current setting file line -->
+                            </DAI>
+                        </DOI>
+                        <DOI name="LevMod">
+                            <DAI name="setVal" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                                <!-- It is the Channel.LevMod column value of the current setting file line -->
+                            </DAI>
+                        </DOI>
+                        <DOI name="Mod">
+                            <DAI name="stVal" sAddr="50606.0" valKind="Set" valImport="false">
+                                <Val>off</Val>
+                                <!-- Mod/stVal always updatable even if valImport="false" -->
+                            </DAI>
+                        </DOI>
+                        <DOI name="SrcRef">
+                            <DAI name="setSrcRef" valKind="Set" valImport="true">
+                                <Val>ADF</Val>
+                                <!-- Must contain ExtRef@iedNameExtRef@ldInst/ExtRef@prefixExtRef@lnClassExtRef@lnInst[.]ExtRef@doName[.]ExtRef@daName="" from the DA.name column value of the setting file -->
+                            </DAI>
+                        </DOI>
+                    </LN>
+                    <LN prefix="a" lnClass="RADR" inst="1" lnType="RTE_RADR_Type">
+                        <DOI name="ChNum1">
+                            <DAI name="dU" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                                <!-- It is the Channel.ShortLabel column value of the current setting file line -->
+                            </DAI>
+                        </DOI>
+                        <DOI name="LevMod">
+                            <DAI name="setVal" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                                <!-- It is the Channel.LevMod.q column value of the current setting file line -->
+                            </DAI>
+                        </DOI>
+                        <DOI name="Mod">
+                            <DAI name="stVal" sAddr="50606.0" valKind="Set" valImport="false">
+                                <Val>off</Val>
+                                <!-- Mod/stVal always updatable even if valImport="false" -->
+                            </DAI>
+                        </DOI>
+                        <DOI name="SrcRef">
+                            <DAI name="setSrcRef" valKind="Set" valImport="true">
+                                <Val>ADF</Val>
+                                <!-- Must contain ExtRef@iedNameExtRef@ldInst/ExtRef@prefixExtRef@lnClassExtRef@lnInst[.]ExtRef@doName.q , DA name will be always q for bRBDR -->
+                            </DAI>
+                        </DOI>
+                    </LN>
+
+                    <LN lnClass="RBDR" inst="1" lnType="RTE_RBDR_Type">
+                        <DOI name="ChNum1">
+                            <DAI name="dU" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                            </DAI>
+                        </DOI>
+                        <DOI name="SrcRef">
+                            <DAI name="setSrcRef" valKind="Set" valImport="true">
+                                <Val>ADF</Val>
+                            </DAI>
+                            <DAI name="d" valKind="RO" valImport="false">
+                                <Val>Source reference of the channel among LDEPF input signals</Val>
+                            </DAI>
+                        </DOI>
+                        <DOI name="LevMod">
+                            <DAI name="setVal" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                            </DAI>
+                        </DOI>
+                        <DOI name="Mod">
+                            <DAI name="stVal">
+                                <Val>ADF</Val>
+                            </DAI>
+                        </DOI>
+                    </LN>
+                    <LN prefix="b" lnClass="RBDR" inst="1" lnType="RTE_RBDR_Type">
+                        <DOI name="ChNum1">
+                            <DAI name="dU" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                            </DAI>
+                        </DOI>
+                        <DOI name="SrcRef">
+                            <DAI name="setSrcRef" valKind="Set" valImport="true">
+                                <Val>ADF</Val>
+                            </DAI>
+                            <DAI name="d" valKind="RO" valImport="false">
+                                <Val>Source reference of the channel among LDEPF input signals</Val>
+                            </DAI>
+                        </DOI>
+                        <DOI name="LevMod">
+                            <DAI name="setVal" valKind="RO" valImport="true">
+                                <Val>ADF</Val>
+                            </DAI>
+                        </DOI>
+                        <DOI name="Mod">
+                            <DAI name="stVal">
+                                <Val>ADF</Val>
+                            </DAI>
+                        </DOI>
+                    </LN>
+                </LDevice>
+                <LDevice inst="LDPX" ldName="IED_NAME1LDPX">
+                    <LN0 lnClass="LLN0" inst="" lnType="LLN0_ID1">
+                        <DOI name="Mod">
+                            <DAI name="stVal">
+                                <Val>on</Val>
+                            </DAI>
+                        </DOI>
+                    </LN0>
+                    <LN lnClass="PTRC" inst="0" lnType="PTRC_ID1">
+                    </LN>
+                    <LN lnClass="PTRC" inst="2" lnType="PTRC_ID1">
+                        <DOI name="Mod">
+                            <DAI name="stVal">
+                                <Val>off</Val>
+                            </DAI>
+                        </DOI>
+                    </LN>
+                </LDevice>
+                <LDevice inst="LDPXINVALID" ldName="IED_NAME1LDPX">
+                    <LN0 lnClass="LLN0" inst="" lnType="LLN0_ID1">
+                        <DOI name="Mod">
+                            <DAI name="stVal">
+                                <Val>off</Val>
+                            </DAI>
+                        </DOI>
+                    </LN0>
+                    <LN lnClass="PTRC" inst="0" lnType="PTRC_ID1">
+                    </LN>
+                </LDevice>
+            </Server>
+        </AccessPoint>
+    </IED>
+    <DataTypeTemplates>
+        <LNodeType lnClass="LLN0" id="LLN0_ID1">
+            <DO name="Mod" type="DO2"/>
+        </LNodeType>
+        <LNodeType lnClass="PTRC" id="PTRC_ID1">
+            <DO name="Mod" type="DO2"/>
+            <DO name="Str" type="ACD1"/>
+            <DO name="Op" type="ACD1"/> <!-- doName Op -->
+        </LNodeType>
+        <LNodeType lnClass="RADR" id="RTE_RADR_Type"> <!-- lnClass RADR -->
+            <DO name="ChNum1" type="DOCh"/>
+            <DO name="LevMod" type="DOLe"/>
+            <DO name="Mod" type="DOMo"/>
+            <DO name="SrcRef" type="DOSr"/>
+        </LNodeType>
+        <LNodeType lnClass="RBDR" id="RTE_RBDR_Type"> <!-- lnClass RBDR -->
+            <DO name="ChNum1" type="DOCh"/>
+            <DO name="LevMod" type="DOLe"/>
+            <DO name="Mod" type="DOMo"/>
+            <DO name="SrcRef" type="DOSr"/>
+        </LNodeType>
+        <DOType cdc="ACD" id="ACD1">
+            <DA name="general" bType="BOOLEAN" fc="ST"/>  <!-- daName general -->
+        </DOType>
+        <DOType cdc="ENC" id="DO2">
+            <DA fc="ST" dchg="true" name="stVal" bType="Enum" type="BehaviourModeKind"
+                valImport="true"/>
+            <DA fc="BL" name="daName1" bType="BOOLEAN"/>
+        </DOType>
+        <DOType cdc="ENC" id="DOCh">
+            <DA fc="ST" dchg="true" name="dU" bType="VisString255" valImport="true"/>
+        </DOType>
+        <DOType cdc="ENC" id="DOLe">
+            <DA fc="ST" dchg="true" name="setVal" bType="VisString255" valImport="true"/>
+        </DOType>
+        <DOType cdc="ENC" id="DOMo">
+            <DA fc="ST" dchg="true" name="stVal" bType="Enum" type="BehaviourModeKind" valImport="true"/>
+        </DOType>
+        <DOType cdc="ENC" id="DOSr">
+            <DA fc="ST" dchg="true" name="setSrcRef" bType="VisString255" valImport="true"/>
+        </DOType>
+        <EnumType id="BehaviourModeKind">
+            <EnumVal ord="1">on</EnumVal>
+            <EnumVal ord="2">off</EnumVal>
+            <EnumVal ord="3">blocked</EnumVal>
+            <EnumVal ord="4">test</EnumVal>
+            <EnumVal ord="5">test/blocked</EnumVal>
+        </EnumType>
+    </DataTypeTemplates>
+</SCL>
\ No newline at end of file
diff --git a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInDataTypeTemplate.xml b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInDataTypeTemplate.xml
index befdc3bb3..3a2a713c1 100644
--- a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInDataTypeTemplate.xml
+++ b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInDataTypeTemplate.xml
@@ -31,7 +31,7 @@
                         </DOI>
                         <Inputs>
                             <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC"
-                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -87,7 +87,7 @@
                             </DAI>
                         </DOI>
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -125,7 +125,7 @@
                             </DAI>
                         </DOI>
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
diff --git a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInLN0.xml b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInLN0.xml
index 8913663fb..8391441ed 100644
--- a/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInLN0.xml
+++ b/sct-commons/src/test/resources/scd-ldepf/scd_ldepf_withoutModStValInLN0.xml
@@ -26,7 +26,7 @@
                     <LN0 lnClass="LLN0" inst="" lnType="LLN0_ID1">
                         <Inputs>
                             <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC"
-                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -77,7 +77,7 @@
                 <LDevice inst="LDEPF" ldName="IED_NAME2LDEPF">
                     <LN0 lnClass="LLN0" inst="" lnType="LLN0_ID1">
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -110,7 +110,7 @@
                 <LDevice inst="LDEPF" ldName="IED_NAME3LDEPF">
                     <LN0 lnClass="LLN0" inst="" lnType="LLN0_ID1">
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
diff --git a/sct-commons/src/test/resources/scd-ldepf/scd_with_inactive_ldevice_ldepf.xml b/sct-commons/src/test/resources/scd-ldepf/scd_with_inactive_ldevice_ldepf.xml
index f85ff6180..598e8f845 100644
--- a/sct-commons/src/test/resources/scd-ldepf/scd_with_inactive_ldevice_ldepf.xml
+++ b/sct-commons/src/test/resources/scd-ldepf/scd_with_inactive_ldevice_ldepf.xml
@@ -31,7 +31,7 @@
                         </DOI>
                         <Inputs>
                             <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC"
-                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                                    desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -87,7 +87,7 @@
                             </DAI>
                         </DOI>
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>
@@ -125,7 +125,7 @@
                             </DAI>
                         </DOI>
                         <Inputs>
-                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEEN_1_general_1"/>
+                            <ExtRef intAddr="INT_ADDR11" pDO="Str" pLN="PTRC" desc="DYN_LDEPF_DIGITAL CHANNEL 1_1_BOOLEAN_1_general_1"/>
                         </Inputs>
                     </LN0>
                 </LDevice>