diff --git a/app/Models/Enums/Enum.php b/app/Interfaces/Enum.php
similarity index 98%
rename from app/Models/Enums/Enum.php
rename to app/Interfaces/Enum.php
index 197b22e3..fa3c1074 100644
--- a/app/Models/Enums/Enum.php
+++ b/app/Interfaces/Enum.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Enums;
+namespace App\Interfaces;
 
 /**
  * Class EnumBase
diff --git a/app/Models/Enums/AcarsType.php b/app/Models/Enums/AcarsType.php
index 2a52b387..e5951db3 100644
--- a/app/Models/Enums/AcarsType.php
+++ b/app/Models/Enums/AcarsType.php
@@ -2,6 +2,8 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class AcarsType
  * @package App\Models\Enums
diff --git a/app/Models/Enums/ActiveState.php b/app/Models/Enums/ActiveState.php
index 8a62af67..7e66a8ed 100644
--- a/app/Models/Enums/ActiveState.php
+++ b/app/Models/Enums/ActiveState.php
@@ -2,6 +2,8 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class ActiveState
  * @package App\Models\Enums
diff --git a/app/Models/Enums/AircraftState.php b/app/Models/Enums/AircraftState.php
index c283d53b..81d7b4a9 100644
--- a/app/Models/Enums/AircraftState.php
+++ b/app/Models/Enums/AircraftState.php
@@ -2,6 +2,8 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class AircraftState
  * @package App\Models\Enums
diff --git a/app/Models/Enums/AircraftStatus.php b/app/Models/Enums/AircraftStatus.php
index a56f758f..b5ce9ed9 100644
--- a/app/Models/Enums/AircraftStatus.php
+++ b/app/Models/Enums/AircraftStatus.php
@@ -2,6 +2,8 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class AircraftState
  * @package App\Models\Enums
diff --git a/app/Models/Enums/AnalyticsDimensions.php b/app/Models/Enums/AnalyticsDimensions.php
index 64feb97b..a4d5552f 100644
--- a/app/Models/Enums/AnalyticsDimensions.php
+++ b/app/Models/Enums/AnalyticsDimensions.php
@@ -2,11 +2,13 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class AnalyticsDimensions
  * @package App\Models\Enums
  */
-class AnalyticsDimensions
+class AnalyticsDimensions extends Enum
 {
     public const PHP_VERSION = 1;
     public const DATABASE_VERSION = 2;
diff --git a/app/Models/Enums/AnalyticsMetrics.php b/app/Models/Enums/AnalyticsMetrics.php
index 1cce3f3d..f59ba0b9 100644
--- a/app/Models/Enums/AnalyticsMetrics.php
+++ b/app/Models/Enums/AnalyticsMetrics.php
@@ -2,11 +2,13 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class AnalyticsMetrics
  * @package App\Models\Enums
  */
-class AnalyticsMetrics
+class AnalyticsMetrics extends Enum
 {
     # Track the lookup time for airports from vaCentral
     public const AIRPORT_LOOKUP_TIME = 1;
diff --git a/app/Models/Enums/Days.php b/app/Models/Enums/Days.php
index 96e15d70..420b0a13 100644
--- a/app/Models/Enums/Days.php
+++ b/app/Models/Enums/Days.php
@@ -1,10 +1,9 @@
 <?php
-/**
- *
- */
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class Days
  * @package App\Models\Enums
diff --git a/app/Models/Enums/ExpenseType.php b/app/Models/Enums/ExpenseType.php
index 1bdc1fbe..2a548182 100644
--- a/app/Models/Enums/ExpenseType.php
+++ b/app/Models/Enums/ExpenseType.php
@@ -2,6 +2,8 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class ExpenseType
  * @package App\Models\Enums
diff --git a/app/Models/Enums/FlightType.php b/app/Models/Enums/FlightType.php
index 1535cf5a..a77e8a13 100644
--- a/app/Models/Enums/FlightType.php
+++ b/app/Models/Enums/FlightType.php
@@ -2,7 +2,12 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
 
+/**
+ * Class FlightType
+ * @package App\Models\Enums
+ */
 class FlightType extends Enum {
 
     public const PASSENGER   = 0;
diff --git a/app/Models/Enums/FuelType.php b/app/Models/Enums/FuelType.php
index f2d140f2..3be489af 100644
--- a/app/Models/Enums/FuelType.php
+++ b/app/Models/Enums/FuelType.php
@@ -2,6 +2,12 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
+/**
+ * Class FuelType
+ * @package App\Models\Enums
+ */
 class FuelType extends Enum {
 
     public const LOW_LEAD  = 0;
diff --git a/app/Models/Enums/JournalType.php b/app/Models/Enums/JournalType.php
index b57f685a..166ed160 100644
--- a/app/Models/Enums/JournalType.php
+++ b/app/Models/Enums/JournalType.php
@@ -2,6 +2,8 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class AcarsType
  * @package App\Models\Enums
diff --git a/app/Models/Enums/NavaidType.php b/app/Models/Enums/NavaidType.php
index f08f70a4..cb200438 100644
--- a/app/Models/Enums/NavaidType.php
+++ b/app/Models/Enums/NavaidType.php
@@ -1,10 +1,8 @@
 <?php
-/**
- * The types of navaids
- */
-
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Class NavaidType
  * Types based on/compatible with OpenFMC
diff --git a/app/Models/Enums/PirepSource.php b/app/Models/Enums/PirepSource.php
index 8cbd64bf..41fe00a2 100644
--- a/app/Models/Enums/PirepSource.php
+++ b/app/Models/Enums/PirepSource.php
@@ -2,6 +2,12 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
+/**
+ * Class PirepSource
+ * @package App\Models\Enums
+ */
 class PirepSource extends Enum
 {
     public const MANUAL = 0;
diff --git a/app/Models/Enums/PirepState.php b/app/Models/Enums/PirepState.php
index 51884672..2e22a011 100644
--- a/app/Models/Enums/PirepState.php
+++ b/app/Models/Enums/PirepState.php
@@ -2,6 +2,12 @@
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
+/**
+ * Class PirepState
+ * @package App\Models\Enums
+ */
 class PirepState extends Enum {
 
     public const REJECTED      = -1;
diff --git a/app/Models/Enums/PirepStatus.php b/app/Models/Enums/PirepStatus.php
index 2998251c..5843db25 100644
--- a/app/Models/Enums/PirepStatus.php
+++ b/app/Models/Enums/PirepStatus.php
@@ -1,10 +1,9 @@
 <?php
-/**
- * Enums for PIREP statuses
- */
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
 /**
  * Tied to the ACARS statuses/states
  * Class PirepStatus
diff --git a/app/Models/Enums/UserState.php b/app/Models/Enums/UserState.php
index 1d788a67..a0b207dd 100644
--- a/app/Models/Enums/UserState.php
+++ b/app/Models/Enums/UserState.php
@@ -1,10 +1,13 @@
 <?php
-/**
- * Hold the user states
- */
 
 namespace App\Models\Enums;
 
+use App\Interfaces\Enum;
+
+/**
+ * Class UserState
+ * @package App\Models\Enums
+ */
 class UserState extends Enum
 {
     public const PENDING   = 0;