diff --git a/src/Commands/DataFilterMakeCommand.php b/src/Commands/DataFilterMakeCommand.php
new file mode 100644
index 0000000..788574d
--- /dev/null
+++ b/src/Commands/DataFilterMakeCommand.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace BinaryBuilds\LaritorClient\Commands;
+
+use Illuminate\Console\GeneratorCommand;
+
+class DataFilterMakeCommand extends GeneratorCommand
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'make:laritor-filter';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a custom data filter for laritor';
+
+    /**
+     * The type of class being generated.
+     *
+     * @var string
+     */
+    protected $type = 'LaritorDataFilter';
+
+    /**
+     * Get the stub file for the generator.
+     *
+     * @return string
+     */
+    protected function getStub()
+    {
+       return __DIR__.'/../../stubs/LaritorDataFilter.stub';
+    }
+
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     * @return string
+     */
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return $rootNamespace.'\Laritor';
+    }
+
+    protected function getArguments()
+    {
+        return [];
+    }
+
+    protected function getNameInput()
+    {
+        return 'LaritorDataFilter';
+    }
+}
diff --git a/src/Commands/DataRedactorMakeCommand.php b/src/Commands/DataRedactorMakeCommand.php
new file mode 100644
index 0000000..1df45c5
--- /dev/null
+++ b/src/Commands/DataRedactorMakeCommand.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace BinaryBuilds\LaritorClient\Commands;
+
+use Illuminate\Console\GeneratorCommand;
+
+class DataRedactorMakeCommand extends GeneratorCommand
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'make:laritor-redactor';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create a custom data redactor for laritor';
+
+    /**
+     * The type of class being generated.
+     *
+     * @var string
+     */
+    protected $type = 'LaritorDataRedactor';
+
+    /**
+     * Get the stub file for the generator.
+     *
+     * @return string
+     */
+    protected function getStub()
+    {
+       return __DIR__.'/../../stubs/LaritorDataRedactor.stub';
+    }
+
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     * @return string
+     */
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return $rootNamespace.'\Laritor';
+    }
+
+    protected function getArguments()
+    {
+        return [];
+    }
+
+    protected function getNameInput()
+    {
+        return 'LaritorDataRedactor';
+    }
+}
diff --git a/src/Commands/HealthCheckMakeCommand.php b/src/Commands/HealthCheckMakeCommand.php
index 9ad7ad1..da3ba6c 100644
--- a/src/Commands/HealthCheckMakeCommand.php
+++ b/src/Commands/HealthCheckMakeCommand.php
@@ -46,7 +46,7 @@ protected function getStub()
      */
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace.'\Laritor';
+        return $rootNamespace.'\Laritor\HealthChecks';
     }
 
     /**
diff --git a/src/Controllers/HealthCheckController.php b/src/Controllers/HealthCheckController.php
index 3b83d7c..c80502b 100644
--- a/src/Controllers/HealthCheckController.php
+++ b/src/Controllers/HealthCheckController.php
@@ -35,7 +35,7 @@ public function check(Request $request, $check_type )
             case 'queue' : $health_check = app( QueueWorkerHealthCheck::class );break;
             default: {
 
-                $health_check_class = app()->getNamespace()."BinaryBuilds\\$check_type";
+                $health_check_class = app()->getNamespace()."Laritor\\HealthChecks\\$check_type";
 
                 if (class_exists($health_check_class)) {
                     $health_check = app( $health_check_class );
diff --git a/src/Helpers/HealthCheckHelper.php b/src/Helpers/HealthCheckHelper.php
index 08ed823..c9829fb 100644
--- a/src/Helpers/HealthCheckHelper.php
+++ b/src/Helpers/HealthCheckHelper.php
@@ -18,15 +18,15 @@ public function getHealthChecks()
     {
         $health_checks = [];
 
-        if (is_dir(app_path('Laritor'))) {
-            foreach ((new Finder())->in(app_path('Laritor'))->files() as $health_check) {
+        if (is_dir(app_path('Laritor/HealthChecks'))) {
+            foreach ((new Finder())->in(app_path('Laritor/HealthChecks'))->files() as $health_check) {
                 $name = str_replace(
                     ['/', '.php'],
                     ['\\', ''],
-                    Str::after($health_check->getPathname(), app_path('Laritor').DIRECTORY_SEPARATOR)
+                    Str::after($health_check->getPathname(), app_path('Laritor/HealthChecks').DIRECTORY_SEPARATOR)
                 );
 
-                $class = app()->getNamespace().'Laritor\\'.$name;
+                $class = app()->getNamespace().'Laritor\\HealthChecks\\'.$name;
 
                 $health_checks[] = [
                     'name' => $class::$name,
diff --git a/src/LaritorServiceProvider.php b/src/LaritorServiceProvider.php
index 5682127..d48c556 100755
--- a/src/LaritorServiceProvider.php
+++ b/src/LaritorServiceProvider.php
@@ -2,6 +2,8 @@
 
 namespace BinaryBuilds\LaritorClient;
 
+use BinaryBuilds\LaritorClient\Commands\DataFilterMakeCommand;
+use BinaryBuilds\LaritorClient\Commands\DataRedactorMakeCommand;
 use BinaryBuilds\LaritorClient\Override\DefaultOverride;
 use BinaryBuilds\LaritorClient\Override\LaritorOverride;
 use BinaryBuilds\LaritorClient\Redactor\DataRedactor;
@@ -45,7 +47,9 @@ public function boot()
             HealthCheckMakeCommand::class,
             QueueHealthCheckMakeCommand::class,
             SyncCommand::class,
-            SendServerMetricsCommand::class
+            SendServerMetricsCommand::class,
+            DataRedactorMakeCommand::class,
+            DataFilterMakeCommand::class
         ]);
 
         app(Laritor::class)->started();
diff --git a/stubs/LaritorDataFilter.stub b/stubs/LaritorDataFilter.stub
new file mode 100644
index 0000000..a61bb47
--- /dev/null
+++ b/stubs/LaritorDataFilter.stub
@@ -0,0 +1,112 @@
+<?php
+
+namespace {{ namespace }};
+
+use Illuminate\Contracts\Queue\Job;
+use Illuminate\Http\Request;
+use Illuminate\Notifications\Notification;
+use Symfony\Component\Mime\Email;
+use BinaryBuilds\LaritorClient\Override\DefaultOverride;
+
+class LaritorDataFilter extends DefaultOverride
+{
+    /**
+     * @param string $cacheKey
+     * @return bool
+     */
+    public function recordCacheHit($cacheKey): bool
+    {
+        return parent::recordCacheHit($cacheKey);
+    }
+
+    /**
+     * @param \Throwable $exception
+     * @return bool
+     */
+    public function recordException($exception): bool
+    {
+        return parent::recordException($exception);
+    }
+
+    /**
+     * @param string $url
+     * @return bool
+     */
+    public function recordOutboundRequest($url): bool
+    {
+        return parent::recordOutboundRequest($url);
+    }
+
+    /**
+     * @param string $query
+     * @param int $duration
+     * @return bool
+     */
+    public function recordQuery($query, $duration): bool
+    {
+        return parent::recordQuery($query, $duration);
+    }
+
+    /**
+     * @param Job $job
+     * @return bool
+     */
+    public function recordQueuedJob($job): bool
+    {
+        return parent::recordQueuedJob($job);
+    }
+
+    /**
+     * @param Request $request
+     * @return bool
+     */
+    public function recordRequest($request): bool
+    {
+        return parent::recordRequest($request);
+    }
+
+    /**
+     * @param string $command
+     * @return bool
+     */
+    public function recordCommandOrScheduledTask($command): bool
+    {
+        return parent::recordCommandOrScheduledTask($command);
+    }
+
+    /**
+     * @return bool
+     */
+    public function recordTaskScheduler(): bool
+    {
+        return parent::recordTaskScheduler();
+    }
+
+    /**
+     * @param Email $message
+     * @return bool
+     */
+    public function recordMail($message): bool
+    {
+        return parent::recordMail($message);
+    }
+
+    /**
+     * @param mixed $notifiable
+     * @param Notification $notification
+     * @return bool
+     */
+    public function recordNotification($notifiable, $notification): bool
+    {
+        return parent::recordNotification($notifiable, $notification);
+    }
+
+    /**
+     * @param Request $request
+     * @return bool
+     */
+    public function isBot($request): bool
+    {
+        return parent::isBot($request);
+    }
+}
\ No newline at end of file
diff --git a/stubs/LaritorDataRedactor.stub b/stubs/LaritorDataRedactor.stub
new file mode 100644
index 0000000..5605baf
--- /dev/null
+++ b/stubs/LaritorDataRedactor.stub
@@ -0,0 +1,39 @@
+<?php
+
+namespace {{ namespace }};
+
+use BinaryBuilds\LaritorClient\Redactor\DefaultRedactor;
+use Illuminate\Support\Facades\Auth;
+
+class LaritorDataRedactor extends DefaultRedactor
+{
+    public function redactEmailAddress($address): string
+    {
+        return parent::redactEmailAddress($address);
+    }
+
+    public function redactString($text): string
+    {
+        return parent::redactString($text);
+    }
+
+    public function redactArrayValue($key, $text): string
+    {
+        return parent::redactArrayValue($key, $text);
+    }
+
+    public function redactAuthenticatedUser() : array
+    {
+        return parent::redactAuthenticatedUser();
+    }
+
+    public function redactIPAddress($ip): string
+    {
+        return parent::redactIPAddress($ip);
+    }
+
+    public function redactUserAgent($userAgent): string
+    {
+        return parent::redactUserAgent($userAgent);
+    }
+}