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/CategoryMapper.php b/Models/CategoryMapper.php
index 4860503..851df04 100755
--- a/Models/CategoryMapper.php
+++ b/Models/CategoryMapper.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 Category
+ * @extends DataMapperFactory<T>
  */
 final class CategoryMapper extends DataMapperFactory
 {
diff --git a/Models/CauseMapper.php b/Models/CauseMapper.php
index f9c554c..c915bcd 100755
--- a/Models/CauseMapper.php
+++ b/Models/CauseMapper.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 Cause
+ * @extends DataMapperFactory<T>
  */
 final class CauseMapper extends DataMapperFactory
 {
diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php
index 2b4a7e0..ae96938 100755
--- a/Models/DepartmentMapper.php
+++ b/Models/DepartmentMapper.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 Department
+ * @extends DataMapperFactory<T>
  */
 final class DepartmentMapper extends DataMapperFactory
 {
diff --git a/Models/ProcessMapper.php b/Models/ProcessMapper.php
index d4e7d4a..ee4637f 100755
--- a/Models/ProcessMapper.php
+++ b/Models/ProcessMapper.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 Process
+ * @extends DataMapperFactory<T>
  */
 final class ProcessMapper extends DataMapperFactory
 {
diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php
index 6a81e06..223c362 100755
--- a/Models/ProjectMapper.php
+++ b/Models/ProjectMapper.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 Project
+ * @extends DataMapperFactory<T>
  */
 final class ProjectMapper extends DataMapperFactory
 {
diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php
index 1782dbf..51a7ee7 100755
--- a/Models/RiskMapper.php
+++ b/Models/RiskMapper.php
@@ -26,6 +26,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Risk
+ * @extends DataMapperFactory<T>
  */
 final class RiskMapper extends DataMapperFactory
 {
diff --git a/Models/RiskObjectMapper.php b/Models/RiskObjectMapper.php
index b8cef3c..a728b2e 100755
--- a/Models/RiskObjectMapper.php
+++ b/Models/RiskObjectMapper.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 RiskObject
+ * @extends DataMapperFactory<T>
  */
 final class RiskObjectMapper extends DataMapperFactory
 {
diff --git a/Models/SolutionMapper.php b/Models/SolutionMapper.php
index 6d3e75d..3a9a443 100755
--- a/Models/SolutionMapper.php
+++ b/Models/SolutionMapper.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 Solution
+ * @extends DataMapperFactory<T>
  */
 final class SolutionMapper extends DataMapperFactory
 {