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/ProjectAttributeMapper.php b/Models/ProjectAttributeMapper.php
index 71d7fec..f3b27b5 100755
--- a/Models/ProjectAttributeMapper.php
+++ b/Models/ProjectAttributeMapper.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 ProjectAttribute
+ * @extends DataMapperFactory<T>
  */
 final class ProjectAttributeMapper extends DataMapperFactory
 {
diff --git a/Models/ProjectAttributeTypeL11nMapper.php b/Models/ProjectAttributeTypeL11nMapper.php
index 99f0033..9e7e1b1 100755
--- a/Models/ProjectAttributeTypeL11nMapper.php
+++ b/Models/ProjectAttributeTypeL11nMapper.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 ProjectAttributeTypeL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class ProjectAttributeTypeL11nMapper 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/ProjectAttributeTypeMapper.php b/Models/ProjectAttributeTypeMapper.php
index 4a51c68..ce41cc9 100755
--- a/Models/ProjectAttributeTypeMapper.php
+++ b/Models/ProjectAttributeTypeMapper.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 ProjectAttributeType
+ * @extends DataMapperFactory<T>
  */
 final class ProjectAttributeTypeMapper extends DataMapperFactory
 {
diff --git a/Models/ProjectAttributeValueMapper.php b/Models/ProjectAttributeValueMapper.php
index 1d9b151..05da8f8 100755
--- a/Models/ProjectAttributeValueMapper.php
+++ b/Models/ProjectAttributeValueMapper.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 ProjectAttributeValue
+ * @extends DataMapperFactory<T>
  */
 final class ProjectAttributeValueMapper extends DataMapperFactory
 {
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index 3394e94..a62e1ed 100755
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.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 Project
+ * @extends DataMapperFactory<T>
  */
 final class ProjectMapper extends DataMapperFactory
 {