diff --git a/csharp/App/SaliMax/src/Ess/StatusRecord.cs b/csharp/App/SaliMax/src/Ess/StatusRecord.cs
index 7a1175483..96e671a12 100644
--- a/csharp/App/SaliMax/src/Ess/StatusRecord.cs
+++ b/csharp/App/SaliMax/src/Ess/StatusRecord.cs
@@ -1,6 +1,7 @@
 using InnovEnergy.App.SaliMax.SaliMaxRelays;
 using InnovEnergy.App.SaliMax.System;
 using InnovEnergy.App.SaliMax.SystemConfig;
+using InnovEnergy.App.SaliMax.VirtualDevices;
 using InnovEnergy.Lib.Devices.AMPT;
 using InnovEnergy.Lib.Devices.Battery48TL;
 using InnovEnergy.Lib.Devices.EmuMeter;
@@ -10,15 +11,20 @@ using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc;
 namespace InnovEnergy.App.SaliMax.Ess;
 
 public record StatusRecord
-{
-    public AcDcDevicesRecord   AcDc         { get; init; } = null!; 
-    public DcDcDevicesRecord   DcDc         { get; init; } = null!; 
-    public Battery48TlRecords  Battery      { get; init; } = null!;
-    public EmuMeterRegisters?  GridMeter    { get; init; } 
-    public EmuMeterRegisters?  CriticalLoad { get; init; } 
-    public RelaysRecord?       Relays       { get; init; } 
-    public AmptStatus          Mppt         { get; init; } = null!;
-    public Config              Config       { get; init; } = null!;
-    public SystemState         SystemState  { get; } = new SystemState();
-    public EssControl          Ess          { get; set; }  = null!;
-}
\ No newline at end of file
+{   
+    public AcDcDevicesRecord   AcDc                { get; init; } = null!; 
+    public DcDcDevicesRecord   DcDc                { get; init; } = null!; 
+    public Battery48TlRecords  Battery             { get; init; } = null!;
+    public EmuMeterRegisters?  GridMeter           { get; init; } 
+    public EmuMeterRegisters?  LoadOnAcIsland      { get; init; } 
+    public AcDevicePower?      LoadOnAcGrid        { get; init; } = null!;
+    public AcDevicePower?      PvOnAcGrid          { get; init; } = null!;
+    public AcDevicePower?      PvOnAcIsland        { get; init; } = null!;
+    public DcDevicePower?      LoadOnDc            { get; init; } = null!;
+    public RelaysRecord?       Relays              { get; init; } 
+    public AmptStatus          PvOnDc              { get; init; } = null!;
+    public Config              Config              { get; init; } = null!;
+    public EssControl          EssControl          { get; set; }  = null!;
+    public StateMachine        StateMachine        { get; } = new StateMachine();
+    
+}
diff --git a/csharp/App/SaliMax/src/VirtualDevices/AcDevicePower.cs b/csharp/App/SaliMax/src/VirtualDevices/AcDevicePower.cs
new file mode 100644
index 000000000..8f157d789
--- /dev/null
+++ b/csharp/App/SaliMax/src/VirtualDevices/AcDevicePower.cs
@@ -0,0 +1,10 @@
+using InnovEnergy.Lib.Units.Composite;
+
+namespace InnovEnergy.App.SaliMax.VirtualDevices;
+
+public class AcDevicePower
+{
+    public AcPower Power { get; init; } = AcPower.Null;
+
+    public static AcDevicePower Null { get; } = new AcDevicePower();
+}
\ No newline at end of file
diff --git a/csharp/App/SaliMax/src/VirtualDevices/DcDevicePower.cs b/csharp/App/SaliMax/src/VirtualDevices/DcDevicePower.cs
new file mode 100644
index 000000000..bac183674
--- /dev/null
+++ b/csharp/App/SaliMax/src/VirtualDevices/DcDevicePower.cs
@@ -0,0 +1,8 @@
+using InnovEnergy.Lib.Units.Power;
+
+namespace InnovEnergy.App.SaliMax.VirtualDevices;
+
+public class DcDevicePower
+{
+    public DcPower Power { get; init; } = DcPower.Null;
+}
\ No newline at end of file