diff --git a/models.py b/models.py
index 85e3808..addf1ad 100644
--- a/models.py
+++ b/models.py
@@ -3,7 +3,6 @@ from __future__ import annotations
 from datetime import datetime
 
 from eloquent import Model  # type: ignore
-from eloquent.orm import belongs_to
 from eloquent.query import QueryBuilder  # type: ignore
 
 from .config import DB
@@ -33,11 +32,11 @@ class Answer (Model):
 
     __timestamps__ = False
 
-    @belongs_to ('query_id')
+    @property
     def query_rel (
             self,
-    ) -> type:
-        return Query
+    ) -> Query:
+        return self.belongs_to (Query, 'query_id')
 
     @property
     def answered_flags (
@@ -92,11 +91,11 @@ class QueryAnswerHistory (Model):
 
     __timestamps__ = False
 
-    @belongs_to ('query_id')
+    @property
     def query_rel (
             self,
-    ) -> type:
-        return Query
+    ) -> Query:
+        return self.belongs_to (Query, 'query_id')
 
     @property
     def answer (