diff --git a/HttpServer/Http/HttpHeaders.php b/HttpServer/Http/HttpHeaders.php
index 5e24d945..7d0ecda9 100644
--- a/HttpServer/Http/HttpHeaders.php
+++ b/HttpServer/Http/HttpHeaders.php
@@ -13,7 +13,7 @@ namespace HttpServer\Http;
  * Class HttpHeaders
  * @package Snowflake\Snowflake\Http
  */
-class HttpHeaders
+trait HttpHeaders
 {
 
 	private array $_headers = [];
@@ -46,17 +46,6 @@ class HttpHeaders
 	}
 
 
-	/**
-	 * @param $name
-	 * @param null $default
-	 * @return mixed
-	 */
-	public function get($name, $default = null): mixed
-	{
-		return $this->_headers[$name] ?? $default;
-	}
-
-
 	/**
 	 * @return string
 	 */
diff --git a/HttpServer/Http/HttpParams.php b/HttpServer/Http/HttpParams.php
index 4f319ab0..b03d3886 100644
--- a/HttpServer/Http/HttpParams.php
+++ b/HttpServer/Http/HttpParams.php
@@ -21,7 +21,7 @@ use Snowflake\Snowflake;
  * Class HttpParams
  * @package Snowflake\Snowflake\Http
  */
-class HttpParams
+trait HttpParams
 {
 
     /** @var array|null */
@@ -109,7 +109,7 @@ class HttpParams
      */
     private function page(): int
     {
-        return (int)$this->get('page', 1);
+        return (int)$this->query('page', 1);
     }
 
 
@@ -129,19 +129,10 @@ class HttpParams
      */
     public function size(): int
     {
-        return (int)$this->get('size', 20);
+        return (int)$this->query('size', 20);
     }
 
 
-    /**
-     * @param $name
-     * @param null $defaultValue
-     * @return mixed
-     */
-    public function get($name, $defaultValue = null): mixed
-    {
-        return $this->_gets[$name] ?? $defaultValue;
-    }
 
     /**
      * @param $name
diff --git a/HttpServer/Http/Request.php b/HttpServer/Http/Request.php
index 58ea8bae..c83840d2 100644
--- a/HttpServer/Http/Request.php
+++ b/HttpServer/Http/Request.php
@@ -33,14 +33,12 @@ defined('REQUEST_FAIL') or define('REQUEST_FAIL', 500);
 class Request extends HttpService implements RequestInterface
 {
 
+
+    use HttpHeaders, HttpParams;
+
 	public int $fd = 0;
 
 
-	/**
-	 * @var HttpParams|null
-	 */
-	#[Inject(HttpParams::class)]
-	public ?HttpParams $params = null;
 
 
 	/**
diff --git a/Server/Constrict/Request.php b/Server/Constrict/Request.php
index a3ea7c1d..9ae5e65c 100644
--- a/Server/Constrict/Request.php
+++ b/Server/Constrict/Request.php
@@ -59,17 +59,15 @@ class Request implements RequestInterface
 
         $sRequest = new HttpResponse();
 
-        $sRequest->headers = new HttpHeaders();
-        $sRequest->headers->setHeaders(array_merge($request->header, $request->server));
+        $sRequest->setHeaders(array_merge($request->header, $request->server));
 
-        $sRequest->setUri($sRequest->headers->getRequestUri());
+        $sRequest->setUri($sRequest->getRequestUri());
         $sRequest->setClientId($request->fd);
 
-        $sRequest->params = new HttpParams();
-        $sRequest->params->setRawContent($request->rawContent(), $sRequest->headers->getContentType());
-        $sRequest->params->setFiles($request->files);
-        $sRequest->params->setPosts($request->post);
-        $sRequest->params->setGets($request->get);
+        $sRequest->setRawContent($request->rawContent(), $sRequest->getContentType());
+        $sRequest->setFiles($request->files);
+        $sRequest->setPosts($request->post);
+        $sRequest->setGets($request->get);
 
         Context::setContext(HttpResponse::class, $sRequest);