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/QAAnswerMapper.php b/Models/QAAnswerMapper.php
index 74c8c55..40ce7b5 100755
--- a/Models/QAAnswerMapper.php
+++ b/Models/QAAnswerMapper.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 QAAnswer
+ * @extends DataMapperFactory<T>
  */
 final class QAAnswerMapper extends DataMapperFactory
 {
diff --git a/Models/QAAnswerVoteMapper.php b/Models/QAAnswerVoteMapper.php
index 4fdbb8c..f28216b 100755
--- a/Models/QAAnswerVoteMapper.php
+++ b/Models/QAAnswerVoteMapper.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 QAAnswerVote
+ * @extends DataMapperFactory<T>
  */
 final class QAAnswerVoteMapper extends DataMapperFactory
 {
diff --git a/Models/QAAppMapper.php b/Models/QAAppMapper.php
index 556643f..d3ad5f5 100755
--- a/Models/QAAppMapper.php
+++ b/Models/QAAppMapper.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 QAApp
+ * @extends DataMapperFactory<T>
  */
 final class QAAppMapper extends DataMapperFactory
 {
diff --git a/Models/QAHelperMapper.php b/Models/QAHelperMapper.php
index c6944c0..586c5dd 100755
--- a/Models/QAHelperMapper.php
+++ b/Models/QAHelperMapper.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 QAApp
+ * @extends DataMapperFactory<T>
  */
 final class QAHelperMapper extends DataMapperFactory
 {
diff --git a/Models/QAQuestionMapper.php b/Models/QAQuestionMapper.php
index 19c5ced..7626f74 100755
--- a/Models/QAQuestionMapper.php
+++ b/Models/QAQuestionMapper.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 QAQuestion
+ * @extends DataMapperFactory<T>
  */
 final class QAQuestionMapper extends DataMapperFactory
 {
diff --git a/Models/QAQuestionVoteMapper.php b/Models/QAQuestionVoteMapper.php
index 5000791..7a50abc 100755
--- a/Models/QAQuestionVoteMapper.php
+++ b/Models/QAQuestionVoteMapper.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 QAQuestionVote
+ * @extends DataMapperFactory<T>
  */
 final class QAQuestionVoteMapper extends DataMapperFactory
 {