diff --git a/app/pom.xml b/app/pom.xml
index 460e517..26fc120 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -19,5 +19,15 @@
 
 	<build>
 
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>16</source>
+					<target>16</target>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/org/toop/events/WindowEvents.java b/app/src/main/java/org/toop/events/WindowEvents.java
index dfefd4a..622c137 100644
--- a/app/src/main/java/org/toop/events/WindowEvents.java
+++ b/app/src/main/java/org/toop/events/WindowEvents.java
@@ -1,24 +1,25 @@
 package org.toop.events;
 
+import org.toop.framework.eventbus.events.EventWithoutUuid;
 import org.toop.framework.eventbus.events.Events;
 
 public class WindowEvents extends Events {
 
     /** Triggers when a cell is clicked in one of the game boards. */
-    public record CellClicked(int cell) {}
+    public record CellClicked(int cell) implements EventWithoutUuid {}
 
     /** Triggers when the window wants to quit. */
-    public record OnQuitRequested() implements IEvent {}
+    public record OnQuitRequested() implements EventWithoutUuid {}
 
     /** Triggers when the window is resized. */
-//        public record OnResize(Window.Size size) {}
+//        public record OnResize(Window.Size size) implements EventWithoutUuid {}
 
     /** Triggers when the mouse is moved within the window. */
-    public record OnMouseMove(int x, int y) implements IEvent {}
+    public record OnMouseMove(int x, int y) implements EventWithoutUuid {}
 
     /** Triggers when the mouse is clicked within the window. */
-    public record OnMouseClick(int button) {}
+    public record OnMouseClick(int button) implements EventWithoutUuid {}
 
     /** Triggers when the mouse is released within the window. */
-    public record OnMouseRelease(int button) {}
+    public record OnMouseRelease(int button) implements EventWithoutUuid {}
 }
\ No newline at end of file
diff --git a/framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java b/framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java
index 5aaeece..f291e3d 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/events/NetworkEvents.java
@@ -143,7 +143,7 @@ public class NetworkEvents extends Events {
      *
      * @param connectionId The identifier of the connection being reconnected.
      */
-    public record Reconnect(Object connectionId) {}
+    public record Reconnect(Object connectionId) implements EventWithoutUuid {}
 
 
     /**
@@ -161,7 +161,7 @@ public class NetworkEvents extends Events {
      * @param ip The new IP address.
      * @param port The new port.
      */
-    public record ChangeClient(Object connectionId, String ip, int port) {}
+    public record ChangeClient(Object connectionId, String ip, int port) implements EventWithoutUuid {}
 
 
     /**
@@ -169,9 +169,9 @@ public class NetworkEvents extends Events {
      *
      * @param connectionId The identifier of the connection that failed.
      */
-    public record CouldNotConnect(Object connectionId) {}
+    public record CouldNotConnect(Object connectionId) implements EventWithoutUuid {}
 
     /** WIP Triggers when a connection closes. */
-    public record ClosedConnection() {}
+    public record ClosedConnection() implements EventWithoutUuid {}
 
 }