diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index b356600..da87f4b 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -58,7 +58,7 @@ final class ApiController extends Controller
     public function apiContractCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         if (!empty($val = $this->validateContractCreate($request))) {
-            $response->set('contract_create', new FormValidation($val));
+            $response->data['contract_create'] = new FormValidation($val);
             $response->header->status = RequestStatusCode::R_400;
 
             return;
@@ -147,7 +147,7 @@ final class ApiController extends Controller
      */
     public function apiContractDocumentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
-        $uploadedFiles = $request->getFiles();
+        $uploadedFiles = $request->files;
 
         if (empty($uploadedFiles)) {
             $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Contract', 'Invalid contract image', $uploadedFiles);
@@ -214,7 +214,7 @@ final class ApiController extends Controller
     public function apiContractTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         if (!empty($val = $this->validateContractTypeCreate($request))) {
-            $response->set('contract_type_create', new FormValidation($val));
+            $response->data['contract_type_create'] = new FormValidation($val);
             $response->header->status = RequestStatusCode::R_400;
 
             return;
@@ -280,7 +280,7 @@ final class ApiController extends Controller
     public function apiContractTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
         if (!empty($val = $this->validateContractTypeL11nCreate($request))) {
-            $response->set('contract_type_create', new FormValidation($val));
+            $response->data['contract_type_create'] = new FormValidation($val);
             $response->header->status = RequestStatusCode::R_400;
 
             return;
diff --git a/Models/Contract.php b/Models/Contract.php
index 871c999..53be8a7 100755
--- a/Models/Contract.php
+++ b/Models/Contract.php
@@ -42,14 +42,6 @@ class Contract
 
     public bool $isTemplate = false;
 
-    /**
-     * Files.
-     *
-     * @var Media[]
-     * @since 1.0.0
-     */
-    private array $files = [];
-
     public string $title = '';
 
     public string $description = '';
@@ -106,18 +98,6 @@ class Contract
         $this->account   = new NullAccount();
     }
 
-    /**
-     * Get files
-     *
-     * @return Media[]
-     *
-     * @since 1.0.0
-     */
-    public function getFiles() : array
-    {
-        return $this->files;
-    }
-
     /**
      * Add media to item
      *
@@ -159,4 +139,6 @@ class Contract
     {
         return $this->toArray();
     }
+
+    use \Modules\Media\Models\MediaListTrait;
 }
diff --git a/Theme/Backend/contract-single.tpl.php b/Theme/Backend/contract-single.tpl.php
index 9d09305..a0d0aac 100755
--- a/Theme/Backend/contract-single.tpl.php
+++ b/Theme/Backend/contract-single.tpl.php
@@ -19,7 +19,7 @@ use phpOMS\Uri\UriFactory;
  * @var \Modules\ContractManagement\Models\Contract $contract
  */
 $contract     = $this->getData('contract');
-$contractFile = $contract->getFiles();
+$contractFile = $contract->files;
 
 echo $this->getData('nav')->render(); ?>
 
diff --git a/tests/Models/ContractTest.php b/tests/Models/ContractTest.php
index 14dc3be..1c358ca 100755
--- a/tests/Models/ContractTest.php
+++ b/tests/Models/ContractTest.php
@@ -40,7 +40,7 @@ final class ContractTest extends \PHPUnit\Framework\TestCase
     public function testDefault() : void
     {
         self::assertEquals(0, $this->contract->id);
-        self::assertEquals([], $this->contract->getFiles());
+        self::assertEquals([], $this->contract->files);
     }
 
     /**
@@ -50,7 +50,7 @@ final class ContractTest extends \PHPUnit\Framework\TestCase
     public function testMediaInputOutput() : void
     {
         $this->contract->addFile(new Media());
-        self::assertCount(1, $this->contract->getFiles());
+        self::assertCount(1, $this->contract->files);
     }
 
     /**