diff --git a/src/ShvetsGroup/LaravelEmailDatabaseLog/EmailLogger.php b/src/ShvetsGroup/LaravelEmailDatabaseLog/EmailLogger.php
index cb44357..677781a 100644
--- a/src/ShvetsGroup/LaravelEmailDatabaseLog/EmailLogger.php
+++ b/src/ShvetsGroup/LaravelEmailDatabaseLog/EmailLogger.php
@@ -2,7 +2,7 @@
 
 namespace ShvetsGroup\LaravelEmailDatabaseLog;
 
-use DB;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Mail\Events\MessageSending;
 
 class EmailLogger
@@ -56,4 +56,4 @@ function formatAddressField($message, $field)
         }
         return implode(', ', $strings);
     }
-}
\ No newline at end of file
+}
diff --git a/src/ShvetsGroup/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogEventServiceProvider.php b/src/ShvetsGroup/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogEventServiceProvider.php
new file mode 100644
index 0000000..87450f3
--- /dev/null
+++ b/src/ShvetsGroup/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogEventServiceProvider.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace ShvetsGroup\LaravelEmailDatabaseLog;
+
+use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Mail\Events\MessageSending;
+
+class LaravelEmailDatabaseLogEventServiceProvider extends ServiceProvider
+{
+    /**
+     * The event listener mappings for the application.
+     *
+     * @var array
+     */
+    protected $listen = [
+        MessageSending::class => [
+            EmailLogger::class,
+        ],
+    ];
+}
diff --git a/src/ShvetsGroup/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogServiceProvider.php b/src/ShvetsGroup/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogServiceProvider.php
index 4d8835e..ed3fd83 100644
--- a/src/ShvetsGroup/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogServiceProvider.php
+++ b/src/ShvetsGroup/LaravelEmailDatabaseLog/LaravelEmailDatabaseLogServiceProvider.php
@@ -2,22 +2,11 @@
 
 namespace ShvetsGroup\LaravelEmailDatabaseLog;
 
-use Illuminate\Foundation\Support\Providers\EventServiceProvider;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Mail\Events\MessageSending;
 
-class LaravelEmailDatabaseLogServiceProvider extends EventServiceProvider
+class LaravelEmailDatabaseLogServiceProvider extends ServiceProvider
 {
-    /**
-     * The event listener mappings for the application.
-     *
-     * @var array
-     */
-    protected $listen = [
-        MessageSending::class => [
-            EmailLogger::class,
-        ],
-    ];
-
     /**
      * Register any other events for your application.
      *
@@ -25,15 +14,22 @@ class LaravelEmailDatabaseLogServiceProvider extends EventServiceProvider
      */
     public function boot()
     {
-        parent::boot();
+		//
     }
-    
-    
+
+	/**
+	 * Register any application services.
+	 *
+	 * @return void
+	 */
     public function register()
     {
-        $this->publishes([
-           __DIR__ . '/../../database/migrations'=> database_path('migrations'),
-        ], 'laravel-email-database-log-migration');
-    }
+	    $this->app->register(LaravelEmailDatabaseLogEventServiceProvider::class);
 
+	    if ($this->app->runningInConsole()) {
+		    $this->publishes([
+			    __DIR__ . '/../../database/migrations' => database_path('migrations'),
+		    ], 'laravel-email-database-log-migration');
+	    }
+    }
 }