diff --git a/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
index f991b08f..69b88ddb 100644
--- a/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
+++ b/app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
@@ -15,7 +15,7 @@ use CachetHQ\Cachet\Events\Incident\IncidentWasReportedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
-use McCool\LaravelAutoPresenter\PresenterDecorator;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
 
 class SendIncidentEmailNotificationHandler
 {
@@ -33,27 +33,18 @@ class SendIncidentEmailNotificationHandler
      */
     protected $subscriber;
 
-    /**
-     * The presenter instance.
-     *
-     * @var \McCool\LaravelAutoPresenter\PresenterDecorator
-     */
-    protected $presenter;
-
     /**
      * Create a new send incident email notification handler.
      *
-     * @param \Illuminate\Contracts\Mail\Mailer               $mailer
-     * @param \CachetHQ\Cachet\Models\Subscriber              $subscriber
-     * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter
+     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */
-    public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter)
+    public function __construct(MailQueue $mailer, Subscriber $subscriber)
     {
         $this->mailer = $mailer;
         $this->subscriber = $subscriber;
-        $this->presenter = $presenter;
     }
 
     /**
@@ -65,8 +56,8 @@ class SendIncidentEmailNotificationHandler
      */
     public function handle(IncidentWasReportedEvent $event)
     {
-        $incident = $this->presenter->decorate($event->incident);
-        $component = $this->presenter->decorate($event->incident->component);
+        $incident = AutoPresenter::decorate($event->incident);
+        $component = AutoPresenter::decorate($event->incident->component);
 
         // Only send emails for public incidents.
         if ($event->incident->visible === 1) {
diff --git a/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php b/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
index baaa44bb..8ce7e087 100644
--- a/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
+++ b/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
@@ -15,7 +15,7 @@ use CachetHQ\Cachet\Events\Incident\MaintenanceWasScheduledEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
-use McCool\LaravelAutoPresenter\PresenterDecorator;
+use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
 
 class SendMaintenanceEmailNotificationHandler
 {
@@ -33,27 +33,18 @@ class SendMaintenanceEmailNotificationHandler
      */
     protected $subscriber;
 
-    /**
-     * The presenter instance.
-     *
-     * @var \McCool\LaravelAutoPresenter\PresenterDecorator
-     */
-    protected $presenter;
-
     /**
      * Create a new send maintenance email notification handler.
      *
-     * @param \Illuminate\Contracts\Mail\Mailer               $mailer
-     * @param \CachetHQ\Cachet\Models\Subscriber              $subscriber
-     * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter
+     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
+     * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */
-    public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter)
+    public function __construct(MailQueue $mailer, Subscriber $subscriber)
     {
         $this->mailer = $mailer;
         $this->subscriber = $subscriber;
-        $this->presenter = $presenter;
     }
 
     /**
@@ -65,7 +56,7 @@ class SendMaintenanceEmailNotificationHandler
      */
     public function handle(MaintenanceWasScheduledEvent $event)
     {
-        $data = $this->presenter->decorate($event->incident);
+        $data = AutoPresenter::decorate($event->incident);
 
         foreach ($this->subscriber->all() as $subscriber) {
             $mail = [
diff --git a/app/Http/Controllers/Api/AbstractApiController.php b/app/Http/Controllers/Api/AbstractApiController.php
index 83d79b3a..57321409 100644
--- a/app/Http/Controllers/Api/AbstractApiController.php
+++ b/app/Http/Controllers/Api/AbstractApiController.php
@@ -167,7 +167,7 @@ abstract class AbstractApiController extends Controller
             $items = $items->sortBy($sortBy, SORT_REGULAR, $direction);
         }
 
-        return $this->setMetaData($pagination)->setData(AutoPresenter::decorate($items->values()->all()))->respond();
+        return $this->setMetaData($pagination)->setData(AutoPresenter::decorate($items->values()))->respond();
     }
 
     /**
diff --git a/composer.json b/composer.json
index 554a9b4e..eaf7f0e2 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "graham-campbell/exceptions": "^5.0",
         "guzzlehttp/guzzle": "^6.1",
         "jenssegers/date": "^3.0",
-        "mccool/laravel-auto-presenter": "^3.1",
+        "mccool/laravel-auto-presenter": "^4.1",
         "pragmarx/google2fa": "^0.5",
         "roumen/feed": "^2.9"
     },
diff --git a/composer.lock b/composer.lock
index d698b50c..f200e878 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "58acc2efec4edb917a4a9fd95e72f4e5",
-    "content-hash": "62a58832c59c8d3e85df5d66eecea81b",
+    "hash": "0274bcccebdc8a85ed2cd0a6ed741d82",
+    "content-hash": "970ad112175be43dd50ecc5f022b6772",
     "packages": [
         {
             "name": "alt-three/emoji",
@@ -1961,34 +1961,36 @@
         },
         {
             "name": "mccool/laravel-auto-presenter",
-            "version": "3.1.1",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel-auto-presenter/laravel-auto-presenter.git",
-                "reference": "0f77299f7e4e5e017da175583c85bf24fa85c118"
+                "reference": "3f1c9d3ef8a1cc5d78dea2654058145c2920f25e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel-auto-presenter/laravel-auto-presenter/zipball/0f77299f7e4e5e017da175583c85bf24fa85c118",
-                "reference": "0f77299f7e4e5e017da175583c85bf24fa85c118",
+                "url": "https://api.github.com/repos/laravel-auto-presenter/laravel-auto-presenter/zipball/3f1c9d3ef8a1cc5d78dea2654058145c2920f25e",
+                "reference": "3f1c9d3ef8a1cc5d78dea2654058145c2920f25e",
                 "shasum": ""
             },
             "require": {
-                "illuminate/container": "~5.0",
-                "illuminate/contracts": "~5.0",
-                "illuminate/events": "~5.0",
-                "illuminate/pagination": "~5.0",
-                "illuminate/support": "~5.0",
-                "illuminate/view": "~5.0",
-                "php": ">=5.5.0"
+                "illuminate/container": "5.1.*",
+                "illuminate/contracts": "5.1.*",
+                "illuminate/events": "5.1.*",
+                "illuminate/pagination": "5.1.*",
+                "illuminate/support": "5.1.*",
+                "illuminate/view": "5.1.*",
+                "php": ">=5.5.9"
             },
             "require-dev": {
-                "graham-campbell/testbench": "~2.0"
+                "graham-campbell/testbench": "~3.0",
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "~4.8|~5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "4.1-dev"
                 }
             },
             "autoload": {
@@ -2017,7 +2019,7 @@
                 "lpm",
                 "presenter"
             ],
-            "time": "2015-06-26 09:15:40"
+            "time": "2015-10-04 11:19:41"
         },
         {
             "name": "monolog/monolog",
diff --git a/config/app.php b/config/app.php
index 556ed61c..7fe105ef 100644
--- a/config/app.php
+++ b/config/app.php
@@ -159,7 +159,7 @@ return [
         'GrahamCampbell\Security\SecurityServiceProvider',
         'GrahamCampbell\Throttle\ThrottleServiceProvider',
         'Jenssegers\Date\DateServiceProvider',
-        'McCool\LaravelAutoPresenter\LaravelAutoPresenterServiceProvider',
+        'McCool\LaravelAutoPresenter\AutoPresenterServiceProvider',
         'PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider',
         'Roumen\Feed\FeedServiceProvider',