diff --git a/app/Models/EsiScope.php b/app/Models/EsiScope.php
new file mode 100644
index 000000000..80f879140
--- /dev/null
+++ b/app/Models/EsiScope.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class EsiScope extends Model
+{
+    // Table Name
+    protected $table = 'UserEsiScopes';
+
+    // Timestamps
+    public $timestamps = true;
+
+    public function user() {
+        return $this->belongsTo('App\User', 'character_id', 'character_id');
+    }
+}
diff --git a/app/Models/EsiToken.php b/app/Models/EsiToken.php
index b6033fc61..a00afdf97 100644
--- a/app/Models/EsiToken.php
+++ b/app/Models/EsiToken.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/HoldingCorpJournal.php b/app/Models/HoldingCorpJournal.php
index b4064de3e..3711162f9 100644
--- a/app/Models/HoldingCorpJournal.php
+++ b/app/Models/HoldingCorpJournal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/MarketOrder.php b/app/Models/MarketOrder.php
index efb9eadd4..5b5dc4122 100644
--- a/app/Models/MarketOrder.php
+++ b/app/Models/MarketOrder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/Structure.php b/app/Models/Structure.php
index 2f0f1157c..0d4bf52b2 100644
--- a/app/Models/Structure.php
+++ b/app/Models/Structure.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Models/UserRole.php b/app/Models/UserRole.php
index 7dce7010f..ac0178dba 100644
--- a/app/Models/UserRole.php
+++ b/app/Models/UserRole.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/User.php b/app/User.php
index d65b2e9c0..886265ea6 100644
--- a/app/User.php
+++ b/app/User.php
@@ -53,6 +53,10 @@ class User extends Authenticatable
     }
 
     public function roles() {
-        return $this->hasMany('App\UserRole');
+        return $this->hasMany('App\Models\UserRole');
+    }
+
+    public function esiscopes() {
+        return $this->hasMany('App\Models\EsiScope');
     }
 }
diff --git a/database/migrations/2018_10_29_003021_create_esi_tokens.php b/database/migrations/2018_10_29_003021_create_esi_tokens.php
index 1ab372890..8bc88d496 100644
--- a/database/migrations/2018_10_29_003021_create_esi_tokens.php
+++ b/database/migrations/2018_10_29_003021_create_esi_tokens.php
@@ -19,7 +19,6 @@ class CreateEsiTokens extends Migration
             $table->string('access_token');
             $table->string('refresh_token');
             $table->integer('expires_in');
-            $table->string('scopes');
             $table->timestamps();
         });
     }
diff --git a/database/migrations/2018_11_05_160450_create_user_esi_scopes.php b/database/migrations/2018_11_05_160450_create_user_esi_scopes.php
new file mode 100644
index 000000000..1c5543a0f
--- /dev/null
+++ b/database/migrations/2018_11_05_160450_create_user_esi_scopes.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUserEsiScopes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema:create('UserEsiScopes', function(Blueprint $table) {
+            $table->integer('id')->increments();
+            $table->integer('character_id');
+            $table->string('scope');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('UserEsiScopes');
+    }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 2af1c1cec..43b678a71 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -51,6 +51,7 @@ return array(
     'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php',
     'App\\Structure' => $baseDir . '/app/Models/Structure.php',
     'App\\User' => $baseDir . '/app/User.php',
+    'App\\UserRole' => $baseDir . '/app/Models/UserRole.php',
     'BeyondCode\\DumpServer\\DumpServerCommand' => $vendorDir . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php',
     'BeyondCode\\DumpServer\\DumpServerServiceProvider' => $vendorDir . '/beyondcode/laravel-dump-server/src/DumpServerServiceProvider.php',
     'BeyondCode\\DumpServer\\Dumper' => $vendorDir . '/beyondcode/laravel-dump-server/src/Dumper.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 20d09a35f..75fe5e68c 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -446,6 +446,7 @@ class ComposerStaticInitc3f953f8a7291d41a76e1664339777c9
         'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php',
         'App\\Structure' => __DIR__ . '/../..' . '/app/Models/Structure.php',
         'App\\User' => __DIR__ . '/../..' . '/app/User.php',
+        'App\\UserRole' => __DIR__ . '/../..' . '/app/Models/UserRole.php',
         'BeyondCode\\DumpServer\\DumpServerCommand' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/DumpServerCommand.php',
         'BeyondCode\\DumpServer\\DumpServerServiceProvider' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/DumpServerServiceProvider.php',
         'BeyondCode\\DumpServer\\Dumper' => __DIR__ . '/..' . '/beyondcode/laravel-dump-server/src/Dumper.php',