diff --git a/DataStorage/Database/DataMapperAbstract.php b/DataStorage/Database/DataMapperAbstract.php
index 49e221091..a4ac14e1f 100644
--- a/DataStorage/Database/DataMapperAbstract.php
+++ b/DataStorage/Database/DataMapperAbstract.php
@@ -168,7 +168,7 @@ class DataMapperAbstract implements DataMapperInterface
     /**
      * Columns.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, annotations?:array}>
      * @since 1.0.0
      */
     protected static array $columns = [];
@@ -196,7 +196,7 @@ class DataMapperAbstract implements DataMapperInterface
      *
      * Relation is defined in current mapper
      *
-     * @var array<string, array>
+     * @var array<string, array{mapper:string, self:string, by?:string}>
      * @since 1.0.0
      */
     protected static array $ownsOne = [];
@@ -204,7 +204,7 @@ class DataMapperAbstract implements DataMapperInterface
     /**
      * Belongs to.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array{mapper:string, self:string}>
      * @since 1.0.0
      */
     protected static array $belongsTo = [];
diff --git a/Localization/Defaults/CityMapper.php b/Localization/Defaults/CityMapper.php
index 701aaa715..4a4028f6b 100644
--- a/Localization/Defaults/CityMapper.php
+++ b/Localization/Defaults/CityMapper.php
@@ -29,7 +29,7 @@ class CityMapper 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/Localization/Defaults/CountryMapper.php b/Localization/Defaults/CountryMapper.php
index 4a8a50ea5..3987018f3 100644
--- a/Localization/Defaults/CountryMapper.php
+++ b/Localization/Defaults/CountryMapper.php
@@ -29,7 +29,7 @@ class CountryMapper 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/Localization/Defaults/CurrencyMapper.php b/Localization/Defaults/CurrencyMapper.php
index 51a75b404..f577000a3 100644
--- a/Localization/Defaults/CurrencyMapper.php
+++ b/Localization/Defaults/CurrencyMapper.php
@@ -29,7 +29,7 @@ final class CurrencyMapper 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/Localization/Defaults/IbanMapper.php b/Localization/Defaults/IbanMapper.php
index 1ea640728..064860bc9 100644
--- a/Localization/Defaults/IbanMapper.php
+++ b/Localization/Defaults/IbanMapper.php
@@ -29,7 +29,7 @@ class IbanMapper 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/Localization/Defaults/LanguageMapper.php b/Localization/Defaults/LanguageMapper.php
index c01ce54df..adcbef95f 100644
--- a/Localization/Defaults/LanguageMapper.php
+++ b/Localization/Defaults/LanguageMapper.php
@@ -29,7 +29,7 @@ class LanguageMapper 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/tests/DataStorage/Database/TestModel/BaseModelMapper.php b/tests/DataStorage/Database/TestModel/BaseModelMapper.php
index d29f10aa4..1b3d6c9d6 100644
--- a/tests/DataStorage/Database/TestModel/BaseModelMapper.php
+++ b/tests/DataStorage/Database/TestModel/BaseModelMapper.php
@@ -20,7 +20,7 @@ class BaseModelMapper 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 = [
@@ -41,7 +41,7 @@ class BaseModelMapper 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 = [
@@ -61,7 +61,7 @@ class BaseModelMapper 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 = [
diff --git a/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php b/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php
index c5f5da0a8..9a2deba3c 100644
--- a/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php
+++ b/tests/DataStorage/Database/TestModel/BelongsToModelMapper.php
@@ -20,7 +20,7 @@ class BelongsToModelMapper 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/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php b/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php
index 071a08990..8e88a55f4 100644
--- a/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php
+++ b/tests/DataStorage/Database/TestModel/ManyToManyDirectModelMapper.php
@@ -20,7 +20,7 @@ class ManyToManyDirectModelMapper 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/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php b/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php
index cecb0db50..b214a407e 100644
--- a/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php
+++ b/tests/DataStorage/Database/TestModel/ManyToManyRelModelMapper.php
@@ -20,7 +20,7 @@ class ManyToManyRelModelMapper 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/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php b/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php
index 49abe8bce..f69203167 100644
--- a/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php
+++ b/tests/DataStorage/Database/TestModel/OwnsOneModelMapper.php
@@ -20,7 +20,7 @@ class OwnsOneModelMapper 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 = [