diff --git a/framework/core/src/Extend/ActivityType.php b/framework/core/src/Extend/ActivityType.php
index 92a86c079..0b3dcf59b 100644
--- a/framework/core/src/Extend/ActivityType.php
+++ b/framework/core/src/Extend/ActivityType.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 use Flarum\Core\Models\Activity;
 use Flarum\Api\Serializers\ActivitySerializer;
 
@@ -16,7 +16,7 @@ class ActivityType implements ExtenderInterface
         $this->serializer = $serializer;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         $class = $this->class;
 
diff --git a/framework/core/src/Extend/ApiInclude.php b/framework/core/src/Extend/ApiInclude.php
index 5a1f21ced..4336f69f8 100644
--- a/framework/core/src/Extend/ApiInclude.php
+++ b/framework/core/src/Extend/ApiInclude.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 
 class ApiInclude implements ExtenderInterface
 {
@@ -17,7 +17,7 @@ class ApiInclude implements ExtenderInterface
         $this->status = $status;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         foreach ((array) $this->actions as $action) {
             $parts = explode('.', $action);
diff --git a/framework/core/src/Extend/DiscussionGambit.php b/framework/core/src/Extend/DiscussionGambit.php
index e345409d2..b6b983fec 100644
--- a/framework/core/src/Extend/DiscussionGambit.php
+++ b/framework/core/src/Extend/DiscussionGambit.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 
 class DiscussionGambit implements ExtenderInterface
 {
@@ -11,9 +11,9 @@ class DiscussionGambit implements ExtenderInterface
         $this->class = $class;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
-        $app['events']->listen('Flarum\Core\Events\RegisterDiscussionGambits', function ($event) {
+        $container->make('events')->listen('Flarum\Core\Events\RegisterDiscussionGambits', function ($event) {
             $event->gambits->add($this->class);
         });
     }
diff --git a/framework/core/src/Extend/EventSubscribers.php b/framework/core/src/Extend/EventSubscribers.php
index 4fdb95a28..c8c391a1c 100644
--- a/framework/core/src/Extend/EventSubscribers.php
+++ b/framework/core/src/Extend/EventSubscribers.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 
 class EventSubscribers implements ExtenderInterface
 {
@@ -11,10 +11,10 @@ class EventSubscribers implements ExtenderInterface
         $this->subscribers = $subscribers;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         foreach ((array) $this->subscribers as $subscriber) {
-            $app['events']->subscribe($subscriber);
+            $container->make('events')->subscribe($subscriber);
         }
     }
 }
diff --git a/framework/core/src/Extend/ExtenderInterface.php b/framework/core/src/Extend/ExtenderInterface.php
index 0204c1520..adc96c30a 100644
--- a/framework/core/src/Extend/ExtenderInterface.php
+++ b/framework/core/src/Extend/ExtenderInterface.php
@@ -1,8 +1,8 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 
 interface ExtenderInterface
 {
-    public function extend(Application $app);
+    public function extend(Container $container);
 }
diff --git a/framework/core/src/Extend/Formatter.php b/framework/core/src/Extend/Formatter.php
index 06a0f5f0b..7e3f67181 100644
--- a/framework/core/src/Extend/Formatter.php
+++ b/framework/core/src/Extend/Formatter.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 
 class Formatter implements ExtenderInterface
 {
@@ -17,8 +17,8 @@ class Formatter implements ExtenderInterface
         $this->priority = $priority;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
-        $app['flarum.formatter']->add($this->name, $this->class, $this->priority);
+        $container->make('flarum.formatter')->add($this->name, $this->class, $this->priority);
     }
 }
diff --git a/framework/core/src/Extend/ForumAssets.php b/framework/core/src/Extend/ForumAssets.php
index 20fb0a260..f1cad8fde 100644
--- a/framework/core/src/Extend/ForumAssets.php
+++ b/framework/core/src/Extend/ForumAssets.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 
 class ForumAssets implements ExtenderInterface
 {
@@ -11,9 +11,9 @@ class ForumAssets implements ExtenderInterface
         $this->files = $files;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
-        $app['events']->listen('Flarum\Forum\Events\RenderView', function ($event) {
+        $container->make('events')->listen('Flarum\Forum\Events\RenderView', function ($event) {
             $event->assets->addFile($this->files);
         });
     }
diff --git a/framework/core/src/Extend/NotificationType.php b/framework/core/src/Extend/NotificationType.php
index e4558ef26..303b3db4a 100644
--- a/framework/core/src/Extend/NotificationType.php
+++ b/framework/core/src/Extend/NotificationType.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 use Flarum\Core\Models\Notification;
 use Flarum\Core\Models\User;
 use Flarum\Api\Serializers\NotificationSerializer;
@@ -26,7 +26,7 @@ class NotificationType implements ExtenderInterface
         return $this;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         $class = $this->class;
 
diff --git a/framework/core/src/Extend/Permission.php b/framework/core/src/Extend/Permission.php
index 0a8e99529..662c76c1b 100644
--- a/framework/core/src/Extend/Permission.php
+++ b/framework/core/src/Extend/Permission.php
@@ -1,8 +1,7 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 use Flarum\Core\Models\Permission as PermissionModel;
-use Flarum\Extend\SerializeAttributes;
 
 class Permission implements ExtenderInterface
 {
@@ -31,7 +30,7 @@ class Permission implements ExtenderInterface
         return $this;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         PermissionModel::addPermission($this->permission);
 
@@ -45,7 +44,7 @@ class Permission implements ExtenderInterface
                 }
             );
 
-            $extender->extend($app);
+            $extender->extend($container);
         }
 
         foreach ($this->grant as $callback) {
diff --git a/framework/core/src/Extend/PostType.php b/framework/core/src/Extend/PostType.php
index df77ccb78..97d051698 100644
--- a/framework/core/src/Extend/PostType.php
+++ b/framework/core/src/Extend/PostType.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 use Flarum\Core\Models\Post;
 
 class PostType implements ExtenderInterface
@@ -12,7 +12,7 @@ class PostType implements ExtenderInterface
         $this->class = $class;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         Post::addType($this->class);
     }
diff --git a/framework/core/src/Extend/Relationship.php b/framework/core/src/Extend/Relationship.php
index de16a6724..88d99e355 100644
--- a/framework/core/src/Extend/Relationship.php
+++ b/framework/core/src/Extend/Relationship.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 use Closure;
 
 class Relationship implements ExtenderInterface
@@ -21,7 +21,7 @@ class Relationship implements ExtenderInterface
         $this->child = $child;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         $parent = $this->parent;
 
diff --git a/framework/core/src/Extend/SerializeAttributes.php b/framework/core/src/Extend/SerializeAttributes.php
index d359ef1c6..e3d314889 100644
--- a/framework/core/src/Extend/SerializeAttributes.php
+++ b/framework/core/src/Extend/SerializeAttributes.php
@@ -1,7 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
-use Closure;
+use Illuminate\Contracts\Container\Container;
 
 class SerializeAttributes implements ExtenderInterface
 {
@@ -15,9 +14,9 @@ class SerializeAttributes implements ExtenderInterface
         $this->callback = $callback;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
-        $app['events']->listen('Flarum\Api\Events\SerializeAttributes', function ($event) {
+        $container->make('events')->listen('Flarum\Api\Events\SerializeAttributes', function ($event) {
             if ($event->serializer instanceof $this->serializer) {
                 call_user_func_array($this->callback, [&$event->attributes, $event->model, $event->serializer]);
             }
diff --git a/framework/core/src/Extend/SerializeRelationship.php b/framework/core/src/Extend/SerializeRelationship.php
index e5c94a255..3d52e0ea7 100644
--- a/framework/core/src/Extend/SerializeRelationship.php
+++ b/framework/core/src/Extend/SerializeRelationship.php
@@ -1,6 +1,6 @@
 <?php namespace Flarum\Extend;
 
-use Illuminate\Foundation\Application;
+use Illuminate\Contracts\Container\Container;
 use Closure;
 
 class SerializeRelationship implements ExtenderInterface
@@ -21,7 +21,7 @@ class SerializeRelationship implements ExtenderInterface
         $this->child = $child;
     }
 
-    public function extend(Application $app)
+    public function extend(Container $container)
     {
         $parent = $this->parent;