diff --git a/Models/Expense.php b/Models/Expense.php
index c13e777..4377b84 100644
--- a/Models/Expense.php
+++ b/Models/Expense.php
@@ -53,8 +53,6 @@ class Expense
      */
     public array $elements = [];
 
-    public array $media = [];
-
     public FloatInt $net;
 
     public FloatInt $gross;
@@ -69,8 +67,6 @@ class Expense
 
     public string $country = ISO3166TwoEnum::_USA;
 
-    public array $notes = [];
-
     public function __construct()
     {
         $this->type      = new BaseStringL11nType();
@@ -83,4 +79,7 @@ class Expense
         $this->gross = new FloatInt();
         $this->taxP  = new FloatInt();
     }
+
+    use \Modules\Media\Models\MediaListTrait;
+    use \Modules\Editor\Models\EditorDocListTrait;
 }
diff --git a/Models/ExpenseMapper.php b/Models/ExpenseMapper.php
index 3eb7581..0cfb36e 100644
--- a/Models/ExpenseMapper.php
+++ b/Models/ExpenseMapper.php
@@ -69,7 +69,7 @@ final class ExpenseMapper extends DataMapperFactory
             'self'         => 'bizexpenses_expense_element_expense',
             'external'     => null,
         ],
-        'media'        => [
+        'files'        => [
             'mapper'   => MediaMapper::class,
             'table'    => 'bizexpenses_expense_media',
             'external' => 'bizexpenses_expense_media_dst',