diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 6b919f5..fa5e41e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -104,7 +104,7 @@ final class ApiController extends Controller
     private function createContractDir(Contract $contract) : string
     {
         return '/Modules/ContractManagement/Contract/'
-            . $contract->getId();
+            . $contract->id;
     }
 
     /**
@@ -178,7 +178,7 @@ final class ApiController extends Controller
             foreach ($uploaded as $file) {
                 $this->createModelRelation(
                     $request->header->account,
-                    $file->getId(),
+                    $file->id,
                     $request->getDataInt('type'),
                     MediaMapper::class,
                     'types',
@@ -191,7 +191,7 @@ final class ApiController extends Controller
         $this->createModelRelation(
             $request->header->account,
             (int) $request->getData('contract'),
-            \reset($uploaded)->getId(),
+            \reset($uploaded)->id,
             ContractMapper::class, 'files', '', $request->getOrigin()
         );
 
diff --git a/Models/Contract.php b/Models/Contract.php
index 900a162..bf2abcd 100755
--- a/Models/Contract.php
+++ b/Models/Contract.php
@@ -36,7 +36,7 @@ class Contract
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     public ?int $parent = null;
 
diff --git a/Models/ContractType.php b/Models/ContractType.php
index c83a236..dfa2e78 100755
--- a/Models/ContractType.php
+++ b/Models/ContractType.php
@@ -33,7 +33,7 @@ class ContractType implements \JsonSerializable
      * @var int
      * @since 1.0.0
      */
-    protected int $id = 0;
+    public int $id = 0;
 
     /**
      * Name.
diff --git a/Theme/Backend/contract-list.tpl.php b/Theme/Backend/contract-list.tpl.php
index 79305ab..cfe04dc 100755
--- a/Theme/Backend/contract-list.tpl.php
+++ b/Theme/Backend/contract-list.tpl.php
@@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
  */
 $contracts = $this->getData('contracts') ?? [];
 
-$previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \reset($contracts)->getId() . '&ptype=p';
-$next     = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \end($contracts)->getId() . '&ptype=n';
+$previous = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \reset($contracts)->id . '&ptype=p';
+$next     = empty($contracts) ? '{/base}/contract/list' : '{/base}/contract/list?{?}&id=' . \end($contracts)->id . '&ptype=n';
 
 $now = new \DateTime('now');
 
@@ -73,7 +73,7 @@ echo $this->getData('nav')->render(); ?>
                         </label>
                 <tbody>
                 <?php foreach ($contracts as $key => $value) :
-                    $url = UriFactory::build('{/base}/contract/single?{?}&id=' . $value->getId());
+                    $url = UriFactory::build('{/base}/contract/single?{?}&id=' . $value->id);
 
                     $type = 'ok';
                     if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp())
@@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
                 ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->title); ?></a>
-                    <td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->account->getId()); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
+                    <td data-label="<?= $this->getHtml('Account'); ?>"><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->account->id); ?>"><?= $this->printHtml($value->account->name1); ?> <?= $this->printHtml($value->account->name2); ?></a>
                     <td data-label="<?= $this->getHtml('End'); ?>"><a href="<?= $url; ?>"><span class="tag <?= $type;  ?>"><?= $value->end !== null ? $value->end->format('Y-m-d') : ''; ?></span></a>
                 <?php endforeach; ?>
             </table>
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index cd55607..81aa2cf 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -107,7 +107,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('language', ISO639x1Enum::_EN);
 
         $this->module->apiContractTypeCreate($request, $response);
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
@@ -141,7 +141,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('language', ISO639x1Enum::_DE);
 
         $this->module->apiContractTypeL11nCreate($request, $response);
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
@@ -177,7 +177,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('type', '1');
 
         $this->module->apiContractCreate($request, $response);
-        self::assertGreaterThan(0, $response->get('')['response']->getId());
+        self::assertGreaterThan(0, $response->get('')['response']->id);
     }
 
     /**
diff --git a/tests/Models/ContractTest.php b/tests/Models/ContractTest.php
index 9efd01d..14dc3be 100755
--- a/tests/Models/ContractTest.php
+++ b/tests/Models/ContractTest.php
@@ -39,7 +39,7 @@ final class ContractTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->contract->getId());
+        self::assertEquals(0, $this->contract->id);
         self::assertEquals([], $this->contract->getFiles());
     }
 
diff --git a/tests/Models/ContractTypeTest.php b/tests/Models/ContractTypeTest.php
index 6c2b259..d4ece31 100755
--- a/tests/Models/ContractTypeTest.php
+++ b/tests/Models/ContractTypeTest.php
@@ -39,7 +39,7 @@ final class ContractTypeTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        self::assertEquals(0, $this->type->getId());
+        self::assertEquals(0, $this->type->id);
         self::assertEquals('', $this->type->getL11n());
     }
 
diff --git a/tests/Models/NullContractTest.php b/tests/Models/NullContractTest.php
index 785d4c9..325f61f 100755
--- a/tests/Models/NullContractTest.php
+++ b/tests/Models/NullContractTest.php
@@ -37,6 +37,6 @@ final class NullContractTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullContract(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }
diff --git a/tests/Models/NullContractTypeTest.php b/tests/Models/NullContractTypeTest.php
index f02e318..ffd48b1 100755
--- a/tests/Models/NullContractTypeTest.php
+++ b/tests/Models/NullContractTypeTest.php
@@ -37,6 +37,6 @@ final class NullContractTypeTest extends \PHPUnit\Framework\TestCase
     public function testId() : void
     {
         $null = new NullContractType(2);
-        self::assertEquals(2, $null->getId());
+        self::assertEquals(2, $null->id);
     }
 }