diff --git a/Admin/Install/db.json b/Admin/Install/db.json
index ad9bbcf..f974112 100755
--- a/Admin/Install/db.json
+++ b/Admin/Install/db.json
@@ -183,6 +183,11 @@
                 "type": "TINYINT(1)",
                 "null": false
             },
+            "address_attr_type_repeatable": {
+                "name": "address_attr_type_repeatable",
+                "type": "TINYINT(1)",
+                "null": false
+            },
             "address_attr_type_required": {
                 "description": "Every address must have this attribute type if set to true.",
                 "name": "address_attr_type_required",
@@ -861,6 +866,11 @@
                 "type": "TINYINT(1)",
                 "null": false
             },
+            "unit_attr_type_repeatable": {
+                "name": "unit_attr_type_repeatable",
+                "type": "TINYINT(1)",
+                "null": false
+            },
             "unit_attr_type_required": {
                 "description": "Every unit must have this attribute type if set to true.",
                 "name": "unit_attr_type_required",
@@ -1384,6 +1394,11 @@
                 "type": "TINYINT(1)",
                 "null": false
             },
+            "account_attr_type_repeatable": {
+                "name": "account_attr_type_repeatable",
+                "type": "TINYINT(1)",
+                "null": false
+            },
             "account_attr_type_required": {
                 "description": "Every account must have this attribute type if set to true.",
                 "name": "account_attr_type_required",
diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 5a38bc2..7b8e1a2 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -37,7 +37,7 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
 
 $serverModes = ApplicationStatus::getConstants();
 
-$l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
+$l11n = $this->getData('default_localization') ?? new NullLocalization();
 
 echo $this->data['nav']->render();
 ?>
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 62493bc..4fd87cb 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -806,7 +806,7 @@ final class BackendController extends Controller
         );
 
         $view->data['generalSettings']     = $generalSettings;
-        $view->data['defaultlocalization'] = LocalizationMapper::get()->where('id', (int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]->content)->execute();
+        $view->data['default_localization'] = LocalizationMapper::get()->where('id', (int) $generalSettings[SettingsEnum::DEFAULT_LOCALIZATION]->content)->execute();
 
         return $view;
     }
diff --git a/Theme/Backend/Components/AddressEditor/AddressView.php b/Theme/Backend/Components/AddressEditor/AddressView.php
new file mode 100644
index 0000000..26ee9dd
--- /dev/null
+++ b/Theme/Backend/Components/AddressEditor/AddressView.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\Admin
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+namespace Modules\Admin\Theme\Backend\Components\AddressEditor;
+
+use phpOMS\Localization\L11nManager;
+use phpOMS\Message\RequestAbstract;
+use phpOMS\Message\ResponseAbstract;
+use phpOMS\Views\View;
+
+/**
+ * Component view.
+ *
+ * @package Modules\Admin
+ * @license OMS License 2.0
+ * @link    https://jingga.app
+ * @since   1.0.0
+ * @codeCoverageIgnore
+ */
+class AddressView extends View
+{
+    /**
+     * Address
+     *
+     * @var \phpOMS\Stdlib\Base\Address[]
+     * @since 1.0.0
+     */
+    public array $addresses = [];
+
+    /**
+     * Units
+     *
+     * @var \Modules\Organization\Models\Unit[]
+     * @since 1.0.0
+     */
+    public array $units = [];
+
+    /**
+     * API Uri for address actions
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    public string $apiUri = '';
+
+    /**
+     * Reference id
+     *
+     * @var string
+     * @since 1.0.0
+     */
+    public int $refId = 0;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(L11nManager $l11n = null, RequestAbstract $request, ResponseAbstract $response)
+    {
+        parent::__construct($l11n, $request, $response);
+        $this->setTemplate('/Modules/Admin/Theme/Backend/Components/AddressEditor/addresses');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function render(mixed ...$data) : string
+    {
+        /** @var array{0:\phpOMS\Stdlib\Base\Address[]} $data */
+        $this->addresses     = $data[0];
+        $this->units          = $data[1];
+        $this->apiUri         = $data[2];
+        $this->refId          = $data[3];
+
+        return parent::render();
+    }
+}
diff --git a/Theme/Backend/Components/AddressEditor/addresses.tpl.php b/Theme/Backend/Components/AddressEditor/addresses.tpl.php
new file mode 100644
index 0000000..79fcf86
--- /dev/null
+++ b/Theme/Backend/Components/AddressEditor/addresses.tpl.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   Modules\Admin
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+use phpOMS\Localization\ISO639Enum;
+use phpOMS\Stdlib\Base\AddressType;
+use phpOMS\Uri\UriFactory;
+
+$address = $this->addresses;
+$languages = ISO639Enum::getConstants();
+$types     = AddressType::getConstants();
+$units     = $this->units;
+?>
+
+<div class="col-xs-12 col-md-6">
+    <section class="portlet">
+        <form id="addressForm" action="<?= UriFactory::build($this->apiUri); ?>" method="post"
+            data-ui-container="#addressTable tbody"
+            data-add-form="addressForm"
+            data-add-tpl="#addressTable tbody .oms-add-tpl-address">
+            <div class="portlet-head"><?= $this->getHtml('Address', 'Admin', 'Backend'); ?></div>
+            <div class="portlet-body">
+                <input type="hidden" id="iAddressRef" name="ref" value="<?= $this->refId; ?>" disabled>
+
+                <div class="form-group">
+                    <label for="iAddressId"><?= $this->getHtml('ID', '0', '0'); ?></label>
+                    <input type="text" id="iAddressId" name="id" data-tpl-text="/id" data-tpl-value="/id" disabled>
+                </div>
+
+                <div class="form-group">
+                    <label for="iAddressType"><?= $this->getHtml('Type', 'Admin', 'Backend'); ?></label>
+                    <select id="iAddressType" name="type" data-tpl-text="/type" data-tpl-value="/type">
+                        <?php
+                        foreach ($types as $type) : ?>
+                            <option value="<?= $type->id; ?>"><?= $this->printHtml($type->getL11n()); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+
+                <!-- @todo implement
+                <div class="form-group">
+                    <label for="iAddressUnit"><?= $this->getHtml('Unit', 'Admin', 'Backend'); ?></label>
+                    <select id="iAddressUnit" name="unit" data-tpl-text="/unit" data-tpl-value="/unit">
+                        <option value="">
+                        <?php
+                        foreach ($units as $unit) : ?>
+                            <option value="<?= $unit->id; ?>"><?= $this->printHtml($unit->name); ?>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                -->
+
+                <div class="form-group">
+                    <label for="iAddressValue"><?= $this->getHtml('Value', 'Admin', 'Backend'); ?></label>
+                    <pre class="textarea contenteditable" id="iAddressValue" data-name="value" data-tpl-value="/value" contenteditable></pre>
+                </div>
+            </div>
+            <div class="portlet-foot">
+                <input id="bAddressAdd" formmethod="put" type="submit" class="add-form" value="<?= $this->getHtml('Add', '0', '0'); ?>">
+                <input id="bAddressSave" formmethod="post" type="submit" class="save-form hidden button save" value="<?= $this->getHtml('Update', '0', '0'); ?>">
+                <input id="bAddressCancel" type="submit" class="cancel-form hidden button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
+            </div>
+        </form>
+    </section>
+</div>
+
+<div class="col-xs-12 col-md-6">
+    <section class="portlet">
+        <div class="portlet-head"><?= $this->getHtml('Address', 'Admin', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div>
+        <div class="slider">
+        <table id="addressTable" class="default sticky"
+            data-tag="form"
+            data-ui-element="tr"
+            data-add-tpl=".oms-add-tpl-address"
+            data-update-form="addressForm">
+            <thead>
+                <tr>
+                    <td>
+                    <td><?= $this->getHtml('ID', '0', '0'); ?>
+                    <td><?= $this->getHtml('Name', 'Admin', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                    <td class="wf-100"><?= $this->getHtml('Value', 'Admin', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+                    <td><?= $this->getHtml('Unit', 'Admin', 'Backend'); ?><i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>
+            <tbody>
+                <template class="oms-add-tpl-address">
+                    <tr class="animated medium-duration greenCircleFade" data-id="" draggable="false">
+                        <td>
+                            <i class="g-icon btn update-form">settings</i>
+                            <input id="addressTable-remove-0" type="checkbox" class="hidden">
+                            <label for="addressTable-remove-0" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
+                            <span class="checked-visibility">
+                                <label for="addressTable-remove-0" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
+                                <label for="addressTable-remove-0" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
+                            </span>
+                        <td data-tpl-text="/id" data-tpl-value="/id"></td>
+                        <td data-tpl-text="/type" data-tpl-value="/type" data-value=""></td>
+                        <td data-tpl-text="/value" data-tpl-value="/value"></td>
+                        <td data-tpl-text="/unit" data-tpl-value="/unit"></td>
+                    </tr>
+                </template>
+                <?php $c = 0;
+                foreach ($address as $key => $value) : ++$c; ?>
+                    <tr data-id="<?= $value->id; ?>">
+                        <td>
+                            <i class="g-icon btn update-form">settings</i>
+                            <?php if (!$value->type->isRequired) : ?>
+                            <input id="addressTable-remove-<?= $value->id; ?>" type="checkbox" class="hidden">
+                            <label for="addressTable-remove-<?= $value->id; ?>" class="checked-visibility-alt"><i class="g-icon btn form-action">close</i></label>
+                            <span class="checked-visibility">
+                                <label for="addressTable-remove-<?= $value->id; ?>" class="link default"><?= $this->getHtml('Cancel', '0', '0'); ?></label>
+                                <label for="addressTable-remove-<?= $value->id; ?>" class="remove-form link cancel"><?= $this->getHtml('Delete', '0', '0'); ?></label>
+                            </span>
+                            <?php endif; ?>
+                        <td data-tpl-text="/id" data-tpl-value="/id"><?= $value->id; ?>
+                        <td data-tpl-text="/type" data-tpl-value="/type" data-value="<?= $value->type->id; ?>"><?= $this->printHtml($value->type->getL11n()); ?>
+                        <td data-tpl-text="/value" data-tpl-value="/value"><?= $value->value->getValue() instanceof \DateTime ? $value->value->getValue()->format('Y-m-d') : $this->printHtml((string) $value->value->getValue()); ?>
+                        <td data-tpl-text="/unit" data-tpl-value="/unit" data-value="<?= $value->value->unit; ?>"><?= $this->printHtml($value->value->unit); ?>
+                <?php endforeach; ?>
+                <?php if ($c === 0) : ?>
+                <tr>
+                    <td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
+                <?php endif; ?>
+        </table>
+        </div>
+    </section>
+</div>
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 3fb0684..22f7700 100755
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -37,7 +37,7 @@ $lengths      = \phpOMS\Utils\Converter\LengthType::getConstants();
 $volumes      = \phpOMS\Utils\Converter\VolumeType::getConstants();
 $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
 
-$l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
+$l11n = $this->getData('default_localization') ?? new NullLocalization();
 ?>
 
 <div class="tabview tab-2 url-rewrite">