diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 09cdf707..7c60c928 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -4,7 +4,6 @@ namespace CachetHQ\Cachet\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
-use Watson\Validating\ValidatingTrait;
 
 /**
  * @property int            $id
@@ -15,8 +14,6 @@ use Watson\Validating\ValidatingTrait;
  */
 class Tag extends Model
 {
-    use ValidatingTrait;
-
     /**
      * The fillable properties.
      *
diff --git a/app/Providers/LoadConfigServiceProvider.php b/app/Providers/LoadConfigServiceProvider.php
index a03e1041..3611617e 100644
--- a/app/Providers/LoadConfigServiceProvider.php
+++ b/app/Providers/LoadConfigServiceProvider.php
@@ -28,7 +28,7 @@ class LoadConfigServiceProvider extends ServiceProvider
         // Set the Segment.com settings.
         $segmentRepository = $this->app->make('CachetHQ\Cachet\Segment\RepositoryInterface');
         try {
-            $this->app->config->set('cachethq/segment::write_key', $segmentRepository->fetch());
+            $this->app->config->set('segment.write_key', $segmentRepository->fetch());
         } catch (\GuzzleHttp\Exception\ConnectException $e) {
             // We may not have any connection. Let's not cry about it.
         }
diff --git a/config/app.php b/config/app.php
index b19dce0b..9d3f9716 100644
--- a/config/app.php
+++ b/config/app.php
@@ -164,6 +164,7 @@ return [
         'CachetHQ\Cachet\Providers\SegmentApiServiceProvider',
         'CachetHQ\Cachet\Providers\ViewComposerServiceProvider',
         'CachetHQ\Cachet\Providers\LoadConfigServiceProvider',
+        'CachetHQ\Segment\SegmentServiceProvider',
 
     ],
 
diff --git a/config/segment.php b/config/segment.php
new file mode 100644
index 00000000..99013600
--- /dev/null
+++ b/config/segment.php
@@ -0,0 +1,21 @@
+<?php
+
+return [
+    /*
+     * Whether to enable Segment or not.
+     */
+    'enabled' => true,
+
+    /*
+     * The key which enables you to write to the Segment.com API.
+     */
+    'write_key' => '',
+
+    /*
+     * Other configurations. Currently unused.
+     */
+    'consumer'      => 'socket',
+    'debug'         => false,
+    'ssl'           => true,
+    'error_handler' => null,
+];