diff --git a/src/Enums/Gender.php b/src/Enums/Gender.php
new file mode 100644
index 0000000..fe42263
--- /dev/null
+++ b/src/Enums/Gender.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace LaravelEnso\People\Enums;
+
+use LaravelEnso\Enums\Contracts\Mappable;
+
+enum Gender: int implements Mappable
+{
+    public const Female = 1;
+    public const Male = 2;
+
+    public function map(): string
+    {
+        return match ($this) {
+            self::Female => 'female',
+            self::Male => 'male',
+        };
+    }
+}
diff --git a/src/Enums/Genders.php b/src/Enums/Genders.php
deleted file mode 100644
index 3198df2..0000000
--- a/src/Enums/Genders.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace LaravelEnso\People\Enums;
-
-use LaravelEnso\Enums\Services\Enum;
-
-class Genders extends Enum
-{
-    public const Female = 1;
-    public const Male = 2;
-
-    protected static array $data = [
-        self::Female => 'female',
-        self::Male => 'male',
-    ];
-}
diff --git a/src/Enums/Title.php b/src/Enums/Title.php
new file mode 100644
index 0000000..35d6f03
--- /dev/null
+++ b/src/Enums/Title.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace LaravelEnso\People\Enums;
+
+enum Title: int
+{
+    case Miss = 1;
+    case Ms = 2;
+    case Mr = 3;
+}
diff --git a/src/Enums/Titles.php b/src/Enums/Titles.php
deleted file mode 100644
index 7d4c144..0000000
--- a/src/Enums/Titles.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace LaravelEnso\People\Enums;
-
-use LaravelEnso\Enums\Services\Enum;
-
-class Titles extends Enum
-{
-    public const Miss = 1;
-    public const Ms = 2;
-    public const Mr = 3;
-}