diff --git a/Admin/Installer.php b/Admin/Installer.php
index cb0cfdd..fea573d 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -121,10 +121,10 @@ final class Installer extends InstallerAbstract
     /**
      * Install default attribute types
      *
-     * @param ApplicationAbstract                                                                                                                                                              $app        Application
-     * @param array<array{name:string, l11n?:array<string, string>, is_required?:bool, is_custom_allowed?:bool, validation_pattern?:string, value_type?:string, values?:array<string, mixed>}> $attributes Attribute definition
+     * @param ApplicationAbstract $app        Application
+     * @param array               $attributes Attribute definition
      *
-     * @return array<string, array>
+     * @return array
      *
      * @since 1.0.0
      */
@@ -190,7 +190,7 @@ final class Installer extends InstallerAbstract
      * @param array                                                                                                                                                                            $clientAttrType Attribute types
      * @param array<array{name:string, l11n?:array<string, string>, is_required?:bool, is_custom_allowed?:bool, validation_pattern?:string, value_type?:string, values?:array<string, mixed>}> $attributes     Attribute definition
      *
-     * @return array<string, array>
+     * @return array
      *
      * @since 1.0.0
      */
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 49cc881..d2ae2ba 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -116,6 +116,7 @@ final class ApiController extends Controller
         $this->createModel($request->header->account, $client, ClientMapper::class, 'client', $request->getOrigin());
 
         // Set VAT Id
+        // @todo: move to separate function
         if ($request->hasData('vat_id')) {
             /** @var \Modules\Organization\Models\Unit $unit */
             $unit = UnitMapper::get()