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/CostCenterL11nMapper.php b/Models/CostCenterL11nMapper.php
index e8e14c3..afabf79 100755
--- a/Models/CostCenterL11nMapper.php
+++ b/Models/CostCenterL11nMapper.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 BaseStringL11n
+ * @extends DataMapperFactory<T>
  */
 final class CostCenterL11nMapper extends DataMapperFactory
 {
diff --git a/Models/CostCenterMapper.php b/Models/CostCenterMapper.php
index 9d3604b..52a356b 100755
--- a/Models/CostCenterMapper.php
+++ b/Models/CostCenterMapper.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 CostCenter
+ * @extends DataMapperFactory<T>
  */
 final class CostCenterMapper extends DataMapperFactory
 {
@@ -56,7 +59,7 @@ final class CostCenterMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = CostCenter::class;
diff --git a/Models/CostObjectL11nMapper.php b/Models/CostObjectL11nMapper.php
index 2d78b48..a62990e 100755
--- a/Models/CostObjectL11nMapper.php
+++ b/Models/CostObjectL11nMapper.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 BaseStringL11n
+ * @extends DataMapperFactory<T>
  */
 final class CostObjectL11nMapper extends DataMapperFactory
 {
diff --git a/Models/CostObjectMapper.php b/Models/CostObjectMapper.php
index 0962615..0472101 100755
--- a/Models/CostObjectMapper.php
+++ b/Models/CostObjectMapper.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 CostObject
+ * @extends DataMapperFactory<T>
  */
 final class CostObjectMapper extends DataMapperFactory
 {
@@ -56,7 +59,7 @@ final class CostObjectMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = CostObject::class;