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/ExchangeLogMapper.php b/Models/ExchangeLogMapper.php
index 71163f1..b05d426 100755
--- a/Models/ExchangeLogMapper.php
+++ b/Models/ExchangeLogMapper.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 ExchangeLog
+ * @extends DataMapperFactory<T>
  */
 final class ExchangeLogMapper extends DataMapperFactory
 {
@@ -47,7 +50,7 @@ final class ExchangeLogMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = ExchangeLog::class;
diff --git a/Models/ExchangeSettingMapper.php b/Models/ExchangeSettingMapper.php
index 3477019..a41bbd9 100755
--- a/Models/ExchangeSettingMapper.php
+++ b/Models/ExchangeSettingMapper.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 ExchangeSetting
+ * @extends DataMapperFactory<T>
  */
 final class ExchangeSettingMapper extends DataMapperFactory
 {
@@ -43,7 +46,7 @@ final class ExchangeSettingMapper extends DataMapperFactory
     /**
      * Model to use by the mapper.
      *
-     * @var class-string
+     * @var class-string<T>
      * @since 1.0.0
      */
     public const MODEL = ExchangeSetting::class;
diff --git a/Models/InterfaceManagerMapper.php b/Models/InterfaceManagerMapper.php
index 77b74e5..d9567d4 100755
--- a/Models/InterfaceManagerMapper.php
+++ b/Models/InterfaceManagerMapper.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 InterfaceManager
+ * @extends DataMapperFactory<T>
  */
 final class InterfaceManagerMapper extends DataMapperFactory
 {