diff --git a/Admin/Install/db.json b/Admin/Install/db.json
index 9775c7d..e8c6acb 100755
--- a/Admin/Install/db.json
+++ b/Admin/Install/db.json
@@ -243,6 +243,11 @@
                 "type": "TINYINT(1)",
                 "null": false
             },
+            "contractmgmt_attr_type_repeatable": {
+                "name": "contractmgmt_attr_type_repeatable",
+                "type": "TINYINT(1)",
+                "null": false
+            },
             "contractmgmt_attr_type_required": {
                 "description": "Every contract must have this attribute type if set to true.",
                 "name": "contractmgmt_attr_type_required",
diff --git a/Models/Attribute/ContractAttributeTypeMapper.php b/Models/Attribute/ContractAttributeTypeMapper.php
index 7e21c76..ebe1841 100644
--- a/Models/Attribute/ContractAttributeTypeMapper.php
+++ b/Models/Attribute/ContractAttributeTypeMapper.php
@@ -42,6 +42,7 @@ final class ContractAttributeTypeMapper extends DataMapperFactory
         'contractmgmt_attr_type_datatype'   => ['name' => 'contractmgmt_attr_type_datatype',   'type' => 'int',    'internal' => 'datatype'],
         'contractmgmt_attr_type_fields'     => ['name' => 'contractmgmt_attr_type_fields',   'type' => 'int',    'internal' => 'fields'],
         'contractmgmt_attr_type_custom'     => ['name' => 'contractmgmt_attr_type_custom',   'type' => 'bool',   'internal' => 'custom'],
+        'contractmgmt_attr_type_repeatable'     => ['name' => 'contractmgmt_attr_type_repeatable',   'type' => 'bool',   'internal' => 'repeatable'],
         'contractmgmt_attr_type_pattern'    => ['name' => 'contractmgmt_attr_type_pattern',  'type' => 'string', 'internal' => 'validationPattern'],
         'contractmgmt_attr_type_required'   => ['name' => 'contractmgmt_attr_type_required', 'type' => 'bool',   'internal' => 'isRequired'],
     ];
diff --git a/Models/Attribute/ContractAttributeValueMapper.php b/Models/Attribute/ContractAttributeValueMapper.php
index 930e870..1d345ee 100644
--- a/Models/Attribute/ContractAttributeValueMapper.php
+++ b/Models/Attribute/ContractAttributeValueMapper.php
@@ -59,6 +59,7 @@ final class ContractAttributeValueMapper extends DataMapperFactory
             'mapper'   => ContractAttributeValueL11nMapper::class,
             'table'    => 'contractmgmt_attr_value_l11n',
             'self'     => 'contractmgmt_attr_value_l11n_value',
+            'column'   => 'content',
             'external' => null,
         ],
     ];
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index 4851489..ff03ed3 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'اتفافية',
-    'ContractTypes' => '',
     'Contracts'     => 'انكماش',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index 8a481c5..04825bc 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Smlouva',
-    'ContractTypes' => '',
     'Contracts'     => 'Smlouvy',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index 3152de0..4533bdc 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Kontrakt',
-    'ContractTypes' => '',
     'Contracts'     => 'Kontrakter',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index 359720a..b494c44 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => 'Account',
     'AutoRenewal'   => 'Automatische Verlängerung',
     'Contract'      => 'Vertrag',
-    'ContractTypes' => 'Vertragstypen',
     'Contracts'     => 'Verträge',
     'Costs'         => 'Kosten',
     'Description'   => 'Beschreibung',
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index 7f28592..f17de8a 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Σύμβαση',
-    'ContractTypes' => '',
     'Contracts'     => 'Συμβάσεις',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php
index f11d7a7..e357016 100755
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => 'Account',
     'AutoRenewal'   => 'Auto Renewal',
     'Contract'      => 'Contract',
-    'ContractTypes' => 'Contract Types',
     'Contracts'     => 'Contracts',
     'Costs'         => 'Costs',
     'Description'   => 'Description',
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index 9340859..56a5b4f 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Contrato',
-    'ContractTypes' => '',
     'Contracts'     => 'Contrato',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index c935283..7a0192d 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Sopimus',
-    'ContractTypes' => '',
     'Contracts'     => 'Sopimukset',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index 94ec772..06faf06 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Contracter',
-    'ContractTypes' => '',
     'Contracts'     => 'Contrats',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index c5524ed..0960eec 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Szerződés',
-    'ContractTypes' => '',
     'Contracts'     => 'Szerződések',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index 4f3387a..f0b19fb 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Contrarre',
-    'ContractTypes' => '',
     'Contracts'     => 'Contratti',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index 4770df1..2c67e33 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => '契約',
-    'ContractTypes' => '',
     'Contracts'     => '契約',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index fc3e8d0..6f26c69 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => '계약',
-    'ContractTypes' => '',
     'Contracts'     => '계약서',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index ee3fc04..5f395bf 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Kontrakt',
-    'ContractTypes' => '',
     'Contracts'     => 'Kontrakter',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index 73f6060..16cdcd6 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Kontrakt',
-    'ContractTypes' => '',
     'Contracts'     => 'Kontrakty',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index 7548298..3080423 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Contrato',
-    'ContractTypes' => '',
     'Contracts'     => 'Contratos',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index c58dc8d..902059a 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Договор',
-    'ContractTypes' => '',
     'Contracts'     => 'Контракты',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index ed3dfa2..9a9b2c5 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Avtal',
-    'ContractTypes' => '',
     'Contracts'     => 'Kontrakt',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index a3c63f5..48436e3 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'สัญญา',
-    'ContractTypes' => '',
     'Contracts'     => 'สัญญา',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index 525afe6..5f481ca 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Sözleşme',
-    'ContractTypes' => '',
     'Contracts'     => 'Sözleşme',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index 950b46f..3169d00 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => 'Договір',
-    'ContractTypes' => '',
     'Contracts'     => 'Контракти',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index 39646f5..aea761b 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -16,7 +16,6 @@ return ['ContractManagement' => [
     'Account'       => '',
     'AutoRenewal'   => '',
     'Contract'      => '合同',
-    'ContractTypes' => '',
     'Contracts'     => '合同',
     'Costs'         => '',
     'Description'   => '',
diff --git a/Theme/Backend/contract-single.tpl.php b/Theme/Backend/contract-single.tpl.php
index 580f07d..1e3ad8a 100755
--- a/Theme/Backend/contract-single.tpl.php
+++ b/Theme/Backend/contract-single.tpl.php
@@ -75,11 +75,13 @@ echo $this->data['nav']->render(); ?>
                                 <input type="datetime-local" id="iEnd" name="end" value="<?= $this->printHtml($contract->end->format('Y-m-d\TH:i:s')); ?>">
                             </div>
 
-                            <label class="checkbox" for="iAutoRenewal">
-                                <input id="iAutoRenewal" type="checkbox" name="auto_renewal" value="1"<?= $contract->autoRenewal ? ' checked' : ''; ?>>
-                                <span class="checkmark"></span>
-                                <?= $this->getHtml('AutoRenewal'); ?>
-                            </label>
+                            <div class="form-group">
+                                <label class="checkbox" for="iAutoRenewal">
+                                    <input id="iAutoRenewal" type="checkbox" name="auto_renewal" value="1"<?= $contract->autoRenewal ? ' checked' : ''; ?>>
+                                    <span class="checkmark"></span>
+                                    <?= $this->getHtml('AutoRenewal'); ?>
+                                </label>
+                            </div>
 
                             <div class="form-group">
                                 <label for="iTermination"><?= $this->getHtml('Termination'); ?></label>