diff --git a/Admin/Installer.php b/Admin/Installer.php
index e8e85d3..b405317 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -17,6 +17,7 @@ namespace Modules\ResearchDevelopment\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 eef5d68..1ac99e5 100644
--- a/Admin/Routes/http.php
+++ b/Admin/Routes/http.php
@@ -1,5 +1,7 @@
 <?php
 
+use phpOMS\Router\RouteVerb;
+
 return [
     '^.*/backend/rnd/list.*$' => [
         [
diff --git a/Controller.php b/Controller.php
index 2802f61..043c849 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 viewProjectList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewProjectList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/ResearchDevelopment/Theme/Backend/rnd-list');
@@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface
      * @since  1.0.0
      * @author Dennis Eichhorn <d.eichhorn@oms.com>
      */
-    public function viewProjectCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
+    public function viewProjectCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
     {
         $view = new View($this->app, $request, $response);
         $view->setTemplate('/Modules/ResearchDevelopment/Theme/Backend/rnd-create');
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index d38d34e..8b0498a 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' => [
     'Projects' => 'Projects',
     'RnD'      => 'R&D',
-];
+]];
diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php
index d38d34e..8b0498a 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' => [
     'Projects' => 'Projects',
     'RnD'      => 'R&D',
-];
+]];
diff --git a/Theme/backend/Lang/en.lang.php b/Theme/backend/Lang/en.lang.php
index fa50f2e..d97b740 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['ResearchDevelopment'] = [
+return ['ResearchDevelopment' => [
     'Active'         => 'Active',
     'Budget'         => 'Budget',
     'Canceled'       => 'Canceled',
@@ -34,4 +34,4 @@ $MODLANG['ResearchDevelopment'] = [
     'Start'          => 'Start',
     'Status'         => 'Status',
     'UserGroup'      => 'User/Group',
-];
+]];