diff --git a/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
index 71a38092e..af4bcd58b 100644
--- a/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
+++ b/dpsim/examples/cxx/Circuits/DP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
@@ -110,7 +110,7 @@ int main(int argc, char* argv[]) {
 		SystemComponentList{loadDP, lineDP, pv});
 
 	// Initialization of dynamic topology
-	systemDP.initWithPowerflow(systemPF);
+	systemDP.initWithPowerflow(systemPF, Domain::DP);
 	Complex initial1PhPowerVSI= Complex(linePF->attributeTyped<Real>("p_inj")->get(), linePF->attributeTyped<Real>("q_inj")->get());
 
 	pv->terminal(0)->setPower(initial1PhPowerVSI);
diff --git a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp
index ec8adfaa3..fa8a54ba2 100644
--- a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp
+++ b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_Ramp_with_PF_Init.cpp
@@ -6,8 +6,8 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *********************************************************************************/
 
-#include "../Examples.h"
 #include <DPsim.h>
+#include "../Examples.h"
 
 using namespace DPsim;
 using namespace CPS;
@@ -151,7 +151,7 @@ int main(int argc, char *argv[]) {
                                   SystemComponentList{extnetEMT, lineEMT, pv});
 
   // Initialization of dynamic topology
-  systemEMT.initWithPowerflow(systemPF, CPS::Domain::EMT);
+  systemEMT.initWithPowerflow(systemPF, Domain::EMT);
 
   // Logging
   auto loggerEMT = DataLogger::make(simName);
diff --git a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp
index 7ce33696a..acd35189f 100644
--- a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp
+++ b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_LoadStep_with_PF_Init.cpp
@@ -133,7 +133,7 @@ int main(int argc, char* argv[]) {
 			SystemComponentList{pv,lineEMT, load1SwitchEMT, load1EMT, load2SwitchEMT, load2EMT});
 
 	// Initialization of dynamic topology
-	systemEMT.initWithPowerflow(systemPF);
+	systemEMT.initWithPowerflow(systemPF, Domain::EMT);
 
 	Complex initial3PhPowerVSI = Complex(linePF->attributeTyped<Real>("p_inj")->get(), linePF->attributeTyped<Real>("q_inj")->get());
 
diff --git a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
index 152761d6d..c922dd941 100644
--- a/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
+++ b/dpsim/examples/cxx/Circuits/EMT_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
@@ -110,7 +110,7 @@ int main(int argc, char* argv[]) {
 		SystemComponentList{loadEMT, lineEMT, pv});
 
 	// Initialization of dynamic topology
-	systemEMT.initWithPowerflow(systemPF);
+	systemEMT.initWithPowerflow(systemPF, Domain::EMT);
 	Complex initial3PhPowerVSI= Complex(linePF->attributeTyped<Real>("p_inj")->get(), linePF->attributeTyped<Real>("q_inj")->get());
 
 	pv->terminal(0)->setPower(initial3PhPowerVSI);
diff --git a/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp b/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
index 2c81c74da..b025c36b6 100644
--- a/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
+++ b/dpsim/examples/cxx/Circuits/SP_Slack_PiLine_VSI_VoltageControlled_SteadyState_with_PF_Init.cpp
@@ -117,7 +117,7 @@ int main(int argc, char* argv[]) {
 			SystemComponentList{loadSP, lineSP, pv});
 
 	// Initialization of dynamic topology
-	systemSP.initWithPowerflow(systemPF);
+	systemSP.initWithPowerflow(systemPF, Domain::SP);
 	Complex initial1PhPowerVSI= Complex(linePF->attributeTyped<Real>("p_inj")->get(), linePF->attributeTyped<Real>("q_inj")->get());
 
 	pv->terminal(0)->setPower(initial1PhPowerVSI);
diff --git a/dpsim/examples/cxx/Examples.h b/dpsim/examples/cxx/Examples.h
index 8a01717ea..337858e43 100644
--- a/dpsim/examples/cxx/Examples.h
+++ b/dpsim/examples/cxx/Examples.h
@@ -533,10 +533,6 @@ struct ScenarioConfig {
   Real systemOmega = 2 * PI * systemFrequency;
 };
 } // namespace SGIB
-        // Further parameters
-        Real systemOmega = 2 * PI * systemFrequency;
-    };
-}
 namespace GridForming {
 
     struct ScenarioConfig1 {