diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java
index 448cdc2..a8cbbc9 100644
--- a/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java
+++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/events/EventBuilder.java
@@ -41,7 +41,9 @@ public class EventBuilder {
     // Keys used primarily in GameStateEvents
     private Entity[] entities;
     private EntityID[] turnOrder;
+    private IntVector2 mapSize;
     private EntityID activeCharacter;
+    private Integer[] stoneCooldowns;
     private Boolean winCondition;
 
     // Keys used in CustomEvents
@@ -145,11 +147,21 @@ public class EventBuilder {
         return this;
     }
 
+    public EventBuilder withMapSize(IntVector2 mapSize) {
+        this.mapSize = mapSize;
+        return this;
+    }
+
     public EventBuilder withActiveCharacter(EntityID activeCharacter) {
         this.activeCharacter = activeCharacter;
         return this;
     }
 
+    public EventBuilder withStoneCooldowns(Integer[] stoneCooldowns) {
+        this.stoneCooldowns = stoneCooldowns;
+        return this;
+    }
+
     public EventBuilder withWinCondition(Boolean winCondition) {
         this.winCondition = winCondition;
         return this;
diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/events/GameStateEvent.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/events/GameStateEvent.java
index 0eb8301..ed4a302 100644
--- a/src/main/java/uulm/teamname/marvelous/gamelibrary/events/GameStateEvent.java
+++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/events/GameStateEvent.java
@@ -11,9 +11,9 @@ import java.util.Objects;
 public class GameStateEvent extends Event {
     public Entity[] entities;
     public EntityID[] turnOrder;
-    public IntVector2 mapSize; // Stores the map size, for example for a 10x15 map [9,14] (starting from 0)
+    public IntVector2 mapSize;
     public EntityID activeCharacter;
-    public Integer[] stoneCooldowns; // Int[6]
+    public Integer[] stoneCooldowns;
     public Boolean winCondition;
 
     @Override