diff --git a/README.md b/README.md
index 886124223..2a4737043 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ for (Line line : network.lines) {
         parameterSetId "CLA"
         controlledQuadripole line.id
         iMeasurement line.id
-        iMeasurementSide Branch.Side.TWO
+        iMeasurementSide TwoSides.TWO
     }
 }
 ```
diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/events/EventDisconnectionGroovyExtension.groovy b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/events/EventDisconnectionGroovyExtension.groovy
index b68f65872..0ec229aec 100644
--- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/events/EventDisconnectionGroovyExtension.groovy
+++ b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/events/EventDisconnectionGroovyExtension.groovy
@@ -15,14 +15,9 @@ import com.powsybl.dynawaltz.dsl.DslEquipment
 import com.powsybl.dynawaltz.dsl.builders.AbstractEventModelBuilder
 import com.powsybl.dynawaltz.models.events.AbstractEvent
 import com.powsybl.dynawaltz.models.events.EventHvdcDisconnection
-import com.powsybl.dynawaltz.models.events.EventQuadripoleDisconnection
 import com.powsybl.dynawaltz.models.events.EventInjectionDisconnection
-import com.powsybl.iidm.network.Branch
-import com.powsybl.iidm.network.HvdcLine
-import com.powsybl.iidm.network.Identifiable
-import com.powsybl.iidm.network.IdentifiableType
-import com.powsybl.iidm.network.Network
-import com.powsybl.iidm.network.TwoSides
+import com.powsybl.dynawaltz.models.events.EventQuadripoleDisconnection
+import com.powsybl.iidm.network.*
 
 /**
  * @author Laurent Issertial {@literal <laurent.issertial at rte-france.com>}
@@ -62,11 +57,11 @@ class EventDisconnectionGroovyExtension extends AbstractPureDynamicGroovyExtensi
         void disconnectOnly(TwoSides side) {
             disconnectSide = true
             switch (side) {
-                case Branch.Side.ONE :
+                case TwoSides.ONE :
                     disconnectOrigin = true
                     disconnectExtremity = false
                     break
-                case Branch.Side.TWO :
+                case TwoSides.TWO :
                     disconnectOrigin = false
                     disconnectExtremity = true
                     break
diff --git a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/AbstractHvdcBuilder.groovy b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/AbstractHvdcBuilder.groovy
index 4e16413c9..a521c587e 100644
--- a/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/AbstractHvdcBuilder.groovy
+++ b/dynawaltz-dsl/src/main/groovy/com/powsybl/dynawaltz/dsl/models/hvdc/AbstractHvdcBuilder.groovy
@@ -11,7 +11,6 @@ import com.powsybl.dynawaltz.dsl.EquipmentConfig
 import com.powsybl.dynawaltz.dsl.builders.AbstractEquipmentModelBuilder
 import com.powsybl.dynawaltz.models.Side
 import com.powsybl.dynawaltz.models.utils.SideConverter
-import com.powsybl.iidm.network.Branch
 import com.powsybl.iidm.network.HvdcLine
 import com.powsybl.iidm.network.IdentifiableType
 import com.powsybl.iidm.network.Network
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels.groovy
index baf9282e9..a9849a1ac 100644
--- a/dynawaltz-dsl/src/test/resources/dynamicModels.groovy
+++ b/dynawaltz-dsl/src/test/resources/dynamicModels.groovy
@@ -5,16 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
-import com.powsybl.iidm.network.Branch
 import com.powsybl.iidm.network.Bus
+import com.powsybl.iidm.network.Generator
 import com.powsybl.iidm.network.Line
 import com.powsybl.iidm.network.Load
-import com.powsybl.iidm.network.Generator
-
+import com.powsybl.iidm.network.TwoSides
 
 for (Load load : network.loads) {
-    if (load == "LOAD2") {
+    if (load.id == "LOAD2") {
         LoadOneTransformer {
             staticId load.id
             // dynamicModelId "BBM_" + load.id (dynamicModelId could be optional and equal to staticId)
@@ -76,7 +74,7 @@ for (Line line : network.lines) {
         dynamicModelId "BBM_" + line.id
         parameterSetId "CLA"
         iMeasurement line.id
-        iMeasurementSide Branch.Side.TWO
+        iMeasurementSide TwoSides.TWO
     }
 
     Line {
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimit.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimit.groovy
index 494926b7a..3d4ed0531 100644
--- a/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimit.groovy
+++ b/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimit.groovy
@@ -8,12 +8,12 @@
 
 package dynamicModels
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 CurrentLimitAutomaton {
     dynamicModelId "AM_NHV1_NHV2_1"
     parameterSetId "CLA"
     controlledQuadripole "NHV1_NHV2_2"
     iMeasurement "NHV1_NHV2_1"
-    iMeasurementSide Branch.Side.TWO
+    iMeasurementSide TwoSides.TWO
 }
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimitTwoLevels.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimitTwoLevels.groovy
index aba0b1b9c..2d47e3581 100644
--- a/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimitTwoLevels.groovy
+++ b/dynawaltz-dsl/src/test/resources/dynamicModels/currentLimitTwoLevels.groovy
@@ -8,14 +8,14 @@
 
 package dynamicModels
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 CurrentLimitAutomatonTwoLevels {
     dynamicModelId "AM_NHV1_NHV2_1"
     parameterSetId "CLA"
     controlledQuadripole "NHV1_NHV2_2"
     iMeasurement1 "NHV1_NHV2_1"
-    iMeasurement1Side Branch.Side.TWO
+    iMeasurement1Side TwoSides.TWO
     iMeasurement2 "NGEN_NHV1"
-    iMeasurement2Side Branch.Side.ONE
+    iMeasurement2Side TwoSides.ONE
 }
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy
index 2fbfadcaf..f01664494 100644
--- a/dynawaltz-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy
+++ b/dynawaltz-dsl/src/test/resources/dynamicModels/danglingHvdcException.groovy
@@ -8,11 +8,11 @@
 
 package dynamicModels
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 HvdcPV {
     staticId "L"
     dynamicModelId "BBM_HVDC_L"
     parameterSetId "HVDC"
-    dangling Branch.Side.ONE
+    dangling TwoSides.ONE
 }
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy
index 780a0bec4..aa0169587 100644
--- a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy
+++ b/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcPDangling.groovy
@@ -8,11 +8,11 @@
 
 package dynamicModels
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 HvdcPVDanglingDiagramPQ {
     staticId "L"
     dynamicModelId "BBM_HVDC_L"
     parameterSetId "HVDC"
-    dangling Branch.Side.ONE
+    dangling TwoSides.ONE
 }
diff --git a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy b/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy
index a1290c328..6218b71f5 100644
--- a/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy
+++ b/dynawaltz-dsl/src/test/resources/dynamicModels/hvdcVscDangling.groovy
@@ -8,11 +8,11 @@
 
 package dynamicModels
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 HvdcVSCDanglingUdc {
     staticId "L"
     dynamicModelId "BBM_HVDC_L"
     parameterSetId "HVDC"
-    dangling Branch.Side.TWO
+    dangling TwoSides.TWO
 }
diff --git a/dynawaltz-dsl/src/test/resources/eventModels.groovy b/dynawaltz-dsl/src/test/resources/eventModels.groovy
index c632eda86..0e868bdee 100644
--- a/dynawaltz-dsl/src/test/resources/eventModels.groovy
+++ b/dynawaltz-dsl/src/test/resources/eventModels.groovy
@@ -5,13 +5,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+
 import com.powsybl.iidm.network.Line
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 for (Line line : network.lines) {
     Disconnect {
         staticId line.id
         startTime 4
-        disconnectOnly Branch.Side.TWO
+        disconnectOnly TwoSides.TWO
     }
 }
diff --git a/dynawaltz-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy b/dynawaltz-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy
index d3a1af481..a41ad8f93 100644
--- a/dynawaltz-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy
+++ b/dynawaltz-dsl/src/test/resources/eventModels/hvdcDisconnection.groovy
@@ -8,10 +8,10 @@
 
 package eventModels
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 Disconnect {
     staticId "L"
     startTime 2
-    disconnectOnly Branch.Side.TWO
+    disconnectOnly TwoSides.TWO
 }
diff --git a/dynawaltz-dsl/src/test/resources/eventModels/quadripoleDisconnection.groovy b/dynawaltz-dsl/src/test/resources/eventModels/quadripoleDisconnection.groovy
index 1e3c5ad9e..d7684f961 100644
--- a/dynawaltz-dsl/src/test/resources/eventModels/quadripoleDisconnection.groovy
+++ b/dynawaltz-dsl/src/test/resources/eventModels/quadripoleDisconnection.groovy
@@ -8,10 +8,10 @@
 
 package eventModels
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 Disconnect {
     staticId "NHV1_NHV2_1"
     startTime 4
-    disconnectOnly Branch.Side.ONE
+    disconnectOnly TwoSides.ONE
 }
diff --git a/dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy b/dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy
index 08821b753..4d4d6eb99 100644
--- a/dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy
+++ b/dynawaltz-dsl/src/test/resources/eventWarnings/missingDisconnectionSide.groovy
@@ -8,10 +8,10 @@
 
 package eventWarnings
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 Disconnect {
     staticId "GEN"
     startTime 1
-    disconnectOnly Branch.Side.ONE
+    disconnectOnly TwoSides.ONE
 }
diff --git a/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/dynamicModels.groovy b/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/dynamicModels.groovy
index 40f4299e5..6a5457d7f 100644
--- a/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/dynamicModels.groovy
+++ b/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/dynamicModels.groovy
@@ -5,10 +5,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import com.powsybl.iidm.network.Branch
-import com.powsybl.iidm.network.Load
 import com.powsybl.iidm.network.Generator
-
+import com.powsybl.iidm.network.Load
+import com.powsybl.iidm.network.TwoSides
 
 for (Load load : network.loads) {
     if (load.id != "_LOAD___8_EC") {
@@ -38,7 +37,7 @@ CurrentLimitAutomaton {
     parameterSetId "CLA_2_4"
     controlledQuadripole "_BUS____2-BUS____4-1_AC"
     iMeasurement "_BUS____2-BUS____4-1_AC"
-    iMeasurementSide Branch.Side.TWO
+    iMeasurementSide TwoSides.TWO
 }
 
 CurrentLimitAutomaton {
@@ -46,6 +45,6 @@ CurrentLimitAutomaton {
     parameterSetId "CLA_2_5"
     controlledQuadripole "_BUS____2-BUS____5-1_AC"
     iMeasurement "_BUS____2-BUS____5-1_AC"
-    iMeasurementSide Branch.Side.TWO
+    iMeasurementSide TwoSides.TWO
 }
 
diff --git a/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/eventModels.groovy b/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/eventModels.groovy
index 448840913..8e328b8c6 100644
--- a/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/eventModels.groovy
+++ b/dynawaltz-dsl/src/test/resources/ieee14-currentlimitautomaton/powsybl-inputs/eventModels.groovy
@@ -5,10 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 Disconnect {
     staticId "_BUS____1-BUS____5-1_AC"
     startTime 5
-    disconnectOnly Branch.Side.TWO
+    disconnectOnly TwoSides.TWO
 }
diff --git a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy b/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy
index 585e7a483..f15f829a7 100644
--- a/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy
+++ b/dynawaltz-dsl/src/test/resources/ieee14-disconnectline/powsybl-inputs/eventModels.groovy
@@ -5,10 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 Disconnect {
     staticId "_BUS____1-BUS____5-1_AC"
     startTime 1
-    disconnectOnly Branch.Side.TWO
+    disconnectOnly TwoSides.TWO
 }
diff --git a/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy b/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy
index 918b54b70..3f9c32d81 100644
--- a/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy
+++ b/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurement2.groovy
@@ -8,14 +8,14 @@
 
 package warnings
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 CurrentLimitAutomatonTwoLevels {
     dynamicModelId "CLA_NGEN"
     parameterSetId "CLA"
     controlledQuadripole "NHV1_NHV2_2"
     iMeasurement1 "NHV1_NHV2_1"
-    iMeasurement1Side Branch.Side.TWO
+    iMeasurement1Side TwoSides.TWO
     iMeasurement2 "NGEN"
-    iMeasurement2Side Branch.Side.ONE
+    iMeasurement2Side TwoSides.ONE
 }
diff --git a/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy b/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy
index 6723e4cb8..bcf6345ea 100644
--- a/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy
+++ b/dynawaltz-dsl/src/test/resources/warnings/cla2MissingMeasurementSide2.groovy
@@ -8,13 +8,13 @@
 
 package warnings
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 CurrentLimitAutomatonTwoLevels {
     dynamicModelId "CLA_NGEN"
     parameterSetId "CLA"
     controlledQuadripole "NHV1_NHV2_2"
     iMeasurement1 "NHV1_NHV2_1"
-    iMeasurement1Side Branch.Side.TWO
+    iMeasurement1Side TwoSides.TWO
     iMeasurement2 "NHV1_NHV2_2"
 }
diff --git a/dynawaltz-dsl/src/test/resources/warnings/claMissingControlled.groovy b/dynawaltz-dsl/src/test/resources/warnings/claMissingControlled.groovy
index 753e11468..0e7d57c6b 100644
--- a/dynawaltz-dsl/src/test/resources/warnings/claMissingControlled.groovy
+++ b/dynawaltz-dsl/src/test/resources/warnings/claMissingControlled.groovy
@@ -8,12 +8,12 @@
 
 package warnings
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 CurrentLimitAutomaton {
     dynamicModelId "CLA_NGEN"
     parameterSetId "CLA"
     controlledQuadripole "GEN"
     iMeasurement "NHV1_NHV2_1"
-    iMeasurementSide Branch.Side.TWO
+    iMeasurementSide TwoSides.TWO
 }
diff --git a/dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurement.groovy b/dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurement.groovy
index 805d56a76..f5e5b3e21 100644
--- a/dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurement.groovy
+++ b/dynawaltz-dsl/src/test/resources/warnings/claMissingMeasurement.groovy
@@ -8,12 +8,12 @@
 
 package warnings
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 CurrentLimitAutomaton {
     dynamicModelId "CLA_NGEN"
     parameterSetId "CLA"
     controlledQuadripole "NHV1_NHV2_2"
     iMeasurement "NGEN"
-    iMeasurementSide Branch.Side.TWO
+    iMeasurementSide TwoSides.TWO
 }
diff --git a/dynawaltz-dsl/src/test/resources/warnings/missingDanglingProperty.groovy b/dynawaltz-dsl/src/test/resources/warnings/missingDanglingProperty.groovy
index 8eea58d83..2637a52e2 100644
--- a/dynawaltz-dsl/src/test/resources/warnings/missingDanglingProperty.groovy
+++ b/dynawaltz-dsl/src/test/resources/warnings/missingDanglingProperty.groovy
@@ -8,11 +8,11 @@
 
 package warnings
 
-import com.powsybl.iidm.network.Branch
+import com.powsybl.iidm.network.TwoSides
 
 HvdcPV {
     staticId "L"
     dynamicModelId "BBM_HVDC_L"
     parameterSetId "HVDC"
-    dangling Branch.Side.ONE
+    dangling TwoSides.ONE
 }
diff --git a/dynawo-integration-tests/src/test/resources/ieee14/disconnectline/eventModels.groovy b/dynawo-integration-tests/src/test/resources/ieee14/disconnectline/eventModels.groovy
index 585e7a483..675dc0b3d 100644
--- a/dynawo-integration-tests/src/test/resources/ieee14/disconnectline/eventModels.groovy
+++ b/dynawo-integration-tests/src/test/resources/ieee14/disconnectline/eventModels.groovy
@@ -10,5 +10,5 @@ import com.powsybl.iidm.network.Branch
 Disconnect {
     staticId "_BUS____1-BUS____5-1_AC"
     startTime 1
-    disconnectOnly Branch.Side.TWO
+    disconnectOnly TwoSides.TWO
 }