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/AccountRelationMapper.php b/Models/AccountRelationMapper.php
index eb567a6..da3a7d4 100755
--- a/Models/AccountRelationMapper.php
+++ b/Models/AccountRelationMapper.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 AccountRelation
+ * @extends DataMapperFactory<T>
  */
 final class AccountRelationMapper extends DataMapperFactory
 {
diff --git a/Models/GroupRelationMapper.php b/Models/GroupRelationMapper.php
index 1922b96..b9b48a7 100755
--- a/Models/GroupRelationMapper.php
+++ b/Models/GroupRelationMapper.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 GroupRelation
+ * @extends DataMapperFactory<T>
  */
 final class GroupRelationMapper extends DataMapperFactory
 {
diff --git a/Models/TaskAttributeMapper.php b/Models/TaskAttributeMapper.php
index 095df4d..f54274b 100755
--- a/Models/TaskAttributeMapper.php
+++ b/Models/TaskAttributeMapper.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 TaskAttribute
+ * @extends DataMapperFactory<T>
  */
 final class TaskAttributeMapper extends DataMapperFactory
 {
diff --git a/Models/TaskAttributeTypeL11nMapper.php b/Models/TaskAttributeTypeL11nMapper.php
index 79d1e42..c19644b 100755
--- a/Models/TaskAttributeTypeL11nMapper.php
+++ b/Models/TaskAttributeTypeL11nMapper.php
@@ -24,6 +24,9 @@ use phpOMS\Localization\BaseStringL11n;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of BaseStringL11n
+ * @extends DataMapperFactory<T>
  */
 final class TaskAttributeTypeL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class TaskAttributeTypeL11nMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = BaseStringL11n::class;
diff --git a/Models/TaskAttributeTypeMapper.php b/Models/TaskAttributeTypeMapper.php
index 60d0601..eddf744 100755
--- a/Models/TaskAttributeTypeMapper.php
+++ b/Models/TaskAttributeTypeMapper.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 TaskAttributeType
+ * @extends DataMapperFactory<T>
  */
 final class TaskAttributeTypeMapper extends DataMapperFactory
 {
diff --git a/Models/TaskAttributeValueL11nMapper.php b/Models/TaskAttributeValueL11nMapper.php
index ff0e4b0..2f8544b 100755
--- a/Models/TaskAttributeValueL11nMapper.php
+++ b/Models/TaskAttributeValueL11nMapper.php
@@ -24,6 +24,9 @@ use phpOMS\Localization\BaseStringL11n;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of BaseStringL11n
+ * @extends DataMapperFactory<T>
  */
 final class TaskAttributeValueL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class TaskAttributeValueL11nMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = BaseStringL11n::class;
diff --git a/Models/TaskAttributeValueMapper.php b/Models/TaskAttributeValueMapper.php
index 4c4acf1..e9547d0 100755
--- a/Models/TaskAttributeValueMapper.php
+++ b/Models/TaskAttributeValueMapper.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 TaskAttributeValue
+ * @extends DataMapperFactory<T>
  */
 final class TaskAttributeValueMapper extends DataMapperFactory
 {
diff --git a/Models/TaskElementMapper.php b/Models/TaskElementMapper.php
index 63d4657..1ae8306 100755
--- a/Models/TaskElementMapper.php
+++ b/Models/TaskElementMapper.php
@@ -25,6 +25,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of TaskElement
+ * @extends DataMapperFactory<T>
  */
 final class TaskElementMapper extends DataMapperFactory
 {
diff --git a/Models/TaskMapper.php b/Models/TaskMapper.php
index 5fb61d2..cd57ea4 100755
--- a/Models/TaskMapper.php
+++ b/Models/TaskMapper.php
@@ -30,6 +30,9 @@ use phpOMS\DataStorage\Database\Query\Where;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Task
+ * @extends DataMapperFactory<T>
  */
 final class TaskMapper extends DataMapperFactory
 {
diff --git a/Models/TaskSeenMapper.php b/Models/TaskSeenMapper.php
index d467fad..774c6e7 100755
--- a/Models/TaskSeenMapper.php
+++ b/Models/TaskSeenMapper.php
@@ -27,6 +27,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of TaskSeen
+ * @extends DataMapperFactory<T>
  */
 final class TaskSeenMapper extends DataMapperFactory
 {