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/KanbanBoardMapper.php b/Models/KanbanBoardMapper.php
index 5392326..7b442d4 100755
--- a/Models/KanbanBoardMapper.php
+++ b/Models/KanbanBoardMapper.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 KanbanBoard
+ * @extends DataMapperFactory<T>
  */
 final class KanbanBoardMapper extends DataMapperFactory
 {
diff --git a/Models/KanbanCardCommentMapper.php b/Models/KanbanCardCommentMapper.php
index fbcd7b7..741c604 100755
--- a/Models/KanbanCardCommentMapper.php
+++ b/Models/KanbanCardCommentMapper.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 KanbanCardComment
+ * @extends DataMapperFactory<T>
  */
 final class KanbanCardCommentMapper extends DataMapperFactory
 {
diff --git a/Models/KanbanCardMapper.php b/Models/KanbanCardMapper.php
index f4b9aa0..32aac1f 100755
--- a/Models/KanbanCardMapper.php
+++ b/Models/KanbanCardMapper.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 KanbanCard
+ * @extends DataMapperFactory<T>
  */
 final class KanbanCardMapper extends DataMapperFactory
 {
diff --git a/Models/KanbanColumnMapper.php b/Models/KanbanColumnMapper.php
index 0bdd3ff..eb212f6 100755
--- a/Models/KanbanColumnMapper.php
+++ b/Models/KanbanColumnMapper.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 KanbanColumn
+ * @extends DataMapperFactory<T>
  */
 final class KanbanColumnMapper extends DataMapperFactory
 {