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/SupplierAttributeMapper.php b/Models/SupplierAttributeMapper.php
index d654a0c..75aa416 100755
--- a/Models/SupplierAttributeMapper.php
+++ b/Models/SupplierAttributeMapper.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 Attribute
+ * @extends DataMapperFactory<T>
  */
 final class SupplierAttributeMapper extends DataMapperFactory
 {
@@ -60,7 +63,7 @@ final class SupplierAttributeMapper 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/SupplierAttributeTypeL11nMapper.php b/Models/SupplierAttributeTypeL11nMapper.php
index 4910a43..17ddeff 100755
--- a/Models/SupplierAttributeTypeL11nMapper.php
+++ b/Models/SupplierAttributeTypeL11nMapper.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 SupplierAttributeTypeL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class SupplierAttributeTypeL11nMapper 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/SupplierAttributeTypeMapper.php b/Models/SupplierAttributeTypeMapper.php
index c5f0e37..cb448bd 100755
--- a/Models/SupplierAttributeTypeMapper.php
+++ b/Models/SupplierAttributeTypeMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\SupplierManagement\Models;
 
-use Modules\Attribute\Models\AttributeTypeMapper;
+use Modules\Attribute\Models\AttributeType;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
@@ -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 SupplierAttributeTypeMapper extends DataMapperFactory
 {
@@ -68,10 +71,10 @@ final class SupplierAttributeTypeMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
-    public const MODEL = AttributeTypeMapper::class;
+    public const MODEL = AttributeType::class;
 
     /**
      * Primary table.
diff --git a/Models/SupplierAttributeValueL11nMapper.php b/Models/SupplierAttributeValueL11nMapper.php
index a5d8d0a..7101884 100755
--- a/Models/SupplierAttributeValueL11nMapper.php
+++ b/Models/SupplierAttributeValueL11nMapper.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 SupplierAttributeValueL11nMapper extends DataMapperFactory
 {
@@ -59,7 +62,7 @@ final class SupplierAttributeValueL11nMapper 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/SupplierAttributeValueMapper.php b/Models/SupplierAttributeValueMapper.php
index f647313..3106889 100755
--- a/Models/SupplierAttributeValueMapper.php
+++ b/Models/SupplierAttributeValueMapper.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\SupplierManagement\Models;
 
-use Modules\Attribute\Models\AttributeValueType;
+use Modules\Attribute\Models\AttributeValue;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
 
 /**
@@ -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 SupplierAttributeValueMapper extends DataMapperFactory
 {
@@ -63,10 +66,10 @@ final class SupplierAttributeValueMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
-    public const MODEL = AttributeValueType::class;
+    public const MODEL = AttributeValue::class;
 
     /**
      * Primary table.
diff --git a/Models/SupplierL11nMapper.php b/Models/SupplierL11nMapper.php
index 2538334..d479ee8 100755
--- a/Models/SupplierL11nMapper.php
+++ b/Models/SupplierL11nMapper.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 SupplierL11nMapper extends DataMapperFactory
 {
diff --git a/Models/SupplierL11nTypeMapper.php b/Models/SupplierL11nTypeMapper.php
index 57767c1..dcd7fff 100755
--- a/Models/SupplierL11nTypeMapper.php
+++ b/Models/SupplierL11nTypeMapper.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 SupplierL11nType
+ * @extends DataMapperFactory<T>
  */
 final class SupplierL11nTypeMapper extends DataMapperFactory
 {
diff --git a/Models/SupplierMapper.php b/Models/SupplierMapper.php
index a36e02a..cb4ef88 100755
--- a/Models/SupplierMapper.php
+++ b/Models/SupplierMapper.php
@@ -28,6 +28,9 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @template T of Supplier
+ * @extends DataMapperFactory<T>
  */
 final class SupplierMapper extends DataMapperFactory
 {