diff --git a/app/Server/Messages/RequestModifiers/ModifyHeaders.php b/app/Server/Messages/RequestModifiers/ModifyHeaders.php
index 09f5f8b..ea05276 100644
--- a/app/Server/Messages/RequestModifiers/ModifyHeaders.php
+++ b/app/Server/Messages/RequestModifiers/ModifyHeaders.php
@@ -5,13 +5,14 @@ namespace App\Server\Messages\RequestModifiers;
 use App\Server\Connections\Connection;
 use App\Server\Connections\ConnectionManager;
 use GuzzleHttp\Psr7\Request;
+use Psr\Http\Message\RequestInterface;
 use function GuzzleHttp\Psr7\modify_request;
 
 class ModifyHeaders implements RequestModifier
 {
-    public function modify(Request $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): Request
+    public function modify(RequestInterface $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): RequestInterface
     {
-        $request = modify_request($request, [
+        return modify_request($request, [
             'set_headers' => [
                 'Host' => $clientConnection->host,
                 'X-Expose-Request-ID' => $requestId,
@@ -19,7 +20,5 @@ class ModifyHeaders implements RequestModifier
                 'X-Original-Host' => "{$clientConnection->subdomain}.{$connectionManager->host()}:{$connectionManager->port()}",
             ]
         ]);
-
-        return $request;
     }
 }
diff --git a/app/Server/Messages/RequestModifiers/RequestModifier.php b/app/Server/Messages/RequestModifiers/RequestModifier.php
index 262f778..541b5dc 100644
--- a/app/Server/Messages/RequestModifiers/RequestModifier.php
+++ b/app/Server/Messages/RequestModifiers/RequestModifier.php
@@ -4,9 +4,9 @@ namespace App\Server\Messages\RequestModifiers;
 
 use App\Server\Connections\Connection;
 use App\Server\Connections\ConnectionManager;
-use GuzzleHttp\Psr7\Request;
+use Psr\Http\Message\RequestInterface;
 
 interface RequestModifier
 {
-    public function modify(Request $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): Request;
+    public function modify(RequestInterface $request, string $requestId, Connection $clientConnection, ConnectionManager $connectionManager): RequestInterface;
 }
diff --git a/app/Server/Messages/TunnelMessage.php b/app/Server/Messages/TunnelMessage.php
index 0a5092f..b8fc88a 100644
--- a/app/Server/Messages/TunnelMessage.php
+++ b/app/Server/Messages/TunnelMessage.php
@@ -6,7 +6,7 @@ use App\Server\Connections\Connection;
 use App\Server\Connections\ConnectionManager;
 use App\Server\Connections\HttpRequestConnection;
 use App\Server\Connections\IoConnection;
-use App\Server\Messages\RequestModifiers\ModifyHostHeader;
+use App\Server\Messages\RequestModifiers\ModifyHeaders;
 use BFunky\HttpParser\HttpRequestParser;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;