diff --git a/Admin/Installer.php b/Admin/Installer.php
index 3488cb1..548ae40 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -137,7 +137,7 @@ final class Installer extends InstallerAbstract
 
         $query = new Builder($con);
         $query->prefix($con->getPrefix())
-            ->insert('currency_id', 'currency_name', 'currency_char', 'currency_number', 'currency_symbol', 'currency_subunits', 'currency_decimals', 'currency_countries')
+            ->insert('currency_id', 'currency_name', 'currency_code', 'currency_number', 'currency_symbol', 'currency_subunits', 'currency_decimal', 'currency_countries')
             ->into('currency');
 
         $querySqlite = new Builder($sqlite);
@@ -147,11 +147,11 @@ final class Installer extends InstallerAbstract
             $query->values(
                 $currency['currency_id'],
                 $currency['currency_name'],
-                $currency['currency_char'],
+                $currency['currency_code'],
                 $currency['currency_number'],
                 $currency['currency_symbol'],
                 $currency['currency_subunits'],
-                $currency['currency_decimals'],
+                $currency['currency_decimal'],
                 $currency['currency_countries']
             );
         }
diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index 4809a81..25bdd58 100644
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -53,7 +53,7 @@ final class AccountMapper extends DataMapperAbstract
     /**
      * Has one relation.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array{mapper:string, self:string, by?:string}>
      * @since 1.0.0
      */
     protected static array $ownsOne = [
@@ -66,15 +66,15 @@ final class AccountMapper 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 = [
         'groups' => [
-            'mapper' => GroupMapper::class,
-            'table'  => 'account_group',
+            'mapper'   => GroupMapper::class,
+            'table'    => 'account_group',
             'external' => 'account_group_account',
-            'self'   => 'account_group_group',
+            'self'     => 'account_group_group',
         ],
     ];
 
diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php
index 9f83f85..ada0bd7 100644
--- a/Models/AccountPermissionMapper.php
+++ b/Models/AccountPermissionMapper.php
@@ -29,7 +29,7 @@ final class AccountPermissionMapper 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/AddressMapper.php b/Models/AddressMapper.php
index f7b1993..4ac0575 100644
--- a/Models/AddressMapper.php
+++ b/Models/AddressMapper.php
@@ -30,7 +30,7 @@ final class AddressMapper 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 = [
@@ -50,13 +50,13 @@ final class AddressMapper extends DataMapperAbstract
      *  If a column is defined only that column value should get populated in the model and not the full model!
      *  OwnsOne, HasOne, use single value instead of full model defined in the mapper.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array{mapper:string, self:string, by?:string}>
      * @since 1.0.0
      */
     protected static array $ownsOne = [
         'country' => [
             'mapper' => CountryMapper::class,
-            'column' => '',
+            //'column' => '',
             'self'   => 'address_country',
         ],
     ];
diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php
index ba64323..2a08858 100644
--- a/Models/GroupMapper.php
+++ b/Models/GroupMapper.php
@@ -29,7 +29,7 @@ final class GroupMapper 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 = [
@@ -68,7 +68,7 @@ final class GroupMapper 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/Models/GroupPermissionMapper.php b/Models/GroupPermissionMapper.php
index e63017a..dd4b0aa 100644
--- a/Models/GroupPermissionMapper.php
+++ b/Models/GroupPermissionMapper.php
@@ -29,7 +29,7 @@ final class GroupPermissionMapper 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/LocalizationMapper.php b/Models/LocalizationMapper.php
index 6c70f26..24013c0 100644
--- a/Models/LocalizationMapper.php
+++ b/Models/LocalizationMapper.php
@@ -34,7 +34,7 @@ final class LocalizationMapper extends DataMapperAbstract
     /**
      * Columns.
      *
-     * @var array<string, array<string, bool|string|array>>
+     * @var array<string, array{name:string, type:string, internal:string, autocomplete?:bool, annotations?:array}>
      * @since 1.0.0
      */
     protected static array $columns = [
@@ -48,7 +48,7 @@ final class LocalizationMapper extends DataMapperAbstract
     /**
      * Has one relation.
      *
-     * @var array<string, array<string, string>>
+     * @var array<string, array{mapper:string, self:string, by?:string}>
      * @since 1.0.0
      */
     protected static array $ownsOne = [
diff --git a/Models/ModuleMapper.php b/Models/ModuleMapper.php
index 6184561..86660e1 100644
--- a/Models/ModuleMapper.php
+++ b/Models/ModuleMapper.php
@@ -29,7 +29,7 @@ final class ModuleMapper 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 = [