diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index 01b0c92..7164c97 100644
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -44,7 +44,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -52,7 +52,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -71,7 +71,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -79,7 +79,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeTypeL11nCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -98,7 +98,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -106,7 +106,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeTypeCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -125,7 +125,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -133,7 +133,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeValueCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -167,7 +167,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -175,7 +175,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeValueL11nCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -194,7 +194,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -202,7 +202,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -245,7 +245,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -253,7 +253,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeDelete($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -282,7 +282,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -290,7 +290,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeTypeL11nUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeTypeL11nUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeTypeL11nUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -312,7 +312,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -320,7 +320,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeTypeL11nDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeTypeL11nDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeTypeL11nDelete($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -340,7 +340,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -348,7 +348,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeTypeUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeTypeUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeTypeUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -370,7 +370,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -380,7 +380,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeTypeDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeTypeDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeTypeDelete($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -400,7 +400,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -408,7 +408,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeValueUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeValueUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeValueUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -437,7 +437,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -445,7 +445,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         // @todo: I don't think values can be deleted? Only Attributes
         // However, It should be possible to remove UNUSED default values
@@ -468,7 +468,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -476,7 +476,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeValueL11nUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeValueL11nUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeValueL11nUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -498,7 +498,7 @@ final class ApiAttributeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -506,7 +506,7 @@ final class ApiAttributeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractAttributeValueL11nDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractAttributeValueL11nDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateAttributeValueL11nDelete($request))) {
             $response->header->status = RequestStatusCode::R_400;
diff --git a/Controller/ApiContractTypeController.php b/Controller/ApiContractTypeController.php
index d86c47d..3e3079e 100644
--- a/Controller/ApiContractTypeController.php
+++ b/Controller/ApiContractTypeController.php
@@ -39,7 +39,7 @@ final class ApiContractTypeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -47,7 +47,7 @@ final class ApiContractTypeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractTypeCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractTypeCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -104,7 +104,7 @@ final class ApiContractTypeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -112,7 +112,7 @@ final class ApiContractTypeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractTypeL11nCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -173,7 +173,7 @@ final class ApiContractTypeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -181,7 +181,7 @@ final class ApiContractTypeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractTypeUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractTypeUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractTypeUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -243,7 +243,7 @@ final class ApiContractTypeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -251,7 +251,7 @@ final class ApiContractTypeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractTypeDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractTypeDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractTypeDelete($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -290,7 +290,7 @@ final class ApiContractTypeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -298,7 +298,7 @@ final class ApiContractTypeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractTypeL11nUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractTypeL11nUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractTypeL11nUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -359,7 +359,7 @@ final class ApiContractTypeController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -367,7 +367,7 @@ final class ApiContractTypeController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractTypeL11nDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractTypeL11nDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractTypeL11nDelete($request))) {
             $response->header->status = RequestStatusCode::R_400;
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index ca4c427..809298f 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -40,7 +40,7 @@ final class ApiController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -48,7 +48,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractCreate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -130,7 +130,7 @@ final class ApiController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -138,7 +138,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractDocumentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractDocumentCreate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         $uploadedFiles = $request->files;
 
@@ -202,7 +202,7 @@ final class ApiController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -210,7 +210,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractUpdate($request))) {
             $response->header->status = RequestStatusCode::R_400;
@@ -280,7 +280,7 @@ final class ApiController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return void
      *
@@ -288,7 +288,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiContractDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
+    public function apiContractDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
     {
         if (!empty($val = $this->validateContractDelete($request))) {
             $response->header->status = RequestStatusCode::R_400;
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b944d54..79bf26c 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -40,14 +40,14 @@ final class BackendController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return RenderableInterface
      *
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewContractList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
+    public function viewContractList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
@@ -74,14 +74,14 @@ final class BackendController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return RenderableInterface
      *
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewContractTypeList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
+    public function viewContractTypeList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
@@ -109,14 +109,14 @@ final class BackendController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return RenderableInterface
      *
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewContractType(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
+    public function viewContractType(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
 
@@ -139,14 +139,14 @@ final class BackendController extends Controller
      *
      * @param RequestAbstract  $request  Request
      * @param ResponseAbstract $response Response
-     * @param mixed            $data     Generic data
+     * @param array            $data     Generic data
      *
      * @return RenderableInterface
      *
      * @since 1.0.0
      * @codeCoverageIgnore
      */
-    public function viewContract(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
+    public function viewContract(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);