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/ReportMapper.php b/Models/ReportMapper.php
index 115b066..ad49949 100755
--- a/Models/ReportMapper.php
+++ b/Models/ReportMapper.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 Report
+ * @extends DataMapperFactory<T>
  */
 final class ReportMapper extends DataMapperFactory
 {
diff --git a/Models/TemplateMapper.php b/Models/TemplateMapper.php
index 2762059..49ec01c 100755
--- a/Models/TemplateMapper.php
+++ b/Models/TemplateMapper.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 Template
+ * @extends DataMapperFactory<T>
  */
 final class TemplateMapper extends DataMapperFactory
 {