diff --git a/Admin/Installer.php b/Admin/Installer.php
index 8c08dc9..fcbb763 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -17,6 +17,7 @@ namespace Modules\RiskManagement\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 836511c..f9f0406 100644
--- a/Admin/Routes/http.php
+++ b/Admin/Routes/http.php
@@ -1,5 +1,7 @@
 <?php
 
+use phpOMS\Router\RouteVerb;
+
 return [
     '^.*/backend/controlling/riskmanagement/cockpit.*$' => [
         [
diff --git a/Controller.php b/Controller.php
index 0c18dca..71bb7c1 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 viewRiskCockpit(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskCockpit(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cockpit');
@@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-list');
@@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskCauseList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskCauseList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-list');
@@ -147,7 +147,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskSolutionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskSolutionList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-list');
@@ -166,7 +166,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskUnitList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskUnitList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/unit-list');
@@ -185,7 +185,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskDepartmentList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/department-list');
@@ -204,7 +204,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskCategoryList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskCategoryList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/category-list');
@@ -223,7 +223,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskProjectList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskProjectList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/project-list');
@@ -242,7 +242,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskProcessList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskProcessList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-list');
@@ -261,7 +261,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewRiskSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewRiskSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/RiskManagement/Theme/Backend/settings-dashboard');
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index bb21e4b..cf4c92f 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' => [
     'Categories'     => 'Categories',
     'Causes'         => 'Causes',
     'Cockpit'        => 'Cockpit',
@@ -27,4 +27,4 @@ $MODLANG['Navigation'] = [
     'Settings'       => 'Settings',
     'Solutions'      => 'Solutions',
     'Units'          => 'Units',
-];
+]];
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index 5a8ed0b..817f1da 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['RiskManagement'] = [
+return ['RiskManagement' => [
     'Active'            => 'Active',
     'All'               => 'All',
     'AvgRiskAmount'     => 'Avg. Risk Amount',
@@ -79,4 +79,4 @@ $MODLANG['RiskManagement'] = [
     'Unit'              => 'Unit',
     'Units'             => 'Units',
     'Watchlist'         => 'Watchlist',
-];
+]];
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index bb21e4b..cf4c92f 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' => [
     'Categories'     => 'Categories',
     'Causes'         => 'Causes',
     'Cockpit'        => 'Cockpit',
@@ -27,4 +27,4 @@ $MODLANG['Navigation'] = [
     'Settings'       => 'Settings',
     'Solutions'      => 'Solutions',
     'Units'          => 'Units',
-];
+]];
diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php
index 5a8ed0b..817f1da 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['RiskManagement'] = [
+return ['RiskManagement' => [
     'Active'            => 'Active',
     'All'               => 'All',
     'AvgRiskAmount'     => 'Avg. Risk Amount',
@@ -79,4 +79,4 @@ $MODLANG['RiskManagement'] = [
     'Unit'              => 'Unit',
     'Units'             => 'Units',
     'Watchlist'         => 'Watchlist',
-];
+]];