diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index 6b831c2..a9c6e07 100644
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -34,6 +34,16 @@ use phpOMS\Message\ResponseAbstract;
  * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
+ *
+ * @question Change localization from setting to unit attribute
+ *      but keep server localization in settings as default setting when creating a new unit?
+ *      https://github.com/Karaka-Management/Organization-Guide/issues/6
+ *
+ * @todo Allow multiple tax office registrations
+ *      Currently only one is allowed through the attributes.
+ *      This is bad because a company can be registered in multiple countries.
+ *      One idea could be to use the address_attr for this purpose.
+ *      https://github.com/Karaka-Management/oms-Organization/issues/6
  */
 final class ApiAttributeController extends Controller
 {
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index a9c6c2a..5fc3be8 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -118,6 +118,20 @@ final class BackendController extends Controller
      *
      * @return RenderableInterface
      *
+     * @todo Make the organigram printable
+     *      https://github.com/Karaka-Management/Organization-Guide/issues/4
+     *
+     * @feature Make the organigram versioned/approved (e.g. for ISO)
+     *      Maybe this is not really necessary due to the audit log?!
+     *      https://github.com/Karaka-Management/Organization-Guide/issues/5
+     *
+     * @feature Create better organigram (better grouping, maybe as SVG)
+     *      https://github.com/Karaka-Management/oms-Organization/issues/2
+     *
+     * @feature Allow to define the organigram automatic or manual
+     *      automatic = automatically generates organigram, manual = uses file as organigram
+     *      https://github.com/Karaka-Management/oms-Organization/issues/4
+     *
      * @since 1.0.0
      * @codeCoverageIgnore
      */