diff --git a/Admin/Installer.php b/Admin/Installer.php
index 73c0808..54d4b57 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -17,6 +17,7 @@ namespace Modules\Messages\Admin;
 
 use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\DataStorage\Database\Pool;
+use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
 /**
diff --git a/Admin/Routes/http.php b/Admin/Routes/http.php
index 492b754..bb1fecf 100644
--- a/Admin/Routes/http.php
+++ b/Admin/Routes/http.php
@@ -1,5 +1,7 @@
 <?php
 
+use phpOMS\Router\RouteVerb;
+
 return [
     '^.*/backend/messages/dashboard.*$' => [
         [
diff --git a/Controller.php b/Controller.php
index ec84b4e..a196512 100644
--- a/Controller.php
+++ b/Controller.php
@@ -90,7 +90,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewMessageInbox(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewMessageInbox(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/dashboard');
@@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewMessageOutbox(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewMessageOutbox(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-out-view');
@@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewMessageTrash(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewMessageTrash(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-trash-view');
@@ -147,7 +147,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewMessageSpam(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewMessageSpam(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-spam-view');
@@ -166,7 +166,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewMessageView(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewMessageView(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-view');
@@ -186,7 +186,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewMessageCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewMessageCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/mail-create');
@@ -205,7 +205,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewMessageSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewMessageSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/Messages/Theme/Backend/message-settings');
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 645d5cf..246e85a 100644
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Messages'] = [
+return ['Messages' => [
     'All'           => 'All',
     'AverageAmount' => 'Avg. Amount',
     'BCC'           => 'BCC',
@@ -40,4 +40,4 @@ $MODLANG['Messages'] = [
     'Trash'         => 'Trash',
     'Week'          => 'Week',
     'Year'          => 'Year',
-];
+]];
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index 9258387..eef9e85 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -13,7 +13,7 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
+return ['Navigation' => [
     'Draft'    => 'Draft',
     'Inbox'    => 'Inbox',
     'Messages' => 'Messages',
@@ -21,4 +21,4 @@ $MODLANG['Navigation'] = [
     'Settings' => 'Settings',
     'Spam'     => 'Spam',
     'Trash'    => 'Trash',
-];
+]];