diff --git a/Application Examples/TwoAreas/Data/PF1.mo b/Application Examples/TwoAreas/Data/PF1.mo
new file mode 100644
index 000000000..2463088cc
--- /dev/null
+++ b/Application Examples/TwoAreas/Data/PF1.mo	
@@ -0,0 +1,41 @@
+within TwoAreas.Data;
+record PF1
+  extends PF_TwoAreas(
+    voltages(
+      V1=1.03,
+      A1=20.2473,
+      V2=1.01,
+      A2=10.4897,
+      V3=1.03,
+      A3=-6.8,
+      V4=1.01,
+      A4=-16.9776,
+      V5=1.0069,
+      A5=13.7881,
+      V6=0.97914,
+      A6=3.7146,
+      V7=0.96283,
+      A7=-4.6748,
+      V8=0.94828,
+      A8=-18.5131,
+      V9=0.97386,
+      A9=-32.1004,
+      V10=0.98486,
+      A10=-23.7131,
+      V11=1.0088,
+      A11=-13.4215),
+    machines(
+      P1_1=700,
+      Q1_1=182.450226027067,
+      P2_1=700,
+      Q2_1=228.434194888742,
+      P3_1=718.906215107731,
+      Q3_1=172.421333322957,
+      P4_1=700,
+      Q4_1=193.556043309309),
+    loads(
+      PL7_1=967,
+      QL7_1=-100,
+      PL9_1=1767,
+      QL9_1=-250));
+end PF1;
diff --git a/Application Examples/TwoAreas/Data/PF2.mo b/Application Examples/TwoAreas/Data/PF2.mo
new file mode 100644
index 000000000..dbf6efc7e
--- /dev/null
+++ b/Application Examples/TwoAreas/Data/PF2.mo	
@@ -0,0 +1,42 @@
+within TwoAreas.Data;
+record PF2
+  import Modelica.Constants.pi;
+  extends PF_TwoAreas(
+    voltages(
+      V1=1.03,
+      A1=0.353381617759011*180/pi,
+      V2=1.01,
+      A2=0.183079867930759*180/pi,
+      V3=1.03,
+      A3=-0.118682400000000*180/pi,
+      V4=1.01,
+      A4=-0.296314118513724*180/pi,
+      V5=1.0069,
+      A5=13.7881,
+      V6=0.97914,
+      A6=3.7146,
+      V7=0.96283,
+      A7=-0.0815909472281613*180/pi,
+      V8=0.94828,
+      A8=-18.5131,
+      V9=0.973864710338689,
+      A9=-0.560256955944523*180/pi,
+      V10=0.98486,
+      A10=-23.7131,
+      V11=1.0088,
+      A11=-13.4215),
+    machines(
+      P1_1=700,
+      Q1_1=182.450226027067,
+      P2_1=700,
+      Q2_1=228.434194888742,
+      P3_1=718.906215107731,
+      Q3_1=172.421333322957,
+      P4_1=700,
+      Q4_1=193.556043309309),
+    loads(
+      PL7_1=967,
+      QL7_1=-100,
+      PL9_1=1767,
+      QL9_1=-250));
+end PF2;
diff --git a/Application Examples/TwoAreas/Data/PF_TwoAreas.mo b/Application Examples/TwoAreas/Data/PF_TwoAreas.mo
new file mode 100644
index 000000000..7074fd800
--- /dev/null
+++ b/Application Examples/TwoAreas/Data/PF_TwoAreas.mo	
@@ -0,0 +1,67 @@
+within TwoAreas.Data;
+partial record PF_TwoAreas
+  record Voltages
+    // Bus number 1
+    parameter Real V1;
+    parameter Real A1;
+    // Bus number 2
+    parameter Real V2;
+    parameter Real A2;
+    // Bus number 3
+    parameter Real V3;
+    parameter Real A3;
+    // Bus number 4
+    parameter Real V4;
+    parameter Real A4;
+    // Bus number 5
+    parameter Real V5;
+    parameter Real A5;
+    // Bus number 6
+    parameter Real V6;
+    parameter Real A6;
+    // Bus number 7
+    parameter Real V7;
+    parameter Real A7;
+    // Bus number 8
+    parameter Real V8;
+    parameter Real A8;
+    // Bus number 9
+    parameter Real V9;
+    parameter Real A9;
+    // Bus number 10
+    parameter Real V10;
+    parameter Real A10;
+    // Bus number 11
+    parameter Real V11;
+    parameter Real A11;
+  end Voltages;
+
+  record Machines
+    // Gen at bus 1
+    parameter Real P1_1;
+    parameter Real Q1_1;
+    // Gen at bus 2
+    parameter Real P2_1;
+    parameter Real Q2_1;
+    // Gen at bus 3
+    parameter Real P3_1;
+    parameter Real Q3_1;
+    // Gen at bus 4
+    parameter Real P4_1;
+    parameter Real Q4_1;
+  end Machines;
+
+  record Loads
+    // Gen at bus 1
+    parameter Real PL7_1;
+    parameter Real QL7_1;
+    // Gen at bus 2
+    parameter Real PL9_1;
+    parameter Real QL9_1;
+  end Loads;
+
+  Voltages voltages;
+  Machines machines;
+  Loads loads;
+
+end PF_TwoAreas;
diff --git a/Application Examples/TwoAreas/Data/package.mo b/Application Examples/TwoAreas/Data/package.mo
new file mode 100644
index 000000000..d88f837fd
--- /dev/null
+++ b/Application Examples/TwoAreas/Data/package.mo	
@@ -0,0 +1,3 @@
+within TwoAreas;
+package Data 
+end Data;
diff --git a/Application Examples/TwoAreas/Data/package.order b/Application Examples/TwoAreas/Data/package.order
new file mode 100644
index 000000000..9716bb65b
--- /dev/null
+++ b/Application Examples/TwoAreas/Data/package.order	
@@ -0,0 +1,3 @@
+PF_TwoAreas
+PF1
+PF2
diff --git a/Application Examples/TwoAreas/Groups/PSAT/package.mo b/Application Examples/TwoAreas/Groups/PSAT/package.mo
index 3fa691c62..a3d6b6176 100644
--- a/Application Examples/TwoAreas/Groups/PSAT/package.mo	
+++ b/Application Examples/TwoAreas/Groups/PSAT/package.mo	
@@ -1,5 +1,5 @@
 within TwoAreas.Groups;
-package PSAT
+package PSAT 
 annotation (Documentation(revisions="<html>
 <!--DISCLAIMER-->
 <p>Copyright 2015-2016 RTE (France), SmarTS Lab (Sweden), AIA (Spain) and DTU (Denmark)</p>
diff --git a/Application Examples/TwoAreas/Groups/PSSE/AVR/G1.mo b/Application Examples/TwoAreas/Groups/PSSE/AVR/G1.mo
index b71089ae8..328365ae0 100644
--- a/Application Examples/TwoAreas/Groups/PSSE/AVR/G1.mo	
+++ b/Application Examples/TwoAreas/Groups/PSSE/AVR/G1.mo	
@@ -53,11 +53,8 @@ equation
     Icon(coordinateSystem(
         preserveAspectRatio=true,
         extent={{-60,-60},{60,60}},
-        initialScale=0.1), graphics={
-        Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-        Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-        Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-        Text(
+        initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={28,
+          108,200}),Text(
           extent={{-20,-24},{16,-54}},
           lineColor={28,108,200},
           textString="%name")}),
diff --git a/Application Examples/TwoAreas/Groups/PSSE/AVR/G2.mo b/Application Examples/TwoAreas/Groups/PSSE/AVR/G2.mo
index b9ab498eb..dac1eecf5 100644
--- a/Application Examples/TwoAreas/Groups/PSSE/AVR/G2.mo	
+++ b/Application Examples/TwoAreas/Groups/PSSE/AVR/G2.mo	
@@ -61,11 +61,8 @@ equation
     Icon(coordinateSystem(
         preserveAspectRatio=true,
         extent={{-60,-60},{60,60}},
-        initialScale=0.1), graphics={
-        Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-        Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-        Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-        Text(
+        initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={28,
+          108,200}),Text(
           extent={{-20,-22},{16,-52}},
           lineColor={28,108,200},
           textString="G2")}),
diff --git a/Application Examples/TwoAreas/Groups/PSSE/AVR/G3.mo b/Application Examples/TwoAreas/Groups/PSSE/AVR/G3.mo
index 7b007c894..238e5cc7c 100644
--- a/Application Examples/TwoAreas/Groups/PSSE/AVR/G3.mo	
+++ b/Application Examples/TwoAreas/Groups/PSSE/AVR/G3.mo	
@@ -54,11 +54,8 @@ equation
     Icon(coordinateSystem(
         preserveAspectRatio=true,
         extent={{-60,-60},{60,60}},
-        initialScale=0.1), graphics={
-        Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-        Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-        Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-        Text(
+        initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={28,
+          108,200}),Text(
           extent={{-22,-24},{18,-54}},
           lineColor={28,108,200},
           textString="G3")}),
diff --git a/Application Examples/TwoAreas/Groups/PSSE/AVR/G4.mo b/Application Examples/TwoAreas/Groups/PSSE/AVR/G4.mo
index 6267f1123..eb114bdf5 100644
--- a/Application Examples/TwoAreas/Groups/PSSE/AVR/G4.mo	
+++ b/Application Examples/TwoAreas/Groups/PSSE/AVR/G4.mo	
@@ -61,11 +61,8 @@ equation
     Icon(coordinateSystem(
         preserveAspectRatio=true,
         extent={{-60,-60},{60,60}},
-        initialScale=0.1), graphics={
-        Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-        Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-        Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-        Text(
+        initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={28,
+          108,200}),Text(
           extent={{-24,-22},{18,-52}},
           lineColor={28,108,200},
           textString="G4")}),
diff --git a/Application Examples/TwoAreas/Groups/PSSE/AVR/package.mo b/Application Examples/TwoAreas/Groups/PSSE/AVR/package.mo
index c65931ec1..28b05823c 100644
--- a/Application Examples/TwoAreas/Groups/PSSE/AVR/package.mo	
+++ b/Application Examples/TwoAreas/Groups/PSSE/AVR/package.mo	
@@ -1,3 +1,3 @@
 within TwoAreas.Groups.PSSE;
-package AVR
+package AVR 
 end AVR;
diff --git a/Application Examples/TwoAreas/Groups/PSSE/No_Controls.mo b/Application Examples/TwoAreas/Groups/PSSE/No_Controls.mo
index 909579f20..d615f9f0a 100644
--- a/Application Examples/TwoAreas/Groups/PSSE/No_Controls.mo	
+++ b/Application Examples/TwoAreas/Groups/PSSE/No_Controls.mo	
@@ -36,14 +36,11 @@ package No_Controls
           initialScale=0.1)), Icon(coordinateSystem(
           preserveAspectRatio=true,
           extent={{-60,-60},{60,60}},
-          initialScale=0.1), graphics={
-          Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-          Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-          Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-          Text(
-            extent={{-20,-24},{16,-54}},
-            lineColor={28,108,200},
-            textString="%name")}));
+          initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={
+            28,108,200}),Text(
+              extent={{-20,-24},{16,-54}},
+              lineColor={28,108,200},
+              textString="%name")}));
   end G1;
 
   model G2
@@ -82,14 +79,11 @@ package No_Controls
           initialScale=0.1)), Icon(coordinateSystem(
           preserveAspectRatio=true,
           extent={{-60,-60},{60,60}},
-          initialScale=0.1), graphics={
-          Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-          Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-          Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-          Text(
-            extent={{-20,-22},{16,-52}},
-            lineColor={28,108,200},
-            textString="G2")}));
+          initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={
+            28,108,200}),Text(
+              extent={{-20,-22},{16,-52}},
+              lineColor={28,108,200},
+              textString="G2")}));
   end G2;
 
   model G3
@@ -129,14 +123,11 @@ package No_Controls
           initialScale=0.1)), Icon(coordinateSystem(
           preserveAspectRatio=true,
           extent={{-60,-60},{60,60}},
-          initialScale=0.1), graphics={
-          Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-          Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-          Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-          Text(
-            extent={{-22,-24},{18,-54}},
-            lineColor={28,108,200},
-            textString="G3")}));
+          initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={
+            28,108,200}),Text(
+              extent={{-22,-24},{18,-54}},
+              lineColor={28,108,200},
+              textString="G3")}));
   end G3;
 
   model G4
@@ -175,13 +166,10 @@ package No_Controls
           initialScale=0.1)), Icon(coordinateSystem(
           preserveAspectRatio=true,
           extent={{-60,-60},{60,60}},
-          initialScale=0.1), graphics={
-          Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),
-          Line(points={{-40,0},{-20,20}}, color={28,108,200}),
-          Line(points={{-20,20},{20,-20},{40,0}}, color={28,108,200}),
-          Text(
-            extent={{-24,-22},{18,-52}},
-            lineColor={28,108,200},
-            textString="G4")}));
+          initialScale=0.1), graphics={Ellipse(extent={{-60,60},{60,-60}}, lineColor={28,108,200}),Line(points={{-40,0},{-20,20}}, color={28,108,200}),Line(points={{-20,20},{20,-20},{40,0}}, color={
+            28,108,200}),Text(
+              extent={{-24,-22},{18,-52}},
+              lineColor={28,108,200},
+              textString="G4")}));
   end G4;
 end No_Controls;
diff --git a/Application Examples/TwoAreas/Groups/PSSE/package.mo b/Application Examples/TwoAreas/Groups/PSSE/package.mo
index 3ac70a331..6d3079b3b 100644
--- a/Application Examples/TwoAreas/Groups/PSSE/package.mo	
+++ b/Application Examples/TwoAreas/Groups/PSSE/package.mo	
@@ -1,5 +1,5 @@
 within TwoAreas.Groups;
-package PSSE
+package PSSE 
 annotation (Documentation(revisions="<html>
 <!--DISCLAIMER-->
 <p>Copyright 2015-2016 RTE (France), SmarTS Lab (Sweden), AIA (Spain) and DTU (Denmark)</p>
diff --git a/Application Examples/TwoAreas/Groups/package.mo b/Application Examples/TwoAreas/Groups/package.mo
index 81d939ee0..726c0c021 100644
--- a/Application Examples/TwoAreas/Groups/package.mo	
+++ b/Application Examples/TwoAreas/Groups/package.mo	
@@ -1,5 +1,5 @@
 within TwoAreas;
-package Groups
+package Groups 
 
 
 annotation (Documentation(revisions="<html>
diff --git a/Application Examples/TwoAreas/Two_Areas_PSAT.mo b/Application Examples/TwoAreas/Two_Areas_PSAT.mo
index 61ca6c31e..4cd6a4a33 100644
--- a/Application Examples/TwoAreas/Two_Areas_PSAT.mo	
+++ b/Application Examples/TwoAreas/Two_Areas_PSAT.mo	
@@ -5,8 +5,9 @@ model Two_Areas_PSAT
   parameter Real r=0.0001;
   parameter Real x=0.001;
   parameter Real b=0.00175*0.5;
+  replaceable Data.PF1 PF_results constrainedby Data.PF_TwoAreas annotation (Placement(transformation(extent={{-220,-40},{-200,-20}})));
   iPSL.Electrical.Buses.Bus bus1 annotation (Placement(transformation(extent={{-190,20},{-170,40}})));
-  iPSL.Electrical.Buses.Bus bus2 annotation (Placement(transformation(extent={{-190,-20},{-170,0}})));
+  iPSL.Electrical.Buses.Bus bus2 annotation (Placement(transformation(extent={{-190,-10},{-170,10}})));
   iPSL.Electrical.Buses.Bus bus3 annotation (Placement(transformation(extent={{170,20},{190,40}})));
   iPSL.Electrical.Buses.Bus bus4 annotation (Placement(transformation(extent={{170,-20},{190,0}})));
   iPSL.Electrical.Buses.Bus bus5 annotation (Placement(transformation(extent={{-150,20},{-130,40}})));
@@ -17,31 +18,31 @@ model Two_Areas_PSAT
   iPSL.Electrical.Buses.Bus bus10 annotation (Placement(transformation(extent={{90,20},{110,40}})));
   iPSL.Electrical.Buses.Bus bus11 annotation (Placement(transformation(extent={{130,20},{150,40}})));
   Groups.PSAT.G1 g1(
-    P_0=700,
-    Q_0=182.450226027067,
-    V_0=1.03000000000000,
-    angle_0=0.353381617759011*180/pi,
-    V_b=20) annotation (Placement(transformation(extent={{-214,24},{-202,36}})));
+    V_b=20,
+    V_0=PF_results.voltages.V1,
+    angle_0=PF_results.voltages.A1,
+    P_0=PF_results.machines.P1_1,
+    Q_0=PF_results.machines.Q1_1) annotation (Placement(transformation(extent={{-214,24},{-202,36}})));
   Groups.PSAT.G2 g2(
-    P_0=700,
-    Q_0=228.434194888742,
-    V_0=1.01000000000000,
-    angle_0=0.183079867930759*180/pi,
-    V_b=20) annotation (Placement(transformation(extent={{-214,-16},{-202,-4}})));
+    V_0=PF_results.voltages.V2,
+    angle_0=PF_results.voltages.A2,
+    P_0=PF_results.machines.P2_1,
+    Q_0=PF_results.machines.Q2_1,
+    V_b=20) annotation (Placement(transformation(extent={{-214,-6},{-202,6}})));
   Groups.PSAT.G3 g3(
-    Q_0=172.421333322957,
-    P_0=718.906215107731,
-    V_0=1.03000000000000,
-    angle_0=-0.118682400000000*180/pi,
+    V_0=PF_results.voltages.V3,
+    angle_0=PF_results.voltages.A3,
+    P_0=PF_results.machines.P3_1,
+    Q_0=PF_results.machines.Q3_1,
     V_b=20) annotation (Placement(transformation(
         extent={{-6,-6},{6,6}},
         rotation=180,
         origin={208,30})));
   Groups.PSAT.G4 g4(
-    P_0=700,
-    Q_0=193.556043309309,
-    V_0=1.01000000000000,
-    angle_0=-0.296314118513724*180/pi,
+    V_0=PF_results.voltages.V4,
+    angle_0=PF_results.voltages.A4,
+    P_0=PF_results.machines.P4_1,
+    Q_0=PF_results.machines.Q4_1,
     V_b=20) annotation (Placement(transformation(
         extent={{-6,-6},{6,6}},
         rotation=180,
@@ -101,25 +102,25 @@ model Two_Areas_PSAT
         origin={2,-16})));
 
   iPSL.Electrical.Loads.PSAT.ZIP Load7(
-    P_0=967,
-    Q_0=-100,
     Pz=0,
     Pi=1,
     Qz=0,
     Qi=0,
-    V_0=0.962831011348560,
-    angle_0=-0.0815909472281613*180/pi,
-    V_b=230) annotation (Placement(transformation(extent={{-76,-30},{-52,-6}})));
+    V_b=230,
+    V_0=PF_results.voltages.V7,
+    angle_0=PF_results.voltages.A7,
+    P_0=PF_results.loads.PL7_1,
+    Q_0=PF_results.loads.QL7_1) annotation (Placement(transformation(extent={{-76,-30},{-52,-6}})));
   iPSL.Electrical.Loads.PSAT.ZIP Load9(
-    P_0=1767,
-    Q_0=-250,
     Pz=0,
     Pi=1,
     Qz=0,
     Qi=0,
-    V_0=0.973864710338689,
-    angle_0=-0.560256955944523*180/pi,
-    V_b=230) annotation (Placement(transformation(extent={{80,-30},{54,-4}})));
+    V_b=230,
+    V_0=PF_results.voltages.V9,
+    angle_0=PF_results.voltages.A9,
+    P_0=PF_results.loads.PL9_1,
+    Q_0=PF_results.loads.QL9_1) annotation (Placement(transformation(extent={{80,-30},{54,-4}})));
   iPSL.Electrical.Branches.PSAT.TwoWindingTransformer trafo1(
     Sn=900,
     r=0,
@@ -133,7 +134,7 @@ model Two_Areas_PSAT
     x=0.15,
     kT=20/230,
     V_b=20,
-    Vn=20) annotation (Placement(transformation(extent={{-170,-20},{-150,0}})));
+    Vn=20) annotation (Placement(transformation(extent={{-170,-10},{-150,10}})));
   iPSL.Electrical.Branches.PSAT.TwoWindingTransformer trafo3(
     Sn=900,
     r=0,
@@ -149,34 +150,35 @@ model Two_Areas_PSAT
     V_b=20,
     Vn=20) annotation (Placement(transformation(extent={{170,-20},{150,0}})));
   inner iPSL.Electrical.SystemBase SysData(fn=60) annotation (Placement(transformation(extent={{-220,46},{-170,60}})));
+
 equation
   connect(g1.pwPin, bus1.p) annotation (Line(points={{-201.4,30},{-201.4,30},{-180,30}}, color={0,0,255}));
-  connect(g2.pwPin, bus2.p) annotation (Line(points={{-201.4,-10},{-201.4,-10},{-180,-10}}, color={0,0,255}));
-  connect(Line6_7.n, bus7.p) annotation (Line(points={{-73,30},{-66.5,30},{-60,30}}, color={0,0,255}));
-  connect(Line6_7.p, bus6.p) annotation (Line(points={{-87,30},{-93.5,30},{-100,30}}, color={0,0,255}));
-  connect(Line5_6.n, bus6.p) annotation (Line(points={{-113,30},{-106.5,30},{-100,30}}, color={0,0,255}));
-  connect(Line5_6.p, bus5.p) annotation (Line(points={{-127,30},{-133.5,30},{-140,30}}, color={0,0,255}));
-  connect(Line8_9_2.n, bus9.p) annotation (Line(points={{37,20},{54,20},{54,30},{60,30}}, color={0,0,255}));
-  connect(Line8_9_1.n, bus9.p) annotation (Line(points={{37,40},{54,40},{54,30},{60,30}}, color={0,0,255}));
-  connect(Line8_9_2.p, bus8.p) annotation (Line(points={{23,20},{6,20},{6,30},{0,30}}, color={0,0,255}));
-  connect(Line8_9_1.p, bus8.p) annotation (Line(points={{23,40},{6,40},{6,30},{0,30}}, color={0,0,255}));
-  connect(Line7_8_2.n, bus8.p) annotation (Line(points={{-23,20},{-6,20},{-6,22},{-6,30},{0,30}}, color={0,0,255}));
-  connect(Line7_8_1.n, bus8.p) annotation (Line(points={{-23,40},{-6,40},{-6,30},{0,30}}, color={0,0,255}));
-  connect(Line7_8_1.p, bus7.p) annotation (Line(points={{-37,40},{-54,40},{-54,30},{-60,30}}, color={0,0,255}));
-  connect(Line7_8_2.p, bus7.p) annotation (Line(points={{-37,20},{-54,20},{-54,30},{-60,30}}, color={0,0,255}));
-  connect(bus9.p, Line9_10.p) annotation (Line(points={{60,30},{73,30}}, color={0,0,255}));
-  connect(Line9_10.n, bus10.p) annotation (Line(points={{87,30},{93.5,30},{100,30}}, color={0,0,255}));
-  connect(bus10.p, Line10_11.p) annotation (Line(points={{100,30},{113,30}}, color={0,0,255}));
-  connect(Line10_11.n, bus11.p) annotation (Line(points={{127,30},{133.5,30},{140,30}}, color={0,0,255}));
+  connect(g2.pwPin, bus2.p) annotation (Line(points={{-201.4,0},{-201.4,0},{-180,0}}, color={0,0,255}));
+  connect(Line6_7.n, bus7.p) annotation (Line(points={{-68.3333,30},{-68.3333,30},{-60,30}}, color={0,0,255}));
+  connect(Line6_7.p, bus6.p) annotation (Line(points={{-91.6667,30},{-91.6667,30},{-100,30}}, color={0,0,255}));
+  connect(Line5_6.n, bus6.p) annotation (Line(points={{-108.333,30},{-108.333,30},{-100,30}}, color={0,0,255}));
+  connect(Line5_6.p, bus5.p) annotation (Line(points={{-131.667,30},{-131.667,30},{-140,30}}, color={0,0,255}));
+  connect(Line8_9_2.n, bus9.p) annotation (Line(points={{41.6667,20},{54,20},{54,30},{60,30}}, color={0,0,255}));
+  connect(Line8_9_1.n, bus9.p) annotation (Line(points={{41.6667,40},{54,40},{54,30},{60,30}}, color={0,0,255}));
+  connect(Line8_9_2.p, bus8.p) annotation (Line(points={{18.3333,20},{6,20},{6,30},{0,30}}, color={0,0,255}));
+  connect(Line8_9_1.p, bus8.p) annotation (Line(points={{18.3333,40},{6,40},{6,30},{0,30}}, color={0,0,255}));
+  connect(Line7_8_2.n, bus8.p) annotation (Line(points={{-18.3333,20},{-6,20},{-6,22},{-6,30},{0,30}}, color={0,0,255}));
+  connect(Line7_8_1.n, bus8.p) annotation (Line(points={{-18.3333,40},{-6,40},{-6,30},{0,30}}, color={0,0,255}));
+  connect(Line7_8_1.p, bus7.p) annotation (Line(points={{-41.6667,40},{-54,40},{-54,30},{-60,30}}, color={0,0,255}));
+  connect(Line7_8_2.p, bus7.p) annotation (Line(points={{-41.6667,20},{-54,20},{-54,30},{-60,30}}, color={0,0,255}));
+  connect(bus9.p, Line9_10.p) annotation (Line(points={{60,30},{68.3333,30}}, color={0,0,255}));
+  connect(Line9_10.n, bus10.p) annotation (Line(points={{91.6667,30},{91.6667,30},{100,30}}, color={0,0,255}));
+  connect(bus10.p, Line10_11.p) annotation (Line(points={{100,30},{108.333,30}}, color={0,0,255}));
+  connect(Line10_11.n, bus11.p) annotation (Line(points={{131.667,30},{131.667,30},{140,30}}, color={0,0,255}));
   connect(g4.pwPin, bus4.p) annotation (Line(points={{201.4,-10},{201.4,-10},{180,-10}}, color={0,0,255}));
   connect(g3.pwPin, bus3.p) annotation (Line(points={{201.4,30},{180,30}}, color={0,0,255}));
   connect(Load7.p, bus7.p) annotation (Line(points={{-64,-4.8},{-64,-4.8},{-64,0},{-64,28},{-64,30},{-60,30}}, color={0,0,255}));
-  connect(Load9.p, Line9_10.p) annotation (Line(points={{67,-2.7},{67,-2.7},{67,30},{73,30}}, color={0,0,255}));
+  connect(Load9.p, Line9_10.p) annotation (Line(points={{67,-2.7},{67,-2.7},{67,30},{68.3333,30}}, color={0,0,255}));
   connect(pwFault.p, bus8.p) annotation (Line(points={{2,-4.33333},{2,30},{0,30}}, color={0,0,255}));
   connect(bus1.p, trafo1.p) annotation (Line(points={{-180,30},{-171,30}}, color={0,0,255}));
   connect(bus5.p, trafo1.n) annotation (Line(points={{-140,30},{-149,30}}, color={0,0,255}));
-  connect(bus2.p, trafo2.p) annotation (Line(points={{-180,-10},{-171,-10}}, color={0,0,255}));
-  connect(trafo2.n, bus6.p) annotation (Line(points={{-149,-10},{-104,-10},{-104,30},{-100,30}}, color={0,0,255}));
+  connect(bus2.p, trafo2.p) annotation (Line(points={{-180,0},{-171,0}}, color={0,0,255}));
+  connect(trafo2.n, bus6.p) annotation (Line(points={{-149,0},{-104,0},{-104,30},{-100,30}}, color={0,0,255}));
   connect(trafo4.n, bus10.p) annotation (Line(points={{149,-10},{108,-10},{108,30},{100,30}}, color={0,0,255}));
   connect(trafo4.p, bus4.p) annotation (Line(points={{171,-10},{176,-10},{180,-10}}, color={0,0,255}));
   connect(trafo3.p, bus3.p) annotation (Line(points={{171,30},{175.5,30},{180,30}}, color={0,0,255}));
diff --git a/Application Examples/TwoAreas/Two_Areas_PSSE.mo b/Application Examples/TwoAreas/Two_Areas_PSSE.mo
index 458d6186f..c56925ca2 100644
--- a/Application Examples/TwoAreas/Two_Areas_PSSE.mo	
+++ b/Application Examples/TwoAreas/Two_Areas_PSSE.mo	
@@ -100,13 +100,13 @@ model Two_Areas_PSSE
     V_0=0.9610106,
     angle_0=-4.68651,
     P_0=967,
-    Q_0=-100) annotation (Placement(transformation(extent={{-70,-12},{-58,0}})));
+    Q_0=-84.70) annotation (Placement(transformation(extent={{-76,-12},{-50,0}})));
   iPSL.Electrical.Loads.PSSE.Load Load9(
     PQBRAK=0.7,
     V_0=0.9713628,
     angle_0=-32.15403,
     P_0=1767,
-    Q_0=-250) annotation (Placement(transformation(extent={{72,-12},{60,0}})));
+    Q_0=-230.2) annotation (Placement(transformation(extent={{80,-12},{50,0}})));
   iPSL.Electrical.Branches.PwLine Line5_1(
     G=0,
     R=0,
@@ -149,8 +149,8 @@ equation
   connect(Line10_11.n, bus11.p) annotation (Line(points={{131.667,30},{131.667,30},{140,30}}, color={0,0,255}));
   connect(g4.pwPin, bus4.p) annotation (Line(points={{201,-10},{201,-10},{180,-10}}, color={0,0,255}));
   connect(g3.pwPin, bus3.p) annotation (Line(points={{201,30},{180,30}}, color={0,0,255}));
-  connect(Load7.p, bus7.p) annotation (Line(points={{-64,0.6},{-64,0.6},{-64,30},{-60,30}}, color={0,0,255}));
-  connect(Load9.p, Line9_10.p) annotation (Line(points={{66,0.6},{66,0.6},{66,30},{68.3333,30}}, color={0,0,255}));
+  connect(Load7.p, bus7.p) annotation (Line(points={{-63,0.6},{-64,0.6},{-64,30},{-60,30}}, color={0,0,255}));
+  connect(Load9.p, Line9_10.p) annotation (Line(points={{65,0.6},{66,0.6},{66,30},{68.3333,30}}, color={0,0,255}));
   connect(pwFault.p, bus8.p) annotation (Line(points={{2,-4.33333},{2,30},{0,30}}, color={0,0,255}));
   connect(bus1.p, Line5_1.p) annotation (Line(points={{-180,30},{-171.667,30}}, color={0,0,255}));
   connect(bus5.p, Line5_1.n) annotation (Line(points={{-140,30},{-148.333,30}}, color={0,0,255}));
diff --git a/Application Examples/TwoAreas/package.order b/Application Examples/TwoAreas/package.order
index ede60ed97..b0a12acba 100644
--- a/Application Examples/TwoAreas/package.order	
+++ b/Application Examples/TwoAreas/package.order	
@@ -1,5 +1,5 @@
 Two_Areas_PSAT
 Two_Areas_PSSE
 Two_Areas_PSSE_AVR
-Two_Areas_PSSE_AVR_bis
 Groups
+Data