diff --git a/src/Enums/PaymentMethod.php b/src/Enums/PaymentMethod.php
new file mode 100644
index 0000000..d1cc88a
--- /dev/null
+++ b/src/Enums/PaymentMethod.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace LaravelEnso\Helpers\Enums;
+
+use LaravelEnso\Enums\Contracts\Mappable;
+use LaravelEnso\Enums\Contracts\Select;
+use LaravelEnso\Enums\Traits\Select as Options;
+
+enum PaymentMethod: int implements Mappable, Select
+{
+    use Options;
+
+    case Card = 1;
+    case OnDelivery = 2;
+    case Wire = 3;
+    case PromissoryNote = 4;
+    case Cash = 5;
+    case Cheque = 6;
+
+    public function map(): string
+    {
+        return match ($this) {
+            self::Card => 'Card',
+            self::OnDelivery => 'On Delivery',
+            self::Wire => 'Transfer',
+            self::PromissoryNote => 'Promissory Note',
+            self::Cash => 'Cash',
+            self::Cheque => 'Cheque',
+        };
+    }
+}
diff --git a/src/Enums/PaymentMethods.php b/src/Enums/PaymentMethods.php
deleted file mode 100644
index 0ca3afb..0000000
--- a/src/Enums/PaymentMethods.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace LaravelEnso\Helpers\Enums;
-
-use LaravelEnso\Enums\Services\Enum;
-
-class PaymentMethods extends Enum
-{
-    public const Card = 1;
-    public const OnDelivery = 2;
-    public const Wire = 3;
-    public const PromissoryNote = 4;
-    public const Cash = 5;
-    public const Cheque = 6;
-
-    protected static array $data = [
-        self::Card => 'Card',
-        self::OnDelivery => 'On Delivery',
-        self::Wire => 'Transfer',
-        self::PromissoryNote => 'Promissory Note',
-        self::Cash => 'Cash',
-        self::Cheque => 'Cheque',
-    ];
-}
diff --git a/src/Enums/VatRate.php b/src/Enums/VatRate.php
new file mode 100644
index 0000000..d5cf694
--- /dev/null
+++ b/src/Enums/VatRate.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LaravelEnso\Helpers\Enums;
+
+use LaravelEnso\Enums\Contracts\Select;
+use LaravelEnso\Enums\Traits\Select as Options;
+
+enum VatRate: int implements Select
+{
+    use Options;
+
+    case None = 0;
+    case Five = 5;
+    case Nine = 9;
+    case Nineteen = 19;
+}
diff --git a/src/Enums/VatRates.php b/src/Enums/VatRates.php
deleted file mode 100644
index 0224264..0000000
--- a/src/Enums/VatRates.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace LaravelEnso\Helpers\Enums;
-
-use LaravelEnso\Enums\Services\Enum;
-
-class VatRates extends Enum
-{
-    public const None = 0;
-    public const Five = 5;
-    public const Nine = 9;
-    public const Nineteen = 19;
-}