diff --git a/Admin/Installer.php b/Admin/Installer.php
index c8e6419..5eaf6c9 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -71,10 +71,10 @@ final class Installer extends InstallerAbstract
     /**
      * Install fuel type
      *
-     * @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               $types Type definition
      *
-     * @return array<string, array>
+     * @return array
      *
      * @since 1.0.0
      */
@@ -132,10 +132,10 @@ final class Installer extends InstallerAbstract
     /**
      * Install fuel type
      *
-     * @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               $types Type definition
      *
-     * @return array<string, array>
+     * @return array
      *
      * @since 1.0.0
      */
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index f519cbd..d27ff0d 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -565,6 +565,7 @@ final class ApiController extends Controller
                 }
 
                 if ($collection === null) {
+                    /** @var \Modules\Media\Models\Collection $collection */
                     $collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
 
                     if ($collection->id === 0) {
@@ -702,7 +703,7 @@ final class ApiController extends Controller
     {
         if (!empty($val = $this->validateNoteCreate($request))) {
             $response->data['expense_note_create'] = new FormValidation($val);
-            $response->header->status           = RequestStatusCode::R_400;
+            $response->header->status              = RequestStatusCode::R_400;
 
             return;
         }
diff --git a/Models/Expense.php b/Models/Expense.php
index 4377b84..e24e24e 100644
--- a/Models/Expense.php
+++ b/Models/Expense.php
@@ -67,6 +67,11 @@ class Expense
 
     public string $country = ISO3166TwoEnum::_USA;
 
+    /**
+     * Constructor.
+     *
+     * @since 1.0.0
+     */
     public function __construct()
     {
         $this->type      = new BaseStringL11nType();
diff --git a/Models/ExpenseElement.php b/Models/ExpenseElement.php
index 4e73a36..ebe2d70 100644
--- a/Models/ExpenseElement.php
+++ b/Models/ExpenseElement.php
@@ -66,6 +66,11 @@ class ExpenseElement
 
     public \DateTime $end;
 
+    /**
+     * Constructor.
+     *
+     * @since 1.0.0
+     */
     public function __construct()
     {
         $this->type     = new BaseStringL11nType();
diff --git a/Models/ExpenseElementMapper.php b/Models/ExpenseElementMapper.php
index ebe39e3..067dd8a 100644
--- a/Models/ExpenseElementMapper.php
+++ b/Models/ExpenseElementMapper.php
@@ -18,6 +18,7 @@ use Modules\Admin\Models\AccountMapper;
 use Modules\Media\Models\MediaMapper;
 use Modules\SupplierManagement\Models\SupplierMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
+use phpOMS\Localization\BaseStringL11n;
 
 /**
  *  mapper class.
diff --git a/Models/ExpenseMapper.php b/Models/ExpenseMapper.php
index 0cfb36e..fa79b65 100644
--- a/Models/ExpenseMapper.php
+++ b/Models/ExpenseMapper.php
@@ -27,7 +27,7 @@ use Modules\Editor\Models\EditorDocMapper;
  * @link    https://jingga.app
  * @since   1.0.0
  *
- * @template T of BaseStringL11n
+ * @template T of Expense
  * @extends DataMapperFactory<T>
  */
 final class ExpenseMapper extends DataMapperFactory