diff --git a/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php b/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php
index 9e364d89b..aed5c090f 100644
--- a/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php
+++ b/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-use Flarum\Core\Group;
 use Flarum\Database\Migration;
+use Flarum\Group\Group;
 
 return Migration::addPermissions([
     'discussion.startWithoutApproval' => Group::MEMBER_ID,
diff --git a/extensions/approval/src/Access/TagPolicy.php b/extensions/approval/src/Access/TagPolicy.php
index c22f71124..228481b2f 100755
--- a/extensions/approval/src/Access/TagPolicy.php
+++ b/extensions/approval/src/Access/TagPolicy.php
@@ -11,9 +11,9 @@
 
 namespace Flarum\Approval\Access;
 
-use Flarum\Core\Access\AbstractPolicy;
-use Flarum\Core\User;
 use Flarum\Tags\Tag;
+use Flarum\User\AbstractPolicy;
+use Flarum\User\User;
 
 class TagPolicy extends AbstractPolicy
 {
diff --git a/extensions/approval/src/Event/PostWasApproved.php b/extensions/approval/src/Event/PostWasApproved.php
index 0d42e8239..a726b24ce 100644
--- a/extensions/approval/src/Event/PostWasApproved.php
+++ b/extensions/approval/src/Event/PostWasApproved.php
@@ -11,8 +11,8 @@
 
 namespace Flarum\Approval\Event;
 
-use Flarum\Core\Post;
-use Flarum\Core\User;
+use Flarum\Post\Post;
+use Flarum\User\User;
 
 class PostWasApproved
 {
diff --git a/extensions/approval/src/Listener/AddClientAssets.php b/extensions/approval/src/Listener/AddClientAssets.php
index aa96af1ed..96243d6aa 100644
--- a/extensions/approval/src/Listener/AddClientAssets.php
+++ b/extensions/approval/src/Listener/AddClientAssets.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Approval\Listener;
 
-use Flarum\Event\ConfigureWebApp;
+use Flarum\Frontend\Event\Rendering;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class AddClientAssets
@@ -21,13 +21,13 @@ class AddClientAssets
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(ConfigureWebApp::class, [$this, 'addAssets']);
+        $events->listen(Rendering::class, [$this, 'addAssets']);
     }
 
     /**
-     * @param ConfigureClientView $event
+     * @param Rendering $event
      */
-    public function addAssets(ConfigureWebApp $event)
+    public function addAssets(Rendering $event)
     {
         if ($event->isForum()) {
             $event->addAssets([
diff --git a/extensions/approval/src/Listener/AddPostApprovalAttributes.php b/extensions/approval/src/Listener/AddPostApprovalAttributes.php
index 62908fdd7..d8b479383 100644
--- a/extensions/approval/src/Listener/AddPostApprovalAttributes.php
+++ b/extensions/approval/src/Listener/AddPostApprovalAttributes.php
@@ -11,10 +11,9 @@
 
 namespace Flarum\Approval\Listener;
 
-use Flarum\Api\Serializer\DiscussionBasicSerializer;
-use Flarum\Api\Serializer\PostBasicSerializer;
+use Flarum\Api\Event\Serializing;
+use Flarum\Api\Serializer\BasicDiscussionSerializer;
 use Flarum\Api\Serializer\PostSerializer;
-use Flarum\Event\PrepareApiAttributes;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class AddPostApprovalAttributes
@@ -24,16 +23,16 @@ class AddPostApprovalAttributes
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(PrepareApiAttributes::class, [$this, 'addApiAttributes']);
+        $events->listen(Serializing::class, [$this, 'addApiAttributes']);
     }
 
     /**
-     * @param PrepareApiAttributes $event
+     * @param Serializing $event
      */
-    public function addApiAttributes(PrepareApiAttributes $event)
+    public function addApiAttributes(Serializing $event)
     {
-        if ($event->isSerializer(DiscussionBasicSerializer::class)
-            || $event->isSerializer(PostBasicSerializer::class)) {
+        if ($event->isSerializer(BasicDiscussionSerializer::class)
+            || $event->isSerializer(PostSerializer::class)) {
             $event->attributes['isApproved'] = (bool) $event->model->is_approved;
         }
 
diff --git a/extensions/approval/src/Listener/ApproveContent.php b/extensions/approval/src/Listener/ApproveContent.php
index 29a78bd93..4b941400f 100644
--- a/extensions/approval/src/Listener/ApproveContent.php
+++ b/extensions/approval/src/Listener/ApproveContent.php
@@ -12,8 +12,8 @@
 namespace Flarum\Approval\Listener;
 
 use Flarum\Approval\Event\PostWasApproved;
-use Flarum\Core\Access\AssertPermissionTrait;
-use Flarum\Event\PostWillBeSaved;
+use Flarum\Post\Event\Saving;
+use Flarum\User\AssertPermissionTrait;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class ApproveContent
@@ -25,14 +25,14 @@ class ApproveContent
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(PostWillBeSaved::class, [$this, 'approvePost']);
+        $events->listen(Saving::class, [$this, 'approvePost']);
         $events->listen(PostWasApproved::class, [$this, 'approveDiscussion']);
     }
 
     /**
-     * @param PostWillBeSaved $event
+     * @param Saving $event
      */
-    public function approvePost(PostWillBeSaved $event)
+    public function approvePost(Saving $event)
     {
         $attributes = $event->data['attributes'];
         $post = $event->post;
@@ -58,13 +58,15 @@ class ApproveContent
     public function approveDiscussion(PostWasApproved $event)
     {
         $post = $event->post;
+        $discussion = $post->discussion;
 
-        $post->discussion->refreshCommentsCount();
-        $post->discussion->refreshLastPost();
+        $discussion->refreshCommentsCount();
+        $discussion->refreshLastPost();
 
         if ($post->number == 1) {
-            $post->discussion->is_approved = true;
+            $discussion->is_approved = true;
         }
-        $post->discussion->save();
+
+        $discussion->save();
     }
 }
diff --git a/extensions/approval/src/Listener/HideUnapprovedContent.php b/extensions/approval/src/Listener/HideUnapprovedContent.php
index 71e44c45c..2a3491636 100644
--- a/extensions/approval/src/Listener/HideUnapprovedContent.php
+++ b/extensions/approval/src/Listener/HideUnapprovedContent.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Approval\Listener;
 
-use Flarum\Core\Discussion;
+use Flarum\Discussion\Discussion;
 use Flarum\Event\ScopeHiddenDiscussionVisibility;
 use Flarum\Event\ScopeModelVisibility;
 use Flarum\Event\ScopePostVisibility;
diff --git a/extensions/approval/src/Listener/UnapproveNewContent.php b/extensions/approval/src/Listener/UnapproveNewContent.php
index 6a08d69f9..b3a02b238 100644
--- a/extensions/approval/src/Listener/UnapproveNewContent.php
+++ b/extensions/approval/src/Listener/UnapproveNewContent.php
@@ -11,10 +11,10 @@
 
 namespace Flarum\Approval\Listener;
 
-use Flarum\Core\Post;
 use Flarum\Event\ConfigureModelDefaultAttributes;
-use Flarum\Event\PostWillBeSaved;
 use Flarum\Flags\Flag;
+use Flarum\Post\Event\Saving;
+use Flarum\Post\Post;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class UnapproveNewContent
@@ -25,7 +25,7 @@ class UnapproveNewContent
     public function subscribe(Dispatcher $events)
     {
         $events->listen(ConfigureModelDefaultAttributes::class, [$this, 'approveByDefault']);
-        $events->listen(PostWillBeSaved::class, [$this, 'unapproveNewPosts']);
+        $events->listen(Saving::class, [$this, 'unapproveNewPosts']);
     }
 
     /**
@@ -39,9 +39,9 @@ class UnapproveNewContent
     }
 
     /**
-     * @param PostWillBeSaved $event
+     * @param Saving $event
      */
-    public function unapproveNewPosts(PostWillBeSaved $event)
+    public function unapproveNewPosts(Saving $event)
     {
         $post = $event->post;