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/ItemAttributeMapper.php b/Models/ItemAttributeMapper.php
index 7cf28da..4836914 100755
--- a/Models/ItemAttributeMapper.php
+++ b/Models/ItemAttributeMapper.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 Attribte
+ * @extends DataMapperFactory<T>
  */
 final class ItemAttributeMapper extends DataMapperFactory
 {
@@ -60,7 +63,7 @@ final class ItemAttributeMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = Attribute::class;
diff --git a/Models/ItemAttributeTypeL11nMapper.php b/Models/ItemAttributeTypeL11nMapper.php
index 4743663..20d5d0f 100755
--- a/Models/ItemAttributeTypeL11nMapper.php
+++ b/Models/ItemAttributeTypeL11nMapper.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 ItemAttributeTypeL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class ItemAttributeTypeL11nMapper 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/ItemAttributeTypeMapper.php b/Models/ItemAttributeTypeMapper.php
index d2e16ed..e0238c3 100755
--- a/Models/ItemAttributeTypeMapper.php
+++ b/Models/ItemAttributeTypeMapper.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 AttributeType
+ * @extends DataMapperFactory<T>
  */
 final class ItemAttributeTypeMapper extends DataMapperFactory
 {
@@ -68,7 +71,7 @@ final class ItemAttributeTypeMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = AttributeType::class;
diff --git a/Models/ItemAttributeValueL11nMapper.php b/Models/ItemAttributeValueL11nMapper.php
index b09e4f8..7a51c7f 100755
--- a/Models/ItemAttributeValueL11nMapper.php
+++ b/Models/ItemAttributeValueL11nMapper.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 ItemAttributeValueL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class ItemAttributeValueL11nMapper 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/ItemAttributeValueMapper.php b/Models/ItemAttributeValueMapper.php
index 076b19d..2308eda 100755
--- a/Models/ItemAttributeValueMapper.php
+++ b/Models/ItemAttributeValueMapper.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 AttributeValue
+ * @extends DataMapperFactory<T>
  */
 final class ItemAttributeValueMapper extends DataMapperFactory
 {
@@ -63,7 +66,7 @@ final class ItemAttributeValueMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = AttributeValue::class;
diff --git a/Models/ItemL11nMapper.php b/Models/ItemL11nMapper.php
index 903edb2..4e97aff 100755
--- a/Models/ItemL11nMapper.php
+++ b/Models/ItemL11nMapper.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 ItemL11nMapper extends DataMapperFactory
 {
diff --git a/Models/ItemL11nTypeMapper.php b/Models/ItemL11nTypeMapper.php
index 1ccd824..32e937f 100755
--- a/Models/ItemL11nTypeMapper.php
+++ b/Models/ItemL11nTypeMapper.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 ItemL11nType
+ * @extends DataMapperFactory<T>
  */
 final class ItemL11nTypeMapper extends DataMapperFactory
 {
diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php
index 210aa2b..66249bb 100755
--- a/Models/ItemMapper.php
+++ b/Models/ItemMapper.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\ItemManagement\Models;
 
-use Modules\Attribute\Models\AttributeMapper;
 use Modules\Editor\Models\EditorDocMapper;
 use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
@@ -26,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 Item
+ * @extends DataMapperFactory<T>
  */
 final class ItemMapper extends DataMapperFactory
 {
@@ -88,7 +90,7 @@ final class ItemMapper extends DataMapperFactory
             'external' => null,
         ],
         'attributes' => [
-            'mapper'   => AttributeMapper::class,
+            'mapper'   => ItemAttributeMapper::class,
             'table'    => 'itemmgmt_item_attr',
             'self'     => 'itemmgmt_item_attr_item',
             'external' => null,
diff --git a/Models/ItemRelationMapper.php b/Models/ItemRelationMapper.php
index 22a5764..628c9ae 100755
--- a/Models/ItemRelationMapper.php
+++ b/Models/ItemRelationMapper.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 ItemRelation
+ * @extends DataMapperFactory<T>
  */
 final class ItemRelationMapper extends DataMapperFactory
 {
diff --git a/Models/ItemRelationTypeMapper.php b/Models/ItemRelationTypeMapper.php
index 88020ac..3c26a75 100755
--- a/Models/ItemRelationTypeMapper.php
+++ b/Models/ItemRelationTypeMapper.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 ItemRelationType
+ * @extends DataMapperFactory<T>
  */
 final class ItemRelationTypeMapper extends DataMapperFactory
 {