diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/ErrorResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/ErrorResponse.java
index 1136e11..b676613 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/ErrorResponse.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/ErrorResponse.java
@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
 /** Response representing an error outcome for a client's request. */
 public class ErrorResponse extends Response {
@@ -13,11 +13,9 @@ public class ErrorResponse extends Response {
      * @param errorCode a short error code identifying the failure
      * @param errorMessage a human readable error message
      */
-    public ErrorResponse(
-            SessionId sessionId, int requestId, String errorCode, String errorMessage) {
+    public ErrorResponse(RequestContext context, String errorCode, String errorMessage) {
         super(
-                sessionId,
-                requestId,
+                context,
                 ResponseBody.builder().param("CODE", errorCode).param("MSG", errorMessage).build());
     }
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java
index f0d7cd6..28e08a6 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/OkResponse.java
@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
 /**
  * A simple success response with an empty body.
@@ -15,7 +15,7 @@ public class OkResponse extends SuccessResponse {
      * @param sessionId the target session id
      * @param requestId the originating request id
      */
-    public OkResponse(SessionId sessionId, int requestId) {
-        super(sessionId, requestId, ResponseBody.builder().build());
+    public OkResponse(RequestContext context) {
+        super(context, ResponseBody.builder().build());
     }
 }
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java
index d0918fb..36b3cdb 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/Response.java
@@ -1,5 +1,6 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
@@ -16,9 +17,9 @@ public abstract class Response {
      * @param requestId the request identifier this response corresponds to
      * @param body the structured response body
      */
-    protected Response(SessionId sessionId, int requestId, ResponseBody body) {
-        this.sessionId = sessionId;
-        this.requestId = requestId;
+    protected Response(RequestContext context, ResponseBody body) {
+        this.sessionId = context.sessionId();
+        this.requestId = context.requestId();
         this.body = body;
     }
 
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
index 3df95b9..9f1bb91 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/protocol/response/SuccessResponse.java
@@ -1,7 +1,7 @@
 package ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response;
 
+import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.request.RequestContext;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.builder.ResponseBody;
-import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionId;
 
 /**
  * Abstract {@link Response} specialization indicating a successful outcome.
@@ -17,8 +17,8 @@ public abstract class SuccessResponse extends Response {
      * @param requestId the originating request id
      * @param body the response body
      */
-    protected SuccessResponse(SessionId sessionId, int requestId, ResponseBody body) {
-        super(sessionId, requestId, body);
+    protected SuccessResponse(RequestContext context, ResponseBody body) {
+        super(context, body);
     }
 
     /**