diff --git a/app/DataMapper/Analytics/AccountCreated.php b/app/DataMapper/Analytics/AccountCreated.php
index b0df3fa6ddd0..5d82945eb8f9 100644
--- a/app/DataMapper/Analytics/AccountCreated.php
+++ b/app/DataMapper/Analytics/AccountCreated.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class AccountCreated
+use Turbo124\Beacon\ExampleMetric\GenericCounter;
+
+class AccountCreated extends GenericCounter
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/AccountDeleted.php b/app/DataMapper/Analytics/AccountDeleted.php
index 1ea0cc27aa34..342796254f50 100644
--- a/app/DataMapper/Analytics/AccountDeleted.php
+++ b/app/DataMapper/Analytics/AccountDeleted.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class AccountDeleted
+use Turbo124\Beacon\ExampleMetric\GenericCounter;
+
+class AccountDeleted extends GenericCounter
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/DbQuery.php b/app/DataMapper/Analytics/DbQuery.php
index e802c64c4f2c..1abd42ec9df8 100644
--- a/app/DataMapper/Analytics/DbQuery.php
+++ b/app/DataMapper/Analytics/DbQuery.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class DbQuery
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class DbQuery extends GenericMixedMetric
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/EmailFailure.php b/app/DataMapper/Analytics/EmailFailure.php
index d91e37725b37..473b7c9bd0c9 100644
--- a/app/DataMapper/Analytics/EmailFailure.php
+++ b/app/DataMapper/Analytics/EmailFailure.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class EmailFailure
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class EmailFailure extends GenericMixedMetric
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/EmailInvoiceFailure.php b/app/DataMapper/Analytics/EmailInvoiceFailure.php
index 8637f87a05f5..9d259f2d38ce 100644
--- a/app/DataMapper/Analytics/EmailInvoiceFailure.php
+++ b/app/DataMapper/Analytics/EmailInvoiceFailure.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class EmailInvoiceFailure
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class EmailInvoiceFailure extends GenericMixedMetric
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/EmailSuccess.php b/app/DataMapper/Analytics/EmailSuccess.php
index bd39f7cd695b..14dfbb6ca89b 100644
--- a/app/DataMapper/Analytics/EmailSuccess.php
+++ b/app/DataMapper/Analytics/EmailSuccess.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class EmailSuccess
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class EmailSuccess extends GenericMixedMetric
 {
 
     /**
diff --git a/app/DataMapper/Analytics/LoginFailure.php b/app/DataMapper/Analytics/LoginFailure.php
index 3fd8f943bb0e..584a5894aaec 100644
--- a/app/DataMapper/Analytics/LoginFailure.php
+++ b/app/DataMapper/Analytics/LoginFailure.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class LoginFailure
+use Turbo124\Beacon\ExampleMetric\GenericCounter;
+
+class LoginFailure extends GenericCounter
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/LoginSuccess.php b/app/DataMapper/Analytics/LoginSuccess.php
index 5d489e93911f..2da5daece414 100644
--- a/app/DataMapper/Analytics/LoginSuccess.php
+++ b/app/DataMapper/Analytics/LoginSuccess.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class LoginSuccess
+use Turbo124\Beacon\ExampleMetric\GenericCounter;
+
+class LoginSuccess extends GenericCounter
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/Mail/EmailBounce.php b/app/DataMapper/Analytics/Mail/EmailBounce.php
index 5a8aaf10af3d..15340b5a6ff5 100644
--- a/app/DataMapper/Analytics/Mail/EmailBounce.php
+++ b/app/DataMapper/Analytics/Mail/EmailBounce.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics\Mail;
 
-class EmailBounce
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class EmailBounce extends GenericMixedMetric
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/Mail/EmailSpam.php b/app/DataMapper/Analytics/Mail/EmailSpam.php
index c420327ddc78..ff7acbd750c2 100644
--- a/app/DataMapper/Analytics/Mail/EmailSpam.php
+++ b/app/DataMapper/Analytics/Mail/EmailSpam.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics\Mail;
 
-class EmailSpam
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class EmailSpam extends GenericMixedMetric
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/MigrationFailure.php b/app/DataMapper/Analytics/MigrationFailure.php
index c57421d1f52f..b4cf68fe3588 100644
--- a/app/DataMapper/Analytics/MigrationFailure.php
+++ b/app/DataMapper/Analytics/MigrationFailure.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class MigrationFailure
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class MigrationFailure extends GenericMixedMetric
 {
     /**
      * The type of Sample.
diff --git a/app/DataMapper/Analytics/SendRecurringFailure.php b/app/DataMapper/Analytics/SendRecurringFailure.php
index 26affa205a3c..7b000464c88b 100644
--- a/app/DataMapper/Analytics/SendRecurringFailure.php
+++ b/app/DataMapper/Analytics/SendRecurringFailure.php
@@ -11,7 +11,9 @@
 
 namespace App\DataMapper\Analytics;
 
-class SendRecurringFailure
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class SendRecurringFailure extends GenericMixedMetric
 {
     /**
      * The type of Sample.