diff --git a/Models/QAAnswerMapper.php b/Models/QAAnswerMapper.php
index 5ef80d2..fadb57a 100644
--- a/Models/QAAnswerMapper.php
+++ b/Models/QAAnswerMapper.php
@@ -30,7 +30,7 @@ final class QAAnswerMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, bool|string>>
+     * @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, annotations?:array}>
      * @since 1.0.0
      */
     protected static array $columns = [
@@ -70,13 +70,13 @@ final class QAAnswerMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array{mapper:string, self:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [
         'createdBy' => [
             'mapper' => ProfileMapper::class,
-            'dest'   => 'qa_answer_created_by',
+            'self'   => 'qa_answer_created_by',
         ],
     ];
 }
diff --git a/Models/QACategoryMapper.php b/Models/QACategoryMapper.php
index f83d4a3..9e8b4a2 100644
--- a/Models/QACategoryMapper.php
+++ b/Models/QACategoryMapper.php
@@ -29,7 +29,7 @@ final class QACategoryMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, bool|string>>
+     * @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, annotations?:array}>
      * @since 1.0.0
      */
     protected static array $columns = [
diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php
index dc09204..68d192e 100644
--- a/Models/QAQuestionMapper.php
+++ b/Models/QAQuestionMapper.php
@@ -30,7 +30,7 @@ final class QAQuestionMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, bool|string>>
+     * @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, annotations?:array}>
      * @since 1.0.0
      */
     protected static array $columns = [
@@ -47,7 +47,7 @@ final class QAQuestionMapper extends DataMapperAbstract
     /**
      * Has many relation.
      *
-     * @var array<string, array<string, null|string>>
+     * @var array<string, array{mapper:string, table:string, self?:?string, external?:?string}>
      * @since 1.0.0
      */
     protected static array $hasMany = [
@@ -75,13 +75,13 @@ final class QAQuestionMapper extends DataMapperAbstract
     /**
      * Belongs to.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array{mapper:string, self:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [
         'createdBy' => [
             'mapper' => ProfileMapper::class,
-            'dest'   => 'qa_question_created_by',
+            'self'   => 'qa_question_created_by',
         ],
     ];