diff --git a/HasCount.php b/HasCount.php
index aaf0a78..eb58b46 100644
--- a/HasCount.php
+++ b/HasCount.php
@@ -4,8 +4,8 @@ declare(strict_types=1);
 namespace Database;
 
 use Database\Traits\HasBase;
-use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasCount
@@ -20,8 +20,7 @@ class HasCount extends HasBase
      */
     public function get(): array|ModelInterface|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->get($this->name);
+        return Context::get(Relation::class)->get($this->name);
     }
 
 }
diff --git a/HasMany.php b/HasMany.php
index cf120d7..9c15b6f 100644
--- a/HasMany.php
+++ b/HasMany.php
@@ -12,6 +12,7 @@ namespace Database;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasMany
@@ -28,7 +29,6 @@ class HasMany extends HasBase
      */
     public function get(): array|Collection|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->get($this->name);
+        return Context::get(Relation::class)->get($this->name);
     }
 }
diff --git a/HasOne.php b/HasOne.php
index 2c077b6..2138e88 100644
--- a/HasOne.php
+++ b/HasOne.php
@@ -12,6 +12,7 @@ namespace Database;
 use Database\Traits\HasBase;
 use Exception;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasOne
@@ -27,7 +28,6 @@ class HasOne extends HasBase
      */
     public function get(): array|ModelInterface|null
     {
-        $relation = Kiri::getDi()->get(Relation::class);
-        return $relation->first($this->name);
+        return Context::get(Relation::class)->first($this->name);
     }
 }
diff --git a/Traits/HasBase.php b/Traits/HasBase.php
index 337ce39..21c6683 100644
--- a/Traits/HasBase.php
+++ b/Traits/HasBase.php
@@ -13,6 +13,7 @@ use Database\ModelInterface;
 use Database\Collection;
 use Database\Relation;
 use Kiri;
+use Kiri\Di\Context;
 
 /**
  * Class HasBase
@@ -57,10 +58,9 @@ abstract class HasBase implements \Database\Traits\Relation
     public function __call(string $name, array $arguments)
     {
         if ($name !== 'get') {
-            $relation = Kiri::getDi()->get(Relation::class);
-            $query    = $relation->getQuery($this->name);
+            $query    = Context::get(Relation::class)->getQuery($this->name);
             if (is_null($query)) {
-                throw new \Exception('Unknown relation method: ' . $name);
+                throw new \Exception('Unknown relation key: ' . $this->name);
             }
             $query->$name(...$arguments);
             return $this;