diff --git a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
index 128005a..060e45f 100755
--- a/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
+++ b/Admin/Install/Application/Shop/Themes/Default/tpl/footer.tpl.php
@@ -1,4 +1,16 @@
-<?php declare(strict_types=1);
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 8.0
+ *
+ * @package   Template
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://orange-management.org
+ */
+declare(strict_types=1);
 
 use phpOMS\Uri\UriFactory;
 
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 9dc4cae..f2286bb 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -307,16 +307,16 @@ final class ApiController extends Controller
      *
      * @param RequestAbstract $request Request
      *
-     * @return TicketElementMapper Returns the updated ticket element from the request
+     * @return TicketElement Returns the updated ticket element from the request
      *
      * @since 1.0.0
      */
-    private function updateTicketElementFromRequest(RequestAbstract $request, ResponseAbstract $response) : TicketElementMapper
+    private function updateTicketElementFromRequest(RequestAbstract $request, ResponseAbstract $response) : TicketElement
     {
-        /** @var TicketElementMapper $element */
-        $element = TicketElementMapper::get()->where('id', (int) ($request->getData('id')))->execute();
+        /** @var TicketElement $element */
+        $element = TicketElementMapper::get()->with('taskElement')->where('id', (int) ($request->getData('id')))->execute();
 
-        $request->setData('id', $element->task, true);
+        $request->setData('id', $element->taskElement->task, true);
         $this->app->moduleManager->get('Tasks')->apiTaskElementSet($request, $response);
 
         return $element;
@@ -570,7 +570,7 @@ final class ApiController extends Controller
      */
     private function createTicketAttributeTypeFromRequest(RequestAbstract $request) : TicketAttributeType
     {
-        $attrType       = new TicketAttributeType();
+        $attrType = new TicketAttributeType();
         $attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN);
         $attrType->fields = (int) ($request->getData('fields') ?? 0);
         $attrType->custom = (bool) ($request->getData('custom') ?? false);
diff --git a/Models/TicketAttributeValueMapper.php b/Models/TicketAttributeValueMapper.php
index 83fdb34..3473f8d 100755
--- a/Models/TicketAttributeValueMapper.php
+++ b/Models/TicketAttributeValueMapper.php
@@ -8,7 +8,7 @@
  * @copyright Dennis Eichhorn
  * @license   OMS License 1.0
  * @version   1.0.0
- * @link      https:   //orange-management.org
+ * @link      https://orange-management.org
  */
 declare(strict_types=1);
 
@@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  *
  * @package Modules\Support\Models
  * @license OMS License 1.0
- * @link    https:   //orange-management.org
+ * @link    https://orange-management.org
  * @since   1.0.0
  */
 final class TicketAttributeValueMapper extends DataMapperFactory