diff --git a/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java b/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java
index 76d90dc..1c11c66 100644
--- a/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java
+++ b/src/de/steamwar/network/packets/client/InventoryCallbackPacket.java
@@ -21,20 +21,24 @@ package de.steamwar.network.packets.client;
 
 import de.steamwar.network.packets.server.ServerNetworkHandler;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
 
+@Builder
 @Data
 @AllArgsConstructor
 public class InventoryCallbackPacket extends ClientPacket {
     private static final long serialVersionUID = -261823209186008718L;
     @NonNull
+    @Builder.Default
     private int position = -1;
     @NonNull
     private int owner;
     @NonNull
     private CallbackType type;
     @NonNull
+    @Builder.Default
     private ClickType clickType = ClickType.UNKNOWN;
 
     @Override
diff --git a/src/de/steamwar/network/packets/common/FightEndsPacket.java b/src/de/steamwar/network/packets/common/FightEndsPacket.java
index f046538..b89476e 100644
--- a/src/de/steamwar/network/packets/common/FightEndsPacket.java
+++ b/src/de/steamwar/network/packets/common/FightEndsPacket.java
@@ -20,11 +20,13 @@
 package de.steamwar.network.packets.common;
 
 import de.steamwar.network.packets.NetworkHandler;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
 
 import java.util.List;
 
+@Builder
 @Data
 public class FightEndsPacket extends CommonPacket {
 
diff --git a/src/de/steamwar/network/packets/common/FightInfoPacket.java b/src/de/steamwar/network/packets/common/FightInfoPacket.java
index 5295d25..ff2a8f7 100644
--- a/src/de/steamwar/network/packets/common/FightInfoPacket.java
+++ b/src/de/steamwar/network/packets/common/FightInfoPacket.java
@@ -20,11 +20,13 @@
 package de.steamwar.network.packets.common;
 
 import de.steamwar.network.packets.NetworkHandler;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
 
 import java.util.List;
 
+@Builder
 @Data
 public class FightInfoPacket extends CommonPacket{
 
diff --git a/src/de/steamwar/network/packets/server/StartingServerPacket.java b/src/de/steamwar/network/packets/server/StartingServerPacket.java
index bc0cb66..3dadceb 100644
--- a/src/de/steamwar/network/packets/server/StartingServerPacket.java
+++ b/src/de/steamwar/network/packets/server/StartingServerPacket.java
@@ -26,7 +26,7 @@ import lombok.NonNull;
 @Data
 public class StartingServerPacket extends ServerPacket {
     private static final long serialVersionUID = 2808607245898121801L;
-    @NonNull
+
     private int user;
 
     @Override