diff --git a/Admin/Installer.php b/Admin/Installer.php
index 9db88fc..6086168 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -17,6 +17,7 @@ namespace Modules\ClientManagement\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 49f4cee..02b9f80 100644
--- a/Admin/Routes/http.php
+++ b/Admin/Routes/http.php
@@ -1,5 +1,7 @@
 <?php
 
+use phpOMS\Router\RouteVerb;
+
 return [
     '^.*/backend/sales/client/list.*$' => [
         [
diff --git a/Controller.php b/Controller.php
index bf12a61..2351b93 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 viewClientManagementClientList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewClientManagementClientList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/clients-list');
@@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewClientManagementClientCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewClientManagementClientCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/clients-create');
@@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewClientManagementClientProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewClientManagementClientProfile(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/ClientManagement/Theme/Backend/clients-profile');
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index a69e30e..568e100 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['ClientManagement'] = [
+return ['ClientManagement' => [
     'Accounting'   => 'Accounting',
     'Address'      => 'Address',
     'Addresses'    => 'Addresses',
@@ -61,4 +61,4 @@ $MODLANG['ClientManagement'] = [
     'Type'         => 'Type',
     'Wire'         => 'Wire',
     'Zip'          => 'Zip',
-];
+]];
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index a2fa112..754d136 100644
--- a/Theme/backend/Lang/Navigation.en.lang.php
+++ b/Theme/backend/Lang/Navigation.en.lang.php
@@ -13,5 +13,5 @@
  * @version    1.0.0
  * @link       http://orange-management.com
  */
-$MODLANG['Navigation'] = [
-];
+return ['Navigation' => [
+]];