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/AccountRelationMapper.php b/Models/AccountRelationMapper.php
index 398df00..a888f14 100755
--- a/Models/AccountRelationMapper.php
+++ b/Models/AccountRelationMapper.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 AccountRelation
+ * @extends DataMapperFactory<T>
  */
 final class AccountRelationMapper extends DataMapperFactory
 {
diff --git a/Models/EventAttributeMapper.php b/Models/EventAttributeMapper.php
index 7866405..d22c6fd 100755
--- a/Models/EventAttributeMapper.php
+++ b/Models/EventAttributeMapper.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 EventAttribute
+ * @extends DataMapperFactory<T>
  */
 final class EventAttributeMapper extends DataMapperFactory
 {
diff --git a/Models/EventAttributeTypeL11nMapper.php b/Models/EventAttributeTypeL11nMapper.php
index 8fa557e..5e4e435 100755
--- a/Models/EventAttributeTypeL11nMapper.php
+++ b/Models/EventAttributeTypeL11nMapper.php
@@ -24,6 +24,9 @@ use phpOMS\Localization\BaseStringL11n;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of BaseStringL11n
+ * @extends DataMapperFactory<T>
  */
 final class EventAttributeTypeL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class EventAttributeTypeL11nMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = BaseStringL11n::class;
diff --git a/Models/EventAttributeTypeMapper.php b/Models/EventAttributeTypeMapper.php
index 555f465..a559170 100755
--- a/Models/EventAttributeTypeMapper.php
+++ b/Models/EventAttributeTypeMapper.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 EventAttributeType
+ * @extends DataMapperFactory<T>
  */
 final class EventAttributeTypeMapper extends DataMapperFactory
 {
diff --git a/Models/EventAttributeValueMapper.php b/Models/EventAttributeValueMapper.php
index 6aeee24..43d87bc 100755
--- a/Models/EventAttributeValueMapper.php
+++ b/Models/EventAttributeValueMapper.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 EventAttributeValue
+ * @extends DataMapperFactory<T>
  */
 final class EventAttributeValueMapper extends DataMapperFactory
 {
diff --git a/Models/EventMapper.php b/Models/EventMapper.php
index a1f3741..d792ca1 100755
--- a/Models/EventMapper.php
+++ b/Models/EventMapper.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 EventMapper
+ * @extends DataMapperFactory<T>
  */
 final class EventMapper extends DataMapperFactory
 {