diff --git a/http-server/Constrict/Request.php b/http-server/Constrict/Request.php
index e49ccd9a..2d9397c0 100644
--- a/http-server/Constrict/Request.php
+++ b/http-server/Constrict/Request.php
@@ -3,7 +3,7 @@
 namespace Server\Constrict;
 
 use Http\Context\Context;
-use Http\Context\Request as HttpResponse;
+use Server\Message\Request as Psr7Request;
 use Http\Context\Response;
 use Kiri\Kiri;
 use ReflectionException;
@@ -11,7 +11,7 @@ use Server\RequestInterface;
 
 
 /**
- * @mixin HttpResponse
+ * @mixin Psr7Request
  */
 class Request implements RequestInterface
 {
@@ -24,10 +24,10 @@ class Request implements RequestInterface
 	 */
 	public function __call($name, $args)
 	{
-		if (!Context::hasContext(HttpResponse::class)) {
-			$request = Context::setContext(HttpResponse::class, new HttpResponse());
+		if (!Context::hasContext(Psr7Request::class)) {
+			$request = Context::setContext(Psr7Request::class, new Psr7Request());
 		} else {
-			$request = Context::getContext(HttpResponse::class);
+			$request = Context::getContext(Psr7Request::class);
 		}
 		if (property_exists($request, $name)) {
 			return $request->{$name};
@@ -43,7 +43,7 @@ class Request implements RequestInterface
 	public function __get($name): mixed
 	{
 		// TODO: Change the autogenerated stub
-		return Context::getContext(HttpResponse::class)->{$name};
+		return Context::getContext(Psr7Request::class)->{$name};
 	}
 
 
@@ -56,17 +56,7 @@ class Request implements RequestInterface
 	{
 		Context::setContext(Response::class, new Response());
 
-		$sRequest = new HttpResponse();
-		$sRequest->setHeaders(array_merge($request->header, $request->server));
-
-		$sRequest->setUri($sRequest->getRequestUri());
-		$sRequest->setClientId($request->fd);
-
-		$sRequest->setParseBody($request);
-		$sRequest->setFiles($request->files ?? []);
-		$sRequest->setGets($request->get ?? []);
-
-		Context::setContext(HttpResponse::class, $sRequest);
+		Context::setContext(Psr7Request::class, Psr7Request::parseRequest($request));
 
 		return Kiri::getDi()->get(Request::class);
 	}