diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs
index 063d1d20..5c5044f7 100644
--- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs
+++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/BundleContentsComponent.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using MinecraftClient.Inventory;
 using MinecraftClient.Inventory.ItemPalettes;
 using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
@@ -10,28 +8,28 @@ namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_2
 public class BundleContentsComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry) 
     : StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
 {
-    public int NumberOfItems { get; set; }
-    public List<Item?> Items { get; set; } = [];
+    public List<Item> Items { get; set; } = [];
 
     public override void Parse(Queue<byte> data)
     {
-        NumberOfItems = dataTypes.ReadNextVarInt(data);
+        var count = dataTypes.ReadNextVarInt(data);
 
-        for (var i = 0; i < NumberOfItems; i++)
-            Items.Add(dataTypes.ReadNextItemSlot(data, itemPalette));
+        for (var i = 0; i < count; i++)
+        {
+            var item = dataTypes.ReadNextItemSlot(data, itemPalette);
+            if (item != null)
+                Items.Add(item);
+        }
     }
 
     public override Queue<byte> Serialize()
     {
         var data = new List<byte>();
-        data.AddRange(DataTypes.GetVarInt(NumberOfItems));
+        data.AddRange(DataTypes.GetVarInt(Items.Count));
 
-        if (NumberOfItems != Items.Count)
-            throw new ArgumentNullException($"Cannot serialize BundleContentsComponent1206 because NumberOfItems != Items.Count!");
-            
-        foreach (var item in Items.OfType<Item>())
+        foreach (var item in Items)
             data.AddRange(DataTypes.GetItemSlot(item, itemPalette));
 
         return new Queue<byte>(data);
     }
-}
\ No newline at end of file
+}
diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs
index ef0875ef..7305ee8c 100644
--- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs
+++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ChargedProjectilesComponent.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using MinecraftClient.Inventory;
 using MinecraftClient.Inventory.ItemPalettes;
 using MinecraftClient.Protocol.Handlers.StructuredComponents.Core;
@@ -10,28 +8,28 @@ namespace MinecraftClient.Protocol.Handlers.StructuredComponents.Components._1_2
 public class ChargedProjectilesComponent(DataTypes dataTypes, ItemPalette itemPalette, SubComponentRegistry subComponentRegistry) 
     : StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
 {
-    public int NumberOfItems { get; set; }
-    public List<Item?> Items { get; set; } = [];
+    public List<Item> Items { get; set; } = [];
 
     public override void Parse(Queue<byte> data)
     {
-        NumberOfItems = dataTypes.ReadNextVarInt(data);
+        var count = dataTypes.ReadNextVarInt(data);
 
-        for (var i = 0; i < NumberOfItems; i++)
-            Items.Add(dataTypes.ReadNextItemSlot(data, itemPalette));
+        for (var i = 0; i < count; i++)
+        {
+            var item = dataTypes.ReadNextItemSlot(data, itemPalette);
+            if (item != null)
+                Items.Add(item);
+        }
     }
 
     public override Queue<byte> Serialize()
     {
         var data = new List<byte>();
-        data.AddRange(DataTypes.GetVarInt(NumberOfItems));
+        data.AddRange(DataTypes.GetVarInt(Items.Count));
 
-        if (NumberOfItems != Items.Count)
-            throw new ArgumentNullException($"Cannot serialize ChargedProjectilesComponent1206 because NumberOfItems != Items.Count!");
-            
-        foreach (var item in Items.OfType<Item>())
+        foreach (var item in Items)
             data.AddRange(DataTypes.GetItemSlot(item, itemPalette));
 
         return new Queue<byte>(data);
     }
-}
\ No newline at end of file
+}
diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs
index 2b050aff..053fc918 100644
--- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs
+++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/ContainerComponent.cs
@@ -9,29 +9,22 @@ public class ContainerComponent(DataTypes dataTypes, ItemPalette itemPalette, Su
     : StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
 {
     public int NumberOfItems { get; set; }
-    public List<Item> Items { get; set; } = [];
+    public List<Item?> Items { get; set; } = [];
     
     public override void Parse(Queue<byte> data)
     {
         NumberOfItems = dataTypes.ReadNextVarInt(data);
         for (var i = 0; i < NumberOfItems; i++)
-        {
-            var item = dataTypes.ReadNextItemSlot(data, ItemPalette);
-
-            if (item is null)
-                continue;
-            
-            Items.Add(item);
-        }
+            Items.Add(dataTypes.ReadNextItemSlot(data, ItemPalette));
     }
 
     public override Queue<byte> Serialize()
     {
         var data = new List<byte>();
-        data.AddRange(DataTypes.GetVarInt(NumberOfItems));
-        for (var i = 0; i < NumberOfItems; i++)
-            data.AddRange(DataTypes.GetItemSlot(Items[i], itemPalette));
+        data.AddRange(DataTypes.GetVarInt(Items.Count));
+        foreach (var item in Items)
+            data.AddRange(DataTypes.GetItemSlot(item, itemPalette));
             
         return new Queue<byte>(data);
     }
-}
\ No newline at end of file
+}
diff --git a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs
index f848750d..aac861c2 100644
--- a/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs
+++ b/MinecraftClient/Protocol/Handlers/StructuredComponents/Components/1_20_6/FoodComponentComponent.cs
@@ -11,21 +11,20 @@ public class FoodComponentComponent(DataTypes dataTypes, ItemPalette itemPalette
     : StructuredComponent(dataTypes, itemPalette, subComponentRegistry)
 {
     public int Nutrition { get; set; }
-    public bool Saturation { get; set; }
+    public float Saturation { get; set; }
     public bool CanAlwaysEat { get; set; }
     public float SecondsToEat { get; set; }
-    public int NumberOfEffects { get; set; }
     public List<EffectSubComponent> Effects { get; set; } = new();
     
     public override void Parse(Queue<byte> data)
     {
         Nutrition = dataTypes.ReadNextVarInt(data);
-        Saturation = dataTypes.ReadNextBool(data);
+        Saturation = dataTypes.ReadNextFloat(data);
         CanAlwaysEat = dataTypes.ReadNextBool(data);
         SecondsToEat = dataTypes.ReadNextFloat(data);
-        NumberOfEffects = dataTypes.ReadNextVarInt(data);
+        var numberOfEffects = dataTypes.ReadNextVarInt(data);
         
-        for(var i = 0; i < NumberOfEffects; i++)
+        for(var i = 0; i < numberOfEffects; i++)
             Effects.Add((EffectSubComponent)subComponentRegistry.ParseSubComponent(SubComponents.Effect, data));
     }
 
@@ -33,19 +32,13 @@ public class FoodComponentComponent(DataTypes dataTypes, ItemPalette itemPalette
     {
         var data = new List<byte>();
         data.AddRange(DataTypes.GetVarInt(Nutrition));
-        data.AddRange(DataTypes.GetBool(Saturation));
+        data.AddRange(DataTypes.GetFloat(Saturation));
         data.AddRange(DataTypes.GetBool(CanAlwaysEat));
         data.AddRange(DataTypes.GetFloat(SecondsToEat));
-        data.AddRange(DataTypes.GetFloat(NumberOfEffects));
+        data.AddRange(DataTypes.GetVarInt(Effects.Count));
 
-        if (NumberOfEffects > 0)
-        {
-            if(Effects.Count != NumberOfEffects)
-                throw new ArgumentNullException($"Can not serialize FoodComponent1206 due to NumberOfEffcets being different from the count of elements in the Effects list!");
-            
-            foreach(var effect in Effects)
-                data.AddRange(effect.Serialize());
-        }
+        foreach(var effect in Effects)
+            data.AddRange(effect.Serialize());
         
         return new Queue<byte>(data);
     }