diff --git a/Pilz.Net/Api/Messages/GeneralItemMessages.cs b/Pilz.Net/Api/Messages/GeneralItemMessages.cs
index e48e0f0..861ba46 100644
--- a/Pilz.Net/Api/Messages/GeneralItemMessages.cs
+++ b/Pilz.Net/Api/Messages/GeneralItemMessages.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using Newtonsoft.Json;
+using System.ComponentModel;
 
 namespace Pilz.Net.Api.Messages;
 
@@ -10,12 +11,14 @@ public static class GeneralItemMessages<T>
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class ObjectMessage(T item) : ApiMessage
     {
+        [JsonProperty(TypeNameHandling = TypeNameHandling.Auto)]
         public T Item { get; } = item;
     }
 
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class ObjectsMessage(List<T> items) : ApiMessage
     {
+        [JsonProperty(ItemTypeNameHandling = TypeNameHandling.Auto)]
         public List<T> Items { get; } = items;
     }
 }