diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java
index 3a3b76f..7a777e3 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/command/parsing/CommandParser.java
@@ -7,12 +7,12 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.Request;
  * Parser to convert the PrimitiveRequest to a Request and performing checks for required fields and
  * data types
  */
-public interface CommandParser {
+public interface CommandParser<T extends Request> {
     /**
      * Parses the provided PrimitiveRequest into a command-specific request
      *
      * @param primitiveRequest
      * @return
      */
-    Request parse(PrimitiveRequest primitiveRequest);
+    T parse(PrimitiveRequest primitiveRequest);
 }