diff --git a/csharp/App/SaliMax/src/MiddlewareClasses/AlarmOrWarning.cs b/csharp/App/SaliMax/src/MiddlewareClasses/AlarmOrWarning.cs
new file mode 100644
index 000000000..9c27c52e1
--- /dev/null
+++ b/csharp/App/SaliMax/src/MiddlewareClasses/AlarmOrWarning.cs
@@ -0,0 +1,9 @@
+namespace InnovEnergy.App.SaliMax.MiddlewareClasses;
+
+public class AlarmOrWarning
+{
+    public String Date                   { get; set; }
+    public String Time                   { get; set; }
+    public String Description            { get; set; }
+    public String CreatedBy              { get; set; }
+}
\ No newline at end of file
diff --git a/csharp/App/SaliMax/src/MiddlewareClasses/StatusMessage.cs b/csharp/App/SaliMax/src/MiddlewareClasses/StatusMessage.cs
index ed9f94b19..54eb4e11f 100644
--- a/csharp/App/SaliMax/src/MiddlewareClasses/StatusMessage.cs
+++ b/csharp/App/SaliMax/src/MiddlewareClasses/StatusMessage.cs
@@ -4,10 +4,8 @@ namespace InnovEnergy.App.SaliMax.MiddlewareClasses;
 public class StatusMessage
 {
     
-    public required int InstallationId   { get; set; }
-    public required int Status           { get; set; }
-    public String Date                   { get; set; }  = null!;
-    public String Time                   { get; set; }  = null!;
-    public String Description            { get; set; } = null!;
-    public String CreatedBy              { get; set; } = null!;
+    public required Int32       InstallationId  { get; set; }
+    public required Int32       Status          { get; set; }
+    public List<AlarmOrWarning> Warnings        { get; set; }
+    public List<AlarmOrWarning> Alarms          { get; set; }
 }
\ No newline at end of file