diff --git a/.github/user_feature_request.md b/.github/user_feature_request.md
index 6eb8ddc..c9595e8 100755
--- a/.github/user_feature_request.md
+++ b/.github/user_feature_request.md
@@ -8,11 +8,14 @@ assignees: ''
 ---
 
 # What is the feature you request
+
 * A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 * A clear and concise description of what you want to happen.
 
 # Alternatives
+
 A clear and concise description of any alternative solutions or features you've considered.
 
 # Additional Information
+
 Add any other context or screenshots about the feature request here.
diff --git a/Models/AccountCredentialMapper.php b/Models/AccountCredentialMapper.php
index 7d6db26..f742ef3 100755
--- a/Models/AccountCredentialMapper.php
+++ b/Models/AccountCredentialMapper.php
@@ -51,7 +51,7 @@ final class AccountCredentialMapper extends AccountMapper
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = Account::class;
diff --git a/Models/AccountExternalMapper.php b/Models/AccountExternalMapper.php
index 6d01474..b46be55 100755
--- a/Models/AccountExternalMapper.php
+++ b/Models/AccountExternalMapper.php
@@ -26,8 +26,11 @@ use phpOMS\DataStorage\Database\Query\Builder;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of AccoutExternal
+ * @extends DataMapperFactory<T>
  */
-class AccountMapper extends DataMapperFactory
+class AccountExternalMapper extends DataMapperFactory
 {
     /**
      * Columns.
@@ -49,7 +52,7 @@ class AccountMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = AccountExternal::class;
diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index 770d5a6..5707d4c 100755
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -26,6 +26,9 @@ use phpOMS\DataStorage\Database\Query\Builder;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Account
+ * @extends DataMapperFactory<T>
  */
 class AccountMapper extends DataMapperFactory
 {
@@ -99,7 +102,7 @@ class AccountMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = Account::class;
diff --git a/Models/AccountPermissionMapper.php b/Models/AccountPermissionMapper.php
index 9250dda..82c852d 100755
--- a/Models/AccountPermissionMapper.php
+++ b/Models/AccountPermissionMapper.php
@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of AccountPermission
+ * @extends DataMapperFactory<T>
  */
 final class AccountPermissionMapper extends DataMapperFactory
 {
@@ -52,7 +55,7 @@ final class AccountPermissionMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = AccountPermission::class;
diff --git a/Models/AddressMapper.php b/Models/AddressMapper.php
index bc5e360..f9d0205 100755
--- a/Models/AddressMapper.php
+++ b/Models/AddressMapper.php
@@ -24,6 +24,9 @@ use phpOMS\Localization\Defaults\CountryMapper;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Address
+ * @extends DataMapperFactory<T>
  */
 final class AddressMapper extends DataMapperFactory
 {
diff --git a/Models/ApiKeyMapper.php b/Models/ApiKeyMapper.php
index d13e042..7b366e2 100755
--- a/Models/ApiKeyMapper.php
+++ b/Models/ApiKeyMapper.php
@@ -26,6 +26,9 @@ use phpOMS\DataStorage\Database\Query\Builder;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of ApiKey
+ * @extends DataMapperFactory<T>
  */
 class ApiKeyMapper extends DataMapperFactory
 {
@@ -46,7 +49,7 @@ class ApiKeyMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = ApiKey::class;
diff --git a/Models/AppMapper.php b/Models/AppMapper.php
index 21fa0cc..acf7f82 100755
--- a/Models/AppMapper.php
+++ b/Models/AppMapper.php
@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of App
+ * @extends DataMapperFactory<T>
  */
 final class AppMapper extends DataMapperFactory
 {
@@ -44,7 +47,7 @@ final class AppMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = App::class;
diff --git a/Models/ContactMapper.php b/Models/ContactMapper.php
index fd52454..9bb66d5 100755
--- a/Models/ContactMapper.php
+++ b/Models/ContactMapper.php
@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Contact
+ * @extends DataMapperFactory<T>
  */
 final class ContactMapper extends DataMapperFactory
 {
diff --git a/Models/DataChangeMapper.php b/Models/DataChangeMapper.php
index 8a99393..56120af 100755
--- a/Models/DataChangeMapper.php
+++ b/Models/DataChangeMapper.php
@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of DataChange
+ * @extends DataMapperFactory<T>
  */
 final class DataChangeMapper extends DataMapperFactory
 {
@@ -44,7 +47,7 @@ final class DataChangeMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = DataChange::class;
diff --git a/Models/GroupMapper.php b/Models/GroupMapper.php
index 0cc025f..aec59ab 100755
--- a/Models/GroupMapper.php
+++ b/Models/GroupMapper.php
@@ -24,6 +24,9 @@ use phpOMS\DataStorage\Database\Query\Builder;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Group
+ * @extends DataMapperFactory<T>
  */
 final class GroupMapper extends DataMapperFactory
 {
@@ -45,7 +48,7 @@ final class GroupMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = Group::class;
diff --git a/Models/GroupPermissionMapper.php b/Models/GroupPermissionMapper.php
index 3dc5f17..8d2ffc1 100755
--- a/Models/GroupPermissionMapper.php
+++ b/Models/GroupPermissionMapper.php
@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of GroupPermission
+ * @extends DataMapperFactory<T>
  */
 final class GroupPermissionMapper extends DataMapperFactory
 {
@@ -52,7 +55,7 @@ final class GroupPermissionMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = GroupPermission::class;
diff --git a/Models/LocalizationMapper.php b/Models/LocalizationMapper.php
index fb53175..87784f4 100755
--- a/Models/LocalizationMapper.php
+++ b/Models/LocalizationMapper.php
@@ -27,6 +27,9 @@ use phpOMS\Localization\Localization;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Localization
+ * @extends DataMapperFactory<T>
  */
 final class LocalizationMapper extends DataMapperFactory
 {
@@ -135,7 +138,7 @@ final class LocalizationMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = Localization::class;
diff --git a/Models/ModuleMapper.php b/Models/ModuleMapper.php
index fcf1fdd..eac5bbb 100755
--- a/Models/ModuleMapper.php
+++ b/Models/ModuleMapper.php
@@ -23,6 +23,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Module
+ * @extends DataMapperFactory<T>
  */
 final class ModuleMapper extends DataMapperFactory
 {
diff --git a/Models/PermissionAbstractMapper.php b/Models/PermissionAbstractMapper.php
index f0cc575..e637d00 100755
--- a/Models/PermissionAbstractMapper.php
+++ b/Models/PermissionAbstractMapper.php
@@ -24,6 +24,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of PermissionAbstract
+ * @extends DataMapperFactory<T>
  */
 final class PermissionAbstractMapper extends DataMapperFactory
 {